Changeset 623 for trunk/deushaxTweet

Timestamp:

Feb 9, 2011, 3:20:07 PM (11 years ago)

Author:

sam

Message:

Stop using pkg-config in Makefiles and stop putting things in LDADD that
require to appear before LDFLAGS in the linker call.

File:

• trunk/deushax/Makefile.am (modified) (1 diff)

trunk/deushax/Makefile.am

@@ -4 +4 @@
 deushax_SOURCES = deushax.cpp game.cpp game.h debugsprite.cpp debugsprite.h
 deushax_CXXFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-deushax_LDADD = $(top_builddir)/src/liblol.a
-deushax_LDFLAGS = @LOL_LIBS@ @PIPI_LIBS@
+deushax_LDADD =
+deushax_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
 
 editor_SOURCES = gtk/editor.cpp gtk/glmapview.cpp gtk/glmapview.h \
                  mapviewer.cpp mapviewer.h
-editor_CXXFLAGS = @LOL_CFLAGS@ `pkg-config --cflags gtk+-2.0 gtkgl-2.0`
-editor_LDADD = $(top_builddir)/src/liblol.a
-editor_LDFLAGS = @LOL_LIBS@ `pkg-config --libs gtk+-2.0 gtkgl-2.0`
+editor_CXXFLAGS = @GTK_CFLAGS@ @LOL_CFLAGS@
+editor_LDADD =
+editor_LDFLAGS = $(top_builddir)/src/liblol.a @GTK_LIBS@ @LOL_LIBS@
 EXTRA_DIST = gtk/editor.xml