diff options
| author | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-08-22 20:13:10 +0000 |
|---|---|---|
| committer | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-08-22 20:13:10 +0000 |
| commit | 37dc1c5480ea219c624ac2740506208f23296ede (patch) | |
| tree | f92f3834f29f0b716d032d767a00b51811b5ad05 /src | |
| parent | 090ca3434016213e9d0b84a3fa0d629fb47ff6a3 (diff) | |
- opet fungujeme na windows, docasne pomoci udp
- todo: odstranit udp a prejit na tcp + hromada testovani
git-svn-id: http://opensvn.csie.org/tuxanci_ng@241 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | src/base/path.h.in | 2 | ||||
| -rw-r--r-- | src/base/server.h | 10 |
3 files changed, 23 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c6f7e3f..d912e00 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,6 +23,19 @@ ENDIF ( Win ) # Command for finding correct file names in directory, replace DIR with # directory name you want eg: base # find ./ -maxdepth 1 -type f -name \*.c |grep "$" |sed -e 's/^\.\//\$\{WORKDIR\}\/DIR\//' -e 's/\.c//' |tr '\n' ' ' + +# ugly hack +IF ( Win ) + SET ( SRC_base + ${SRC_base} + ${WORKDIR}/net/udp + ${WORKDIR}/base/udp_server ) +ELSE ( Win ) + SET ( SRC_base + ${SRC_base} + ${WORKDIR}/net/tcp + ${WORKDIR}/base/tcp_server ) +ENDIF ( Win ) SET ( SRC_base ${SRC_base} ${WORKDIR}/base/main ${WORKDIR}/base/shot @@ -30,7 +43,6 @@ SET ( SRC_base ${WORKDIR}/base/storage ${WORKDIR}/base/myTimer ${WORKDIR}/base/protect ${WORKDIR}/base/list ${WORKDIR}/base/arena ${WORKDIR}/base/server - ${WORKDIR}/base/udp_server ${WORKDIR}/base/tcp_server ${WORKDIR}/base/serverSelect ${WORKDIR}/base/serverSendMsg ${WORKDIR}/base/textFile ${WORKDIR}/base/gun ${WORKDIR}/base/arenaFile ${WORKDIR}/base/modules @@ -40,7 +52,6 @@ SET ( SRC_base ${WORKDIR}/base/homeDirector ${WORKDIR}/base/proto ${WORKDIR}/base/shareFunction ${WORKDIR}/base/buffer - ${WORKDIR}/net/udp ${WORKDIR}/net/tcp ${WORKDIR}/net/dns ) diff --git a/src/base/path.h.in b/src/base/path.h.in index d2b75d4..fff9fac 100644 --- a/src/base/path.h.in +++ b/src/base/path.h.in @@ -15,7 +15,7 @@ #ifndef __WIN32__ #define PATH_MODULES "@LIB_INSTALL_DIR@" "/" APPNAME "-" "@TUXANCI_VERSION@" "/" #else - #define PATH_MODULES PREFIX "/bin/" + #define PATH_MODULES PREFIX #endif #define PATH_IMAGE PATH_DIR "images/" #define FONT_FILE "@CMAKE_FONT@" diff --git a/src/base/server.h b/src/base/server.h index 63d1c09..f843fea 100644 --- a/src/base/server.h +++ b/src/base/server.h @@ -9,8 +9,13 @@ #include "tux.h" #include "myTimer.h" #include "protect.h" +#ifdef SUPPORT_UDP #include "udp.h" +#endif + +#ifdef SUPPORT_TCP #include "tcp.h" +#endif #include "buffer.h" #ifndef PUBLIC_SERVER @@ -31,9 +36,12 @@ typedef struct client_struct { int type; +#ifdef SUPPORT_UDP sock_udp_t *socket_udp; +#endif +#ifdef SUPPORT_TCP sock_tcp_t *socket_tcp; - +#endif buffer_t *recvBuffer; buffer_t *sendBuffer; |