From df56031961a155c6dd01159a37f11ff024f2099b Mon Sep 17 00:00:00 2001 From: scarab Date: Mon, 14 Jul 2008 16:22:35 +0000 Subject: - oprava warningu ve win - uprava cmake pro win - stale hazi 1 chybu pri linkovani - zkuste to hlavne na linuxu aby sme vedeli jestli tam nejsou nejake chyby co sem zanesl do kodu git-svn-id: http://opensvn.csie.org/tuxanci_ng@136 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- config.h | 2 +- src/CMakeLists.txt | 16 +++++++++++++--- src/base/arena.h | 4 ++++ src/base/idManager.h | 4 ++++ src/base/item.h | 4 ++++ src/base/modules.c | 16 +++++++++++----- src/base/shot.h | 4 ++++ src/base/textFile.h | 4 ++++ src/modules/CMakeLists.txt | 18 +++++++++++++++--- 9 files changed, 60 insertions(+), 12 deletions(-) diff --git a/config.h b/config.h index df61faf..b4b2ea0 100644 --- a/config.h +++ b/config.h @@ -1 +1 @@ -#define TUXANCI_NG_VERSION "svn135" +#define TUXANCI_NG_VERSION "svn136" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 538b3a6..9b621fe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -47,8 +47,10 @@ IF ( NOT Server ) # server nebo klient FIND_PACKAGE ( SDL REQUIRED ) FIND_PACKAGE ( SDL_image REQUIRED ) FIND_PACKAGE ( SDL_ttf REQUIRED ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) + ELSE ( NOT Win ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain wsock32 ) ENDIF ( NOT Win ) - LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) MESSAGE ( STATUS "" ) MESSAGE ( STATUS "<******************************>" ) INCLUDE_DIRECTORIES ( ${WORKDIR}/client ) @@ -65,7 +67,11 @@ IF ( NOT Server ) # server nebo klient FIND_PACKAGE ( SDL_mixer REQUIRED ) ENDIF ( NOT Win ) INCLUDE_DIRECTORIES ( ${SDLMIXER_INCLUDE_DIR} ) - LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) + IF ( NOT Win ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) + ELSE ( NOT Win ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain wsock32 ) + ENDIF ( NOT Win ) ELSE (NOT NO_Audio) MESSAGE ( STATUS "" ) ADD_DEFINITIONS ( -DNO_SOUND ) @@ -76,7 +82,11 @@ IF ( NOT Server ) # server nebo klient SET (TUX_BIN "tuxanci-ng") ELSE ( NOT Server ) # kontrola libdl - LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) + IF ( NOT Win ) + LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) + ELSE ( NOT Win ) + LINK_LIBRARIES ( ${CMAKE_DL_LIBS} SDLmain wsock32 ) + ENDIF ( NOT Win ) MESSAGE ( STATUS "" ) MESSAGE ( STATUS "<******************************>" ) INCLUDE_DIRECTORIES ( ${WORKDIR}/server ) diff --git a/src/base/arena.h b/src/base/arena.h index 837fade..e7f70ea 100644 --- a/src/base/arena.h +++ b/src/base/arena.h @@ -9,6 +9,10 @@ #include "interface.h" #endif +#ifdef __WIN32__ +#define random rand +#endif + #include "list.h" #include "space.h" diff --git a/src/base/idManager.h b/src/base/idManager.h index a261316..cdd51e9 100644 --- a/src/base/idManager.h +++ b/src/base/idManager.h @@ -7,6 +7,10 @@ #define MAX_ID 1000 #define ID_UNKNOWN -1 +#ifdef __WIN32__ +#define random rand +#endif + #include "list.h" extern void initListID(); diff --git a/src/base/item.h b/src/base/item.h index 110c044..e7900d7 100644 --- a/src/base/item.h +++ b/src/base/item.h @@ -11,6 +11,10 @@ #include "interface.h" #endif +#ifdef __WIN32__ +#define random rand +#endif + #include "list.h" #include "tux.h" #include "myTimer.h" diff --git a/src/base/modules.c b/src/base/modules.c index 4746bdb..7dd3148 100755 --- a/src/base/modules.c +++ b/src/base/modules.c @@ -90,7 +90,7 @@ static module_t* newModule(char *name) assert( name != NULL ); ret = malloc( sizeof(module_t) ); - #ifndef __WIN32__ +#ifndef __WIN32__ ret->image = dlopen (name, RTLD_LAZY); if(!ret->image) @@ -99,7 +99,7 @@ static module_t* newModule(char *name) free(ret); return NULL; } - #else +#else HINSTANCE image; image = LoadLibrary((LPCSTR) name); if (!image) @@ -124,8 +124,7 @@ static module_t* newModule(char *name) } ret->image = image; free(image); - free(image); - #endif +#endif ret->file = strdup(name); ret->fce_init = getFce(ret, "init"); @@ -143,8 +142,11 @@ static module_t* newModule(char *name) if( ret->fce_init(&export_fce) != 0 ) { fprintf(stderr, "init module failed !\n"); - +#ifndef __WIN32__ dlclose(ret->image); +#else + free(ret->image); +#endif free(ret->file); free(ret); return NULL; @@ -160,7 +162,11 @@ static int destroyModule(module_t *p) p->fce_destroy(); free(p->file); +#ifndef __WIN32__ dlclose(p->image); +#else + free(p->image); +#endif free(p); printf("destroy module..\n"); diff --git a/src/base/shot.h b/src/base/shot.h index 06e1bba..c507976 100644 --- a/src/base/shot.h +++ b/src/base/shot.h @@ -8,6 +8,10 @@ #include "tux.h" #include "arena.h" +#ifdef __WIN32__ +#define random rand +#endif + #ifndef PUBLIC_SERVER #include "interface.h" #endif diff --git a/src/base/textFile.h b/src/base/textFile.h index 3917db7..d9c7b4d 100755 --- a/src/base/textFile.h +++ b/src/base/textFile.h @@ -5,6 +5,10 @@ #include "list.h" +#ifdef __WIN32__ +#define lstat stat +#endif + typedef struct str_textFile_t { char *file; diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 9c2c09a..da703ce 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -16,13 +16,25 @@ IF ( NOT Server ) FIND_PACKAGE ( SDL_mixer REQUIRED ) ENDIF ( NOT Win ) INCLUDE_DIRECTORIES ( ${SDLMIXER_INCLUDE_DIR} ) - LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) + IF ( NOT Win ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) + ELSE ( NOT Win ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain wsock32 ) + ENDIF ( NOT Win ) ELSE (NOT NO_Audio) ADD_DEFINITIONS ( -DNO_SOUND ) - LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) + IF ( NOT Win ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) + ELSE ( NOT Win ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain wsock32 ) + ENDIF ( NOT Win ) ENDIF ( NOT NO_Audio ) ELSE ( NOT Server ) - LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) + IF ( NOT Win ) + LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) + ELSE ( NOT Win ) + LINK_LIBRARIES ( ${CMAKE_DL_LIBS} SDLmain wsock32 ) + ENDIF ( NOT Win ) INCLUDE_DIRECTORIES ( ${WORKDIR}/server ) ENDIF ( NOT Server ) SET ( SRC_base_modules -- cgit v1.2.3