Commit 691c8f24 authored by twanvl's avatar twanvl

Put wx libraries in the right place of the linker command. Needed to make mse link on g++ 4.6.

parent ebe7f6ea
...@@ -13,7 +13,7 @@ AUTOMAKE_OPTIONS = subdir-objects ...@@ -13,7 +13,7 @@ AUTOMAKE_OPTIONS = subdir-objects
bin_PROGRAMS = magicseteditor bin_PROGRAMS = magicseteditor
AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall
AM_LDFLAGS = @WX_LIBS@ $(BOOST_LDFLAGS) AM_LDFLAGS = $(BOOST_LDFLAGS)
.hpp.gch: .hpp.gch:
target=`echo $@ | sed "s|.gch$$|.hpp|"`;\ target=`echo $@ | sed "s|.gch$$|.hpp|"`;\
...@@ -24,7 +24,7 @@ AM_LDFLAGS = @WX_LIBS@ $(BOOST_LDFLAGS) ...@@ -24,7 +24,7 @@ AM_LDFLAGS = @WX_LIBS@ $(BOOST_LDFLAGS)
.gch.o: .gch.o:
gcc -x c - -c -o $@ <<<"" gcc -x c - -c -o $@ <<<""
magicseteditor_LDADD = $(BOOST_REGEX_LIB) magicseteditor_LDADD = @WX_LIBS@ $(BOOST_REGEX_LIB)
magicseteditor_CXXFLAGS = $(AM_CXXFLAGS) magicseteditor_CXXFLAGS = $(AM_CXXFLAGS)
magicseteditor_SOURCES = magicseteditor_SOURCES =
......
This diff is collapsed.
...@@ -472,8 +472,8 @@ top_srcdir = @top_srcdir@ ...@@ -472,8 +472,8 @@ top_srcdir = @top_srcdir@
# This flag allows us to use subdirectories: # This flag allows us to use subdirectories:
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall
AM_LDFLAGS = @WX_LIBS@ $(BOOST_LDFLAGS) AM_LDFLAGS = $(BOOST_LDFLAGS)
magicseteditor_LDADD = $(BOOST_REGEX_LIB) magicseteditor_LDADD = @WX_LIBS@ $(BOOST_REGEX_LIB)
magicseteditor_CXXFLAGS = $(AM_CXXFLAGS) $(am__append_2) magicseteditor_CXXFLAGS = $(AM_CXXFLAGS) $(am__append_2)
# The script used to generate is MakeAM.sh # The script used to generate is MakeAM.sh
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment