diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/Makefile | 1 | ||||
| -rwxr-xr-x | src/Makefile-publicServer | 61 | ||||
| -rw-r--r-- | src/publicServer.c | 2 |
3 files changed, 34 insertions, 30 deletions
diff --git a/src/Makefile b/src/Makefile index 990b752..861529f 100755 --- a/src/Makefile +++ b/src/Makefile @@ -174,5 +174,6 @@ keytable.o: keytable.c ../include/keytable.h language.o: language.c ../include/language.h $(CC) $(CFLAGS) -o language.o -c language.c + clean: rm -rf *.o *.c~ ../include/*.h~ Makefile~ tuxanci-ng diff --git a/src/Makefile-publicServer b/src/Makefile-publicServer index 0d589e4..498372a 100755 --- a/src/Makefile-publicServer +++ b/src/Makefile-publicServer @@ -7,85 +7,88 @@ 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/ +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\ + 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 serverConfigFile.o -$(BUILD_DIR)publicserver: $(FILES) - $(CC) $(CFLAGS) $(LIBS) -o $(BUILD_DIR)publicserver $(BUILD_DIR)*.o +$(BUILD_DIR)/publicserver: mkdir_build $(FILES) + $(CC) $(CFLAGS) $(LIBS) -o $(BUILD_DIR)/publicserver $(BUILD_DIR)/*.o + +mkdir_build: + mkdir -p $(BUILD_DIR) publicServer.o: publicServer.c - $(CC) $(CFLAGS) -o $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 $(BUILD_DIR)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 - + $(CC) $(CFLAGS) -o $(BUILD_DIR)/serverConfigFile.o -c serverConfigFile.c clean: - rm -rf $(BUILD_DIR)*.o *.c~ ../include*.h~ Makefile-publicServer~ $(BUILD_DIR)publicserver + rm -rf $(BUILD_DIR) ../include*.h~ Makefile-publicServer~ + diff --git a/src/publicServer.c b/src/publicServer.c index f1907e9..d6910f7 100644 --- a/src/publicServer.c +++ b/src/publicServer.c @@ -60,7 +60,7 @@ int initPublicServer() return -1; } - setServerMaxClients( atoi( getSetting("MAX_CLIENTS", "--maxclients", "100") )); + setServerMaxClients( atoi( getSetting("MAX_CLIENTS", "--maxclients", "32") )); return 0; } |