From: Andy Spencer <andy753421@gmail.com>
Date: Mon, 12 Dec 2011 07:37:01 +0000 (+0000)
Subject: Fixes
X-Git-Url: http://pileus.org/git/?p=grits;a=commitdiff_plain;h=acc8bf035853358a5818be2514a08e518f61df81

Fixes
---

diff --git a/configure.ac b/configure.ac
index 798fb05..382ebb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,13 +43,24 @@ case "${host}" in
 	*apple*)   SYS="MAC" ;;
 	*)         SYS="X11" ;;
 esac
-if test "$WIN32" = yes; then
+AC_SUBST([SYS])
+if test "$SYS" = "WIN"; then
 	ac_default_prefix="/"
 fi
 AM_CONDITIONAL([SYS_WIN], test "$SYS" = "WIN")
 AM_CONDITIONAL([SYS_MAC], test "$SYS" = "MAC")
 AM_CONDITIONAL([SYS_X11], test "$SYS" = "X11")
 
+# OpenGL flags
+GL_CFLAGS="-DSYS_$SYS"
+case "$SYS" in
+	"WIN") GL_LIBS="-lglu32 -lopengl32" ;;
+	"MAC") GL_LIBS="-framework OpenGL" ;;
+	"X11") GL_LIBS="-lGL -lGLU" ;;
+esac
+AC_SUBST([GL_CFLAGS])
+AC_SUBST([GL_LIBS])
+
 # Output 
 AC_CONFIG_FILES([
 	Makefile
diff --git a/gen-apple.sh b/gen-apple.sh
old mode 100644
new mode 100755
index 846d65c..b258e1b
--- a/gen-apple.sh
+++ b/gen-apple.sh
@@ -5,4 +5,4 @@ dir=$(pwd)
 	--disable-static \
 	"--libdir=$dir/src/.libs" \
 	"--includedir=$dir/include" \
-	CFLAGS="-g -Werror -framework OpenGL -framework AppKit"
+	CFLAGS="-g -Werror"
diff --git a/src/Makefile.am b/src/Makefile.am
index f324bff..ac3e79f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,26 +1,20 @@
 SUBDIRS = data objects . plugins
 
 AM_CFLAGS   = -Wall --std=gnu99 -I$(top_srcdir)/src
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
-AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GL_CFLAGS) $(SOUP_CFLAGS)
+AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(GL_LIBS) $(SOUP_LIBS)
 AM_LDFLAGS  = 
 
 # System dependant flags
 if SYS_WIN
-AM_CPPFLAGS += -DSYS_WIN
-AM_LDFLAGS  += -mwindows -no-undefined -lglu32 -lopengl32
-dots         = ..
+AM_LDFLAGS += -mwindows -no-undefined
+dots        = ..
 endif
 if SYS_MAC
-AM_CPPFLAGS += -DSYS_MAC
-AM_CFLAGS   += -ObjC
-AM_LDFLAGS  += -framework AppKit --framework OpenGL
+AM_CFLAGS  += -ObjC
+AM_LDFLAGS += -framework AppKit
 else
-AM_LDFLAGS  += -Wl,--as-needed -Wl,--no-undefined
-endif
-if SYS_X11
-AM_CPPFLAGS += -DSYS_X11
-AM_LDFLAGS  += -lGL -lGLU
+AM_LDFLAGS += -Wl,--as-needed -Wl,--no-undefined
 endif
 
 # Headers
diff --git a/src/gtkgl.h b/src/gtkgl.h
index 71ad67a..244bc14 100644
--- a/src/gtkgl.h
+++ b/src/gtkgl.h
@@ -21,7 +21,7 @@
 #include <gtk/gtk.h>
 
 /* Platform dependant OpenGL includes */
-#ifdef USE_MAC
+#ifdef SYS_MAC
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
 #else
diff --git a/src/objects/Makefile.am b/src/objects/Makefile.am
index a4abfcc..dc62861 100644
--- a/src/objects/Makefile.am
+++ b/src/objects/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS  = -Wall --std=gnu99 -I$(top_srcdir)/src
-AM_CFLAGS += $(GLIB_CFLAGS) $(GTK_CFLAGS) $(CAIRO_CFLAGS)
+AM_CFLAGS += $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GL_CFLAGS) $(CAIRO_CFLAGS)
 
 if !SYS_WIN
 AM_CFLAGS += -fPIC
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index c850463..2572125 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CFLAGS   = -Wall --std=gnu99 -I$(top_srcdir)/src
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GL_CFLAGS) $(SOUP_CFLAGS)
 AM_LDFLAGS  = -shared -module -avoid-version
 LIBS        = $(top_srcdir)/src/libgrits.la