Changeset 628Tweet

Timestamp:

Feb 11, 2011, 1:19:04 PM (10 years ago)

Author:

sam

Message:

Try to autodetect GtkGL development libs, and don't build the Deus Hax
editor if not found.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• deushax/Makefile.am (modified) (2 diffs)

trunk/configure.ac

@@ -99 +99 @@
 
 dnl Use GTK+? (required for the deushax editor)
-GTK_CFLAGS="$GTK_CFLAGS `pkg-config --cflags gtk+-2.0 gtkgl-2.0`"
-GTK_LIBS="$GTK_LIBS `pkg-config --libs gtk+-2.0 gtkgl-2.0`"
+ac_cv_my_have_gtkgl="no"
+PKG_CHECK_MODULES(GTK, gtk+-2.0, [ac_cv_my_have_gtkgl="yes"], [:])
+PKG_CHECK_MODULES(GTKGL, gtkgl-2.0, [:], [ac_cv_my_have_gtkgl="no"])
+if test "${ac_cv_my_have_gtkgl}" != "no"; then
+  AC_DEFINE(USE_GTKGL, 1, Define to 1 to use GtkGl)
+fi
+AM_CONDITIONAL(USE_GTKGL, test "${ac_cv_my_have_gtkgl}" != "no")
+#GTK_CFLAGS="$GTK_CFLAGS `pkg-config --cflags gtk+-2.0 gtkgl-2.0`"
+#GTK_LIBS="$GTK_LIBS `pkg-config --libs gtk+-2.0 gtkgl-2.0`"
 
 # How to use the Lol Engine inside this tree

trunk/deushax/Makefile.am

@@ -1 +1 @@
 
-noinst_PROGRAMS = deushax editor
+noinst_PROGRAMS = deushax $(editor)
 
 deushax_SOURCES = deushax.cpp game.cpp game.h debugsprite.cpp debugsprite.h
@@ -7 +7 @@
 deushax_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
 
+if USE_GTKGL
+editor = editor
+endif
+
 editor_SOURCES = gtk/editor.cpp gtk/glmapview.cpp gtk/glmapview.h \
                  mapviewer.cpp mapviewer.h
-editor_CXXFLAGS = @GTK_CFLAGS@ @LOL_CFLAGS@
+editor_CXXFLAGS = @GTKGL_CFLAGS@ @GTK_CFLAGS@ @LOL_CFLAGS@
 editor_LDADD =
-editor_LDFLAGS = $(top_builddir)/src/liblol.a @GTK_LIBS@ @LOL_LIBS@
+editor_LDFLAGS = $(top_builddir)/src/liblol.a @GTKGL_LIBS@ @GTK_LIBS@ @LOL_LIBS@
 EXTRA_DIST = gtk/editor.xml