diff options
| author | Alexander Baldeck <alexander@archlinux.org> | 2004-12-29 12:42:18 +0000 |
|---|---|---|
| committer | Alexander Baldeck <alexander@archlinux.org> | 2004-12-29 12:42:18 +0000 |
| commit | 0862aa2922451ea6a1348b5aefecbbf77b72a36f (patch) | |
| tree | 69a2d8ef01685ae3193b99af34671daede0680ef | |
| parent | 8fe800f7afa25e052c387b8a1a7ad6d46f38d916 (diff) | |
| download | mana-0862aa2922451ea6a1348b5aefecbbf77b72a36f.tar.gz mana-0862aa2922451ea6a1348b5aefecbbf77b72a36f.tar.bz2 mana-0862aa2922451ea6a1348b5aefecbbf77b72a36f.tar.xz mana-0862aa2922451ea6a1348b5aefecbbf77b72a36f.zip | |
- added SDL & SDL_mixer to all makefiles
- removed JGmod from all makefiles
| -rw-r--r-- | makefile.linuxppc | 4 | ||||
| -rw-r--r-- | makefile.macosx | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/makefile.linuxppc b/makefile.linuxppc index 0455fc2a..9b1580fd 100644 --- a/makefile.linuxppc +++ b/makefile.linuxppc @@ -3,9 +3,9 @@ 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 +CXXFLAGS =-Wall -O3 -fexpensive-optimizations -pipe -fomit-frame-pointer -funroll-loops -DLINUXPPC -fexceptions `sdl-config --cflags` -CFLAGS=-ljgmod `allegro-config --libs release` -lguichan_allegro -lguichan +CFLAGS=`allegro-config --libs release` `sdl-config --libs` -lSDL_mixer -lguichan_allegro -lguichan include file.list MODULES += src/net/win2mac.cpp diff --git a/makefile.macosx b/makefile.macosx index e7ded330..229c932d 100644 --- a/makefile.macosx +++ b/makefile.macosx @@ -3,9 +3,9 @@ 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 +CXXFLAGS =-Wall -O3 -fexpensive-optimizations -pipe -fomit-frame-pointer -funroll-loops -DMACOSX -fexceptions `sdl-config --cflags` -CFLAGS=`allegro-config --libs release` -lguichan_allegro -lguichan /usr/lib/libjgmod.a +CFLAGS=`allegro-config --libs release` `sdl-config --libs` -lSDL_mixer -lguichan_allegro -lguichan /usr/lib/libjgmod.a include file.list MODULES += src/net/win2mac.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 5a935d68..e6dbd2ad 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,7 +42,7 @@ tmw_SOURCES = sound/sound.cpp \ INCLUDES= $(all_includes) # the library search path. -tmw_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) $(LIBALLEGRO_RPATH) +tmw_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) $(LIBALLEGRO_RPATH) -lSDL_mixer tmw_CXXFLAGS = $(LIBSDL_CFLAGS) $(LIBALLEGRO_CFLAGS) tmw_LDADD = $(LIBSDL_LIBS) $(LIBALLEGRO_LIBS) tmw_TARGET = ../tmw |