mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
r1722: Put wx libraries in the right place of the linker command. Needed to make mse link on g++ 4.6.
This commit is contained in:
@@ -13,7 +13,7 @@ AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
bin_PROGRAMS = magicseteditor
|
||||
AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall
|
||||
AM_LDFLAGS = @WX_LIBS@ $(BOOST_LDFLAGS)
|
||||
AM_LDFLAGS = $(BOOST_LDFLAGS)
|
||||
|
||||
.hpp.gch:
|
||||
target=`echo $@ | sed "s|.gch$$|.hpp|"`;\
|
||||
@@ -24,7 +24,7 @@ AM_LDFLAGS = @WX_LIBS@ $(BOOST_LDFLAGS)
|
||||
.gch.o:
|
||||
gcc -x c - -c -o $@ <<<""
|
||||
|
||||
magicseteditor_LDADD = $(BOOST_REGEX_LIB)
|
||||
magicseteditor_LDADD = @WX_LIBS@ $(BOOST_REGEX_LIB)
|
||||
magicseteditor_CXXFLAGS = $(AM_CXXFLAGS)
|
||||
magicseteditor_SOURCES =
|
||||
|
||||
@@ -40,3 +40,4 @@ endif
|
||||
# The script used to generate is MakeAM.sh' > Makefile.am;
|
||||
|
||||
find . -name *.cpp | sed "s/\./magicseteditor_SOURCES += ./" >> Makefile.am;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user