- moznost nastavit si klavesy na ovladanie v ~/.tuxanci-ng/keycontrol.conf

- moznost prekladat texty do roznych jazykov, defult jazyk je EN, nastavenie je v ~/.tuxanci-ng/lang.conf
- moznost nastavit server pomocou konfiguraku ./server.conf
- uptime v sekudach a samorestartovaci casocvac tam este _NIE_ _JE_



git-svn-id: http://opensvn.csie.org/tuxanci_ng@39 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

1 files changed, 31 insertions, 26 deletions

diff --git a/src/Makefile-publicServer b/src/Makefile-publicServer
index a9fc788..0d589e4 100755
--- a/src/Makefile-publicServer
+++ b/src/Makefile-publicServer
@@ -7,80 +7,85 @@ DESTDIR:=/usr/local
 CFLAGS = -g -O0 -DPUBLIC_SERVER -DSUPPORT_NET_UNIX_UDP -I../include -Wall
 #CFLAGS = -O2 -DDESTDIR=\"$(DESTDIR)\" `sdl-config --cflags` -I../include -Wall
 
+BUILD_DIR = ../build-server/
 LIBS =
 
 FILES = list.o director.o configFile.o tux.o wall.o shot.o myTimer.o  \
 	buffer.o dynamicInt.o arena.o arenaFile.o textFile.o gun.o item.o teleport.o pipe.o\
-	udp.o proto.o server.o publicServer.o net_multiplayer.o
+	udp.o proto.o server.o publicServer.o net_multiplayer.o serverConfigFile.o
 
-publicserver: $(FILES)
-	$(CC) $(CFLAGS) $(LIBS) -o publicserver $(FILES)
+$(BUILD_DIR)publicserver: $(FILES)
+	$(CC) $(CFLAGS) $(LIBS) -o $(BUILD_DIR)publicserver $(BUILD_DIR)*.o
 
 publicServer.o: publicServer.c 
-	$(CC) $(CFLAGS) -o publicServer.o -c publicServer.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)publicServer.o -c publicServer.c
 
 list.o: list.c ../include/list.h
-	$(CC) $(CFLAGS) -o list.o -c list.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)list.o -c list.c
 
 director.o: director.c ../include/director.h
-	$(CC) $(CFLAGS) -o director.o -c director.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)director.o -c director.c
 
 configFile.o: configFile.c ../include/configFile.h
-	$(CC) $(CFLAGS) -o configFile.o -c configFile.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)configFile.o -c configFile.c
 
 tux.o: tux.c ../include/tux.h
-	$(CC) $(CFLAGS) -o tux.o -c tux.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)tux.o -c tux.c
 
 wall.o: wall.c ../include/wall.h
-	$(CC) $(CFLAGS) -o wall.o -c wall.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)wall.o -c wall.c
 
 shot.o: shot.c ../include/shot.h
-	$(CC) $(CFLAGS) -o shot.o -c shot.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)shot.o -c shot.c
 
 myTimer.o: myTimer.c ../include/myTimer.h
-	$(CC) $(CFLAGS) -o myTimer.o -c myTimer.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)myTimer.o -c myTimer.c
 
 buffer.o: buffer.c ../include/buffer.h
-	$(CC) $(CFLAGS) -o buffer.o -c buffer.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)buffer.o -c buffer.c
 
 tcp.o: tcp.c ../include/tcp.h
-	$(CC) $(CFLAGS) -o tcp.o -c tcp.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)tcp.o -c tcp.c
 
 udp.o: udp.c ../include/udp.h
-	$(CC) $(CFLAGS) -o udp.o -c udp.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)udp.o -c udp.c
 
 proto.o: proto.c ../include/proto.h
-	$(CC) $(CFLAGS) -o proto.o -c proto.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)proto.o -c proto.c
 
 server.o: server.c ../include/server.h
-	$(CC) $(CFLAGS) -o server.o -c server.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)server.o -c server.c
 
 net_multiplayer.o: net_multiplayer.c ../include/net_multiplayer.h
-	$(CC) $(CFLAGS) -o net_multiplayer.o -c net_multiplayer.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)net_multiplayer.o -c net_multiplayer.c
 
 dynamicInt.o: dynamicInt.c ../include/dynamicInt.h
-	$(CC) $(CFLAGS) -o dynamicInt.o -c dynamicInt.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)dynamicInt.o -c dynamicInt.c
 
 arena.o: arena.c ../include/arena.h
-	$(CC) $(CFLAGS) -o arena.o -c arena.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)arena.o -c arena.c
 
 textFile.o: textFile.c ../include/textFile.h
-	$(CC) $(CFLAGS) -o textFile.o -c textFile.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)textFile.o -c textFile.c
 
 arenaFile.o: arenaFile.c ../include/arenaFile.h
-	$(CC) $(CFLAGS) -o arenaFile.o -c arenaFile.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)arenaFile.o -c arenaFile.c
 
 gun.o: gun.c ../include/gun.h
-	$(CC) $(CFLAGS) -o gun.o -c gun.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)gun.o -c gun.c
 
 item.o: item.c ../include/item.h
-	$(CC) $(CFLAGS) -o item.o -c item.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)item.o -c item.c
 
 teleport.o: teleport.c ../include/teleport.h
-	$(CC) $(CFLAGS) -o teleport.o -c teleport.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)teleport.o -c teleport.c
 
 pipe.o: pipe.c ../include/pipe.h
-	$(CC) $(CFLAGS) -o pipe.o -c pipe.c
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)pipe.o -c pipe.c
+
+serverConfigFile.o: serverConfigFile.c ../include/serverConfigFile.h
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)serverConfigFile.o -c serverConfigFile.c
+
 
 clean:
-	rm -rf *.o *.c~ ../include*.h~ Makefile-publicServer~ publicserver
+	rm -rf $(BUILD_DIR)*.o *.c~ ../include*.h~ Makefile-publicServer~ $(BUILD_DIR)publicserver