summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Edwardsson <simon@crossnet.se>2004-09-26 12:54:19 +0000
committerSimon Edwardsson <simon@crossnet.se>2004-09-26 12:54:19 +0000
commite46b2cdbf205d3d2e17266e3168fdbecd5f53222 (patch)
tree8af2a3864ccc24cbbfb0623eb050a372b07c9c4e
parent68b9f46a621333789bfcf234a5f3952086f2c9ae (diff)
downloadmana-e46b2cdbf205d3d2e17266e3168fdbecd5f53222.tar.gz
mana-e46b2cdbf205d3d2e17266e3168fdbecd5f53222.tar.bz2
mana-e46b2cdbf205d3d2e17266e3168fdbecd5f53222.tar.xz
mana-e46b2cdbf205d3d2e17266e3168fdbecd5f53222.zip
Now the new win2mac works and them makefile is updated!-
-rw-r--r--makefile.macosx7
-rw-r--r--tmw.ini2
2 files changed, 4 insertions, 5 deletions
diff --git a/makefile.macosx b/makefile.macosx
index 137ce693..4a054f34 100644
--- a/makefile.macosx
+++ b/makefile.macosx
@@ -8,11 +8,10 @@ CXXFLAGS =-Wall -O3 -fexpensive-optimizations -pipe -fomit-frame-pointer -funrol
CFLAGS=`allegro-config --libs release` -lalfont /usr/lib/libjgmod.a
OBJS = being.o game.o main.o map.o log.o astar.o
-OBJS += Chat/chat.o Gui/skill.o
-OBJS += Sound/sound.o Graphic/SuperEagle.o
+OBJS += Gui/chat.o Gui/skill.o
+OBJS += Sound/sound.o Graphic/SuperEagle.o Graphic/graphic.o
OBJS += Gui/gui.o Gui/login.o Gui/char_server.o Gui/char_select.o Gui/inventory.o
-OBJS += Net/network.o Net/protocol.o
-OBJS += Mac/mac.o
+OBJS += Net/network.o Net/protocol.o Net/win2mac.o
tmw: $(OBJS)
$(CXX) -o tmw $(OBJS) $(CFLAGS)
diff --git a/tmw.ini b/tmw.ini
index 882c3193..cd1d0eb3 100644
--- a/tmw.ini
+++ b/tmw.ini
@@ -28,4 +28,4 @@ stretch = 1
[login]
remember = 1
-username = elven
+username = test2