diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | config.h | 2 | ||||
| -rwxr-xr-x | src/base/modules.c | 4 | ||||
| -rw-r--r-- | src/base/path.h | 2 | ||||
| -rw-r--r-- | src/screen/screen_world.c | 2 | ||||
| -rw-r--r-- | src/server/heightScore.c | 1 |
6 files changed, 11 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f0f8ac..c354a33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ IF ( Apple ) CACHE_INTERNAL "OSX Architectures" FORCE ) ENDIF ( Apple ) -IF ( Win ) +IF ( Win AND NOT Server ) # budeme pocitat s tim ze uzivatel ma vse v C:\MinGW\lib ... # tise predpokladame ze s automatikou chce MinGW only, jinak si to bude muset nastavit rucne... MESSAGE ( "<******************************>" ) @@ -48,7 +48,7 @@ IF ( Win ) SET ( SDLMIXER_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include/" ) SET ( SDLIMAGE_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include/" ) SET ( SDLTTF_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include/" ) -ENDIF ( Win ) +ENDIF ( Win AND NOT Server) SET ( CMAKE_COLOR_MAKEFILE ON ) ## balickovani SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README" ) @@ -101,7 +101,7 @@ SET ( CMAKE_INSTALL_DATADIR share/ ) IF ( NOT Win ) SET ( CMAKE_INSTALL_ETCDIR /etc ) ELSE ( NOT Win ) - SET ( CMAKE_INSTALL_ETCDIR /etc ) + SET ( CMAKE_INSTALL_ETCDIR etc ) ENDIF ( NOT Win ) IF ( Server ) INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/conf/server.conf DESTINATION ${CMAKE_INSTALL_ETCDIR}/${APPNAME} ) @@ -124,6 +124,7 @@ INSTALL ( FILES ${CMAKE_SOURCE_DIR}/AUTHORS DESTINATION ${CMAKE_INSTALL_DATADIR} INSTALL ( FILES ${CMAKE_SOURCE_DIR}/README DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/arena/*.map" ) INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/arena/ ) +IF ( NOT Server ) IF ( Win ) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.dll" ) INSTALL ( FILES ${files} DESTINATION bin/ ) @@ -134,6 +135,7 @@ IF ( Win ) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.la" ) INSTALL ( FILES ${files} DESTINATION bin/ ) ENDIF ( Win ) +ENDIF ( NOT Server ) CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" @@ -1 +1 @@ -#define TUXANCI_NG_VERSION "svn144" +#define TUXANCI_NG_VERSION "svn145" diff --git a/src/base/modules.c b/src/base/modules.c index f9f8c41..a7c6160 100755 --- a/src/base/modules.c +++ b/src/base/modules.c @@ -121,7 +121,7 @@ static module_t* newModule(char *name) return NULL; } ret->image = image; - FreeLibrary(image); + //FreeLibrary(image); //to tu nema bejt #endif ret->file = strdup(name); @@ -135,7 +135,7 @@ static module_t* newModule(char *name) ret->fce_cmd = getFce(ret, "cmdArena"); ret->fce_recvMsg = getFce(ret, "recvMsg"); - printf("load module.. (%s)\n", name); + printf("load module: (%s)\n", name); if( ret->fce_init(&export_fce) != 0 ) { diff --git a/src/base/path.h b/src/base/path.h index 75a2f55..294e634 100644 --- a/src/base/path.h +++ b/src/base/path.h @@ -26,7 +26,7 @@ #define PATH_MODULES PREFIX "/lib/tuxanci-ng-server/" #define SERVER_CONFIG "/etc/tuxanci-ng-server/server.conf" #else - #define PATH_MODULES PREFIX "/bin" + #define PATH_MODULES PREFIX "/bin/" #define SERVER_CONFIG PREFIX "/etc/tuxanci-ng-server/server.conf" #endif #endif diff --git a/src/screen/screen_world.c b/src/screen/screen_world.c index 030c690..b770bd5 100644 --- a/src/screen/screen_world.c +++ b/src/screen/screen_world.c @@ -144,7 +144,7 @@ void prepareArena() if( isSettingAI() ) { - if( loadModule("libmodAI.so") == 0 ) + if( loadModule("libmodAI") == 0 ) { tux->control = TUX_CONTROL_AI; } diff --git a/src/server/heightScore.c b/src/server/heightScore.c index fa7402e..a236439 100644 --- a/src/server/heightScore.c +++ b/src/server/heightScore.c @@ -67,6 +67,7 @@ int addPlayerInHighScore(char *name, int score) sprintf(new, "%s %d", name, score); insList(textFile->text, i, strdup(new) ); delListItem(textFile->text, HEIGHTSCORE_MAX_PLAYERS, free); + printTextFile(textFile); saveTextFile(textFile); return 0; |