Changeset 623 for trunk/deushax


Ignore:
Timestamp:
Feb 9, 2011, 3:20:07 PM (10 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/deushax/Makefile.am

    r221 r623  
    44deushax_SOURCES = deushax.cpp game.cpp game.h debugsprite.cpp debugsprite.h
    55deushax_CXXFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    6 deushax_LDADD = $(top_builddir)/src/liblol.a
    7 deushax_LDFLAGS = @LOL_LIBS@ @PIPI_LIBS@
     6deushax_LDADD =
     7deushax_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
    88
    99editor_SOURCES = gtk/editor.cpp gtk/glmapview.cpp gtk/glmapview.h \
    1010                 mapviewer.cpp mapviewer.h
    11 editor_CXXFLAGS = @LOL_CFLAGS@ `pkg-config --cflags gtk+-2.0 gtkgl-2.0`
    12 editor_LDADD = $(top_builddir)/src/liblol.a
    13 editor_LDFLAGS = @LOL_LIBS@ `pkg-config --libs gtk+-2.0 gtkgl-2.0`
     11editor_CXXFLAGS = @GTK_CFLAGS@ @LOL_CFLAGS@
     12editor_LDADD =
     13editor_LDFLAGS = $(top_builddir)/src/liblol.a @GTK_LIBS@ @LOL_LIBS@
    1414EXTRA_DIST = gtk/editor.xml
    1515
Note: See TracChangeset for help on using the changeset viewer.