diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-02-13 16:05:02 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-02-13 16:05:02 +0000 |
| commit | a6d78cfefc41d87234b22ef15f4f38a7b96e6544 (patch) | |
| tree | 9eceff651b6e5ecd67dd256d5216a9f458034b5e | |
| parent | b092468063d314d96aee6624cdb1a8fa78599424 (diff) | |
| download | mana-a6d78cfefc41d87234b22ef15f4f38a7b96e6544.tar.gz mana-a6d78cfefc41d87234b22ef15f4f38a7b96e6544.tar.bz2 mana-a6d78cfefc41d87234b22ef15f4f38a7b96e6544.tar.xz mana-a6d78cfefc41d87234b22ef15f4f38a7b96e6544.zip | |
Should now compile on Linux again.
| -rw-r--r-- | makefile.linuxppc | 7 | ||||
| -rw-r--r-- | makefile.macosx | 7 | ||||
| -rw-r--r-- | makefile.mgw | 5 | ||||
| -rw-r--r-- | makefile.static | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
5 files changed, 18 insertions, 10 deletions
diff --git a/makefile.linuxppc b/makefile.linuxppc index cadc0fbd..978313f8 100644 --- a/makefile.linuxppc +++ b/makefile.linuxppc @@ -3,9 +3,12 @@ CXX = g++ #CXXFLAGS = -g -march=i686 -O2 # excessive optimizations for pentium pro and later -CXXFLAGS =-Wall -O3 -fexpensive-optimizations -pipe -fomit-frame-pointer -funroll-loops -DLINUXPPC -fexceptions `sdl-config --cflags` +CXXFLAGS = -Wall -O3 -fexpensive-optimizations -pipe -fomit-frame-pointer \ + -funroll-loops -DLINUXPPC -fexceptions `sdl-config --cflags` \ + `pkg-config --cflags libxml-2.0` -CFLAGS=`allegro-config --libs release` `sdl-config --libs` -lSDL_mixer -lguichan_allegro -lguichan +LIBS := `sdl-config --libs` -lguichan_sdl -lguichan -lSDL_mixer -lSDL_image \ + `pkg-config --libs libxml-2.0` include file.list MODULES += src/net/win2mac.cpp diff --git a/makefile.macosx b/makefile.macosx index ab1e9864..733ea7a8 100644 --- a/makefile.macosx +++ b/makefile.macosx @@ -3,9 +3,12 @@ CXX = g++ #CXXFLAGS = -g -march=i686 -O2 # excessive optimizations for pentium pro and later -CXXFLAGS =-Wall -O3 -fexpensive-optimizations -pipe -fomit-frame-pointer -funroll-loops -DMACOSX -fexceptions `sdl-config --cflags` +CXXFLAGS = -Wall -O3 -fexpensive-optimizations -pipe -fomit-frame-pointer \ + -funroll-loops -DMACOSX -fexceptions `sdl-config --cflags` \ + `pkg-config --cflags libxml-2.0` -CFLAGS=`allegro-config --libs release` `sdl-config --libs` -lSDL_mixer -lguichan_allegro -lguichan +LIBS := `sdl-config --libs` -lguichan_sdl -lguichan -lSDL_mixer -lSDL_image \ + `pkg-config --libs libxml-2.0` include file.list MODULES += src/net/win2mac.cpp diff --git a/makefile.mgw b/makefile.mgw index 42eaf870..e3c54fff 100644 --- a/makefile.mgw +++ b/makefile.mgw @@ -3,9 +3,10 @@ CXX = g++ #CXXFLAGS += -g -march=i686 -O2 # excessive optimizations for pentium pro and later -CXXFLAGS +=-Wall -march=i686 -O3 -fexpensive-optimizations -pipe -fomit-frame-pointer -funroll-loops -fexceptions +CXXFLAGS += -Wall -march=i686 -O3 -fexpensive-optimizations -pipe \ + -fomit-frame-pointer -funroll-loops -fexceptions -LIBS := -lSDL -lguichan_sdl -lguichan -lSDL_mixer -lSDL_image -lws2_32 +LIBS := -lguichan_sdl -lguichan -lSDL_mixer -lSDL_image -lSDL -lws2_32 include file.list diff --git a/makefile.static b/makefile.static index c0fca341..834b2833 100644 --- a/makefile.static +++ b/makefile.static @@ -4,9 +4,10 @@ CXXFLAGS += -g -march=i686 -O2 -Wall -D__DEBUG # excessive optimizations for pentium pro and later #CXXFLAGS +=-Wall -march=i686 -O3 -fexpensive-optimizations -pipe -fomit-frame-pointer -funroll-loops -fexceptions -CXXFLAGS += `sdl-config --cflags` -fexceptions +CXXFLAGS += `sdl-config --cflags` -fexceptions `pkg-config --cflags libxml-2.0` -LIBS := `sdl-config --libs` -lguichan_sdl -lguichan -lSDL_mixer -lSDL_image +LIBS := `sdl-config --libs` -lguichan_sdl -lguichan -lSDL_mixer -lSDL_image \ + `pkg-config --libs libxml-2.0` include file.list diff --git a/src/Makefile.am b/src/Makefile.am index 9c07832f..9635b08d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,7 +53,7 @@ tmw_SOURCES = sound/sound.cpp \ INCLUDES= $(all_includes) # the library search path. -tmw_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) -lguichan -lguichan_sdl -tmw_CXXFLAGS = $(LIBSDL_CFLAGS) +tmw_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) -lguichan -lguichan_sdl `pkg-config --libs libxml-2.0` +tmw_CXXFLAGS = $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` tmw_LDADD = $(LIBSDL_LIBS) tmw_TARGET = ../tmw |