summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2004-12-19 17:27:57 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2004-12-19 17:27:57 +0000
commitced75104307b415339e9529cf27bc33a42ac9581 (patch)
treee91d0c52e8e011a7b78809d3121a1ab8c8cd70b6
parenta432321fb91bc0afbe802878fcd45adcee946a5b (diff)
downloadmana-ced75104307b415339e9529cf27bc33a42ac9581.tar.gz
mana-ced75104307b415339e9529cf27bc33a42ac9581.tar.bz2
mana-ced75104307b415339e9529cf27bc33a42ac9581.tar.xz
mana-ced75104307b415339e9529cf27bc33a42ac9581.zip
Some makefile updates.
-rw-r--r--makefile.linuxppc2
-rw-r--r--makefile.macosx2
-rw-r--r--makefile.mgw3
-rw-r--r--makefile.static4
4 files changed, 5 insertions, 6 deletions
diff --git a/makefile.linuxppc b/makefile.linuxppc
index dd119a91..0455fc2a 100644
--- a/makefile.linuxppc
+++ b/makefile.linuxppc
@@ -5,7 +5,7 @@ CXX = g++
# excessive optimizations for pentium pro and later
CXXFLAGS =-Wall -O3 -fexpensive-optimizations -pipe -fomit-frame-pointer -funroll-loops -DLINUXPPC -fexceptions
-CFLAGS=-ljgmod `allegro-config --libs release` -lalfont
+CFLAGS=-ljgmod `allegro-config --libs release` -lguichan_allegro -lguichan
include file.list
MODULES += src/net/win2mac.cpp
diff --git a/makefile.macosx b/makefile.macosx
index 3df4f681..e7ded330 100644
--- a/makefile.macosx
+++ b/makefile.macosx
@@ -5,7 +5,7 @@ CXX = g++
# excessive optimizations for pentium pro and later
CXXFLAGS =-Wall -O3 -fexpensive-optimizations -pipe -fomit-frame-pointer -funroll-loops -DMACOSX -fexceptions
-CFLAGS=`allegro-config --libs release` -lalfont /usr/lib/libjgmod.a
+CFLAGS=`allegro-config --libs release` -lguichan_allegro -lguichan /usr/lib/libjgmod.a
include file.list
MODULES += src/net/win2mac.cpp
diff --git a/makefile.mgw b/makefile.mgw
index 1f7c565e..c9bb582d 100644
--- a/makefile.mgw
+++ b/makefile.mgw
@@ -5,8 +5,7 @@ CXX = g++
# excessive optimizations for pentium pro and later
CXXFLAGS +=-Wall -march=i686 -O3 -fexpensive-optimizations -pipe -fomit-frame-pointer -funroll-loops -fexceptions
-LIBS := -ljgmod -lalfont -lguichan \
- -lguichan_allegro -lalleg -lws2_32
+LIBS := -ljgmod -lguichan_allegro -lguichan -lalleg -lws2_32
include file.list
diff --git a/makefile.static b/makefile.static
index 888ad24e..144337f8 100644
--- a/makefile.static
+++ b/makefile.static
@@ -1,9 +1,9 @@
CXX = g++
# for debugging
-#CXXFLAGS += -g -march=i686 -O2
+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
CXXFLAGS +=`allegro-config --cflags release`
LIBS := -ljgmod `allegro-config --libs release` -lguichan_allegro -lguichan