summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--makefile.macosx12
-rw-r--r--tmw.ini8
2 files changed, 9 insertions, 11 deletions
diff --git a/makefile.macosx b/makefile.macosx
index 3e87191e..2f697716 100644
--- a/makefile.macosx
+++ b/makefile.macosx
@@ -8,17 +8,16 @@ CXXFLAGS =-Wall -O3 -fexpensive-optimizations -pipe -fomit-frame-pointer -funrol
CFLAGS=`allegro-config --libs release` -lalfont
OBJS = being.o game.o main.o map.o log.o astar.o
-OBJS += Sound/sound.o Graphic/SuperEagle.o chat/chat.o
+OBJS += Sound/sound.o Graphic/SuperEagle.o Chat/chat.o
OBJS += Gui/gui.o Gui/login.o Gui/char_server.o Gui/char_select.o
OBJS += Net/network.o Net/protocol.o
OBJS += Mac/mac.o
-#OBJS += ftlzw.o
-ManaWorld: $(OBJS)
- $(CXX) -o ManaWorld $(OBJS) $(CFLAGS)
+tmw: $(OBJS)
+ $(CXX) -o tmw $(OBJS) $(CFLAGS)
@echo -
@echo -
- @echo "TYPE ./ManaWorld TO LAUCH THE GAME"
+ @echo "TYPE ./tmw TO LAUCH THE GAME"
clean:
- rm -fv *.o
@@ -26,5 +25,4 @@ clean:
- rm -fv Gui/*.o
- rm -fv Sound/*.o
- rm -fv Graphic/*.o
- - rm -fv ManaWorld
- - cp Mac/ftlzw.o ftlzw.o
+ - rm -fv tmw
diff --git a/tmw.ini b/tmw.ini
index 96edd033..bc85b73f 100644
--- a/tmw.ini
+++ b/tmw.ini
@@ -1,12 +1,12 @@
[system]
system =
-keyboard = it
+keyboard = en
language =
[server]
;host = animesites.de
-host = themanaworld.homeip.net
-;host = telekommunisten.dyndns.org
+;host = themanaworld.homeip.net
+host = 10.0.0.3
port = 6901
[settings]
@@ -15,4 +15,4 @@ sound = 1
[login]
remember = 1
-username = elven
+username = kth5