summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororoborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-05-28 20:19:02 +0000
committeroroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-05-28 20:19:02 +0000
commit13cb3930e9989aba57f0301a821f64ceed29af20 (patch)
treeeb4bc65423ae9e5c2711936c55a13bb1819c9578
parente5120505b21ff38dc25efcad129a440bbfa9996d (diff)
- moduly sa daju skompilovat pre server aj ked nemate libSDL-dev scripty
POZOR : moduly pre server sa kompiluju ako make servermod - upraveny README.SK - upraveny publicserver.sh git-svn-id: http://opensvn.csie.org/tuxanci_ng@56 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
-rw-r--r--Makefile5
-rw-r--r--README.sk9
-rwxr-xr-xmodules/Makefile-publicserver21
-rwxr-xr-xmodules/modPipe.c5
-rwxr-xr-xmodules/modTeleport.c5
-rwxr-xr-xmodules/modWall.c5
-rwxr-xr-xpublicserver.sh4
7 files changed, 47 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 52daf76..62237a1 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,11 @@ mod:
make -C ./modules -f Makefile modPipe
make -C ./modules -f Makefile modWall
+servermod:
+ make -C ./modules -f Makefile-publicserver modTeleport
+ make -C ./modules -f Makefile-publicserver modPipe
+ make -C ./modules -f Makefile-publicserver modWall
+
install:
mkdir -p $(DESTDIR)/bin
mkdir -p $(DESTDIR)/share/tuxanci-ng/{arena,data,font,image,lang,music,sound,conf,modules}
diff --git a/README.sk b/README.sk
index b0770c7..3aedb70 100644
--- a/README.sk
+++ b/README.sk
@@ -17,11 +17,11 @@
ldd -u `which tuxanci-ng`
Unused direct dependencies:
+ /usr/lib/libSDL-1.2.so.0
/usr/lib/libSDL_image-1.2.so.0
- /usr/lib/libSDL_mixer-1.2.so.0
/usr/lib/libSDL_ttf-2.0.so.0
+ /usr/lib/libSDL_mixer-1.2.so.0
/usr/lib/libSDL_net-1.2.so.0
- /usr/lib/libSDL-1.2.so.0
make clean
----------
@@ -81,6 +81,11 @@
kompilujeme server
+ make servermod
+ --------------
+
+ skompilumjeme moduly pre server
+
./build-server/publicserver
--------------
diff --git a/modules/Makefile-publicserver b/modules/Makefile-publicserver
new file mode 100755
index 0000000..3614599
--- /dev/null
+++ b/modules/Makefile-publicserver
@@ -0,0 +1,21 @@
+
+CFLAGS = -g -O0 -I../include -Wall
+
+modTeleport:
+ gcc $(CFLAGS) -fPIC -I../include -c list.c -o list.o
+ gcc $(CFLAGS) -fPIC -I../include -c modTeleport.c -o modTeleport.o
+ gcc $(CFLAGS) -I../include -shared -fPIC -o modTeleport.so modTeleport.o list.o
+
+modPipe:
+ gcc $(CFLAGS) -fPIC -I../include -c list.c -o list.o
+ gcc $(CFLAGS) -fPIC -I../include -c modPipe.c -o modPipe.o
+ gcc $(CFLAGS) -I../include -shared -fPIC -o modPipe.so modPipe.o list.o
+
+modWall:
+ gcc $(CFLAGS) -fPIC -I../include -c list.c -o list.o
+ gcc $(CFLAGS) -fPIC -I../include -c modWall.c -o modWall.o
+ gcc $(CFLAGS) -I../include -shared -fPIC -o modWall.so modWall.o list.o
+
+clean:
+ rm -rf *.o
+ rm -rf *.so
diff --git a/modules/modPipe.c b/modules/modPipe.c
index 476d8ec..1078948 100755
--- a/modules/modPipe.c
+++ b/modules/modPipe.c
@@ -5,13 +5,16 @@
#include <assert.h>
#include "main.h"
-#include "interface.h"
#include "modules.h"
#include "tux.h"
#include "shot.h"
#include "list.h"
#include "gun.h"
+
+#ifndef PUBLIC_SERVER
+#include "interface.h"
#include "image.h"
+#endif
#ifdef PUBLIC_SERVER
#include "publicServer.h"
diff --git a/modules/modTeleport.c b/modules/modTeleport.c
index 502b3ef..306d190 100755
--- a/modules/modTeleport.c
+++ b/modules/modTeleport.c
@@ -5,13 +5,16 @@
#include <assert.h>
#include "main.h"
-#include "interface.h"
#include "modules.h"
#include "tux.h"
#include "shot.h"
#include "list.h"
#include "gun.h"
+
+#ifndef PUBLIC_SERVER
+#include "interface.h"
#include "image.h"
+#endif
#ifdef PUBLIC_SERVER
#include "publicServer.h"
diff --git a/modules/modWall.c b/modules/modWall.c
index d435613..ba8593a 100755
--- a/modules/modWall.c
+++ b/modules/modWall.c
@@ -5,13 +5,16 @@
#include <assert.h>
#include "main.h"
-#include "interface.h"
#include "modules.h"
#include "tux.h"
#include "shot.h"
#include "list.h"
#include "gun.h"
+
+#ifndef PUBLIC_SERVER
+#include "interface.h"
#include "image.h"
+#endif
#ifdef PUBLIC_SERVER
#include "publicServer.h"
diff --git a/publicserver.sh b/publicserver.sh
index b47c6d8..086e55c 100755
--- a/publicserver.sh
+++ b/publicserver.sh
@@ -1,5 +1,5 @@
#!/bin/bash
export LD_LIBRARY_PATH="/usr/debug/lib/"
-ldd -u src/publicserver
+ldd -u build-server/publicserver
ulimit -c unlimited
-nohup ./src/publicserver &
+nohup ./build-server/publicserver &