From fb719bceb294c7a9b88dbf43124d0165826e9272 Mon Sep 17 00:00:00 2001 From: scarab Date: Mon, 14 Jul 2008 20:35:45 +0000 Subject: - pridana autonomni kompilace na win (potreba pouze kompiler a cmake) git-svn-id: http://opensvn.csie.org/tuxanci_ng@140 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- src/CMakeLists.txt | 6 +++--- src/base/homeDirector.c | 6 ++++-- src/base/modules.c | 2 -- src/base/path.h | 8 ++++++++ src/base/textFile.c | 17 ++++++++++------- src/client/language.c | 5 ++++- src/modules/CMakeLists.txt | 6 +++--- src/server/publicServer.c | 3 ++- 8 files changed, 34 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9b621fe..af854ea 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -49,7 +49,7 @@ IF ( NOT Server ) # server nebo klient 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 ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} wsock32 ) ENDIF ( NOT Win ) MESSAGE ( STATUS "" ) MESSAGE ( STATUS "<******************************>" ) @@ -70,7 +70,7 @@ IF ( NOT Server ) # server nebo klient 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 ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} wsock32 ) ENDIF ( NOT Win ) ELSE (NOT NO_Audio) MESSAGE ( STATUS "" ) @@ -85,7 +85,7 @@ ELSE ( NOT Server ) IF ( NOT Win ) LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) ELSE ( NOT Win ) - LINK_LIBRARIES ( ${CMAKE_DL_LIBS} SDLmain wsock32 ) + LINK_LIBRARIES ( ${CMAKE_DL_LIBS} wsock32 ) ENDIF ( NOT Win ) MESSAGE ( STATUS "" ) MESSAGE ( STATUS "<******************************>" ) diff --git a/src/base/homeDirector.c b/src/base/homeDirector.c index 6abfb56..a3ae1d1 100755 --- a/src/base/homeDirector.c +++ b/src/base/homeDirector.c @@ -13,9 +13,11 @@ static char homeDirector[STR_PATH_SIZE]; void createHomeDirector() { char *envHome; - +#ifndef __WIN32__ envHome = getenv("HOME"); - +#else + envHome = getenv("USERPROFILE"); +#endif if( envHome == NULL ) { fprintf(stderr, "Environment HOME not found !\n"); diff --git a/src/base/modules.c b/src/base/modules.c index b42df8b..a45bfc6 100755 --- a/src/base/modules.c +++ b/src/base/modules.c @@ -4,8 +4,6 @@ #include #ifndef __WIN32__ #include -#else -#include #endif #include diff --git a/src/base/path.h b/src/base/path.h index 8765ed5..d647710 100644 --- a/src/base/path.h +++ b/src/base/path.h @@ -6,7 +6,11 @@ #include "main.h" #ifndef PREFIX +#ifndef __WIN32__ #define PREFIX "/usr/local" +#else +#endif +#define PREFIX ".." #endif #ifndef PUBLIC_SERVER @@ -15,7 +19,11 @@ #else #define PATH_DIR PREFIX "/share/tuxanci-ng-server/" #define PATH_MODULES PREFIX "/lib/tuxanci-ng-server/" +#ifndef __WIN32__ #define SERVER_CONFIG "/etc/tuxanci-ng-server/server.conf" +#else + #define SERVER_CONFIG PREFIX "/etc/tuxanci-ng-server/server.conf" +#endif #endif #define PATH_IMAGE PATH_DIR "image/" diff --git a/src/base/textFile.c b/src/base/textFile.c index e5636ae..a996ac8 100755 --- a/src/base/textFile.c +++ b/src/base/textFile.c @@ -13,10 +13,12 @@ textFile_t* newTextFile(char *s) { textFile_t *new; char path[STR_PATH_SIZE]; - assert( s != NULL ); - +#ifndef __WIN32__ if( s[0] == '/' ) +#else + if( s[1] == ':' ) +#endif { strcpy(path, s); } @@ -26,7 +28,6 @@ textFile_t* newTextFile(char *s) strcat(path, "/"); strcat(path, s); } - new = malloc(sizeof(textFile_t)); new->file = strdup(path); new->text = newList(); @@ -86,7 +87,7 @@ textFile_t* loadTextFile(char *s) } file_length = buf.st_size; - if( (file = fopen(s, "rt")) == NULL ) + if( (file = fopen(s, "rb")) == NULL ) { fprintf(stderr, "ERROR: unable to open file %s for reading\n", s); return NULL; @@ -133,14 +134,16 @@ void saveTextFile(textFile_t *p) { int i; FILE *file; - assert( p != NULL ); - + file = fopen(p->file, "wt"); - for(i = 0; i < p->text->count; i++) { +#ifndef __WIN32__ fprintf(file, "%s\n", (char *)p->text->list[i]); +#else + fprintf(file, "%s\r\n", (char *)p->text->list[i]); +#endif } fclose(file); diff --git a/src/client/language.c b/src/client/language.c index 6200e92..9431dcf 100644 --- a/src/client/language.c +++ b/src/client/language.c @@ -70,8 +70,11 @@ int initLanguage() lang = ((char *)languageTypeFile->text->list[0]); printf("select lang %s\n", lang); - + + printf("PATH_LANG = %s\n", PATH_LANG); + printf("lang = %s\n", lang); sprintf(path, PATH_LANG "%s.lang", lang); + printf("path = %s\n", path); destroyTextFile(languageTypeFile); diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index da703ce..a9a8cc9 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -19,21 +19,21 @@ IF ( NOT Server ) 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 ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} wsock32 ) ENDIF ( NOT Win ) ELSE (NOT NO_Audio) ADD_DEFINITIONS ( -DNO_SOUND ) 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 ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} wsock32 ) ENDIF ( NOT Win ) ENDIF ( NOT NO_Audio ) ELSE ( NOT Server ) IF ( NOT Win ) LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) ELSE ( NOT Win ) - LINK_LIBRARIES ( ${CMAKE_DL_LIBS} SDLmain wsock32 ) + LINK_LIBRARIES ( ${CMAKE_DL_LIBS} wsock32 ) ENDIF ( NOT Win ) INCLUDE_DIRECTORIES ( ${WORKDIR}/server ) ENDIF ( NOT Server ) diff --git a/src/server/publicServer.c b/src/server/publicServer.c index 2f94063..a0cedfe 100644 --- a/src/server/publicServer.c +++ b/src/server/publicServer.c @@ -341,11 +341,12 @@ void quitPublicServer() int startPublicServer() { +#ifndef __WIN32__ signal(SIGPIPE, SIG_IGN); signal(SIGINT, my_handler_quit); signal(SIGTERM, my_handler_quit); signal(SIGQUIT, my_handler_quit); - +#endif if( initPublicServer() < 0 ) { quitPublicServer(); -- cgit v1.2.3