From 15756acfbd0bee443e6edc89316889b1e87c8a99 Mon Sep 17 00:00:00 2001 From: scarab Date: Thu, 17 Jul 2008 22:43:16 +0000 Subject: -druhy pokus dyz to nebere arch __APPLE__ dame definici APPLE (pro priste) git-svn-id: http://opensvn.csie.org/tuxanci_ng@156 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- CMakeLists.txt | 1 + config.h | 2 +- src/base/modules.c | 8 ++++---- src/base/modules.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b145586..6bdaca0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ IF ( Apple ) SET ( CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE_INTERNAL "OSX Architectures" FORCE + ADD_DEFINITIONS ( -DAPPLE ) ) ENDIF ( Apple ) IF ( Win AND NOT Server ) diff --git a/config.h b/config.h index 548ceed..c89aa52 100644 --- a/config.h +++ b/config.h @@ -1 +1 @@ -#define TUXANCI_NG_VERSION "svn155" +#define TUXANCI_NG_VERSION "svn156" diff --git a/src/base/modules.c b/src/base/modules.c index 235f59b..fb692cf 100755 --- a/src/base/modules.c +++ b/src/base/modules.c @@ -182,12 +182,12 @@ int loadModule(char *name) char str[STR_PATH_SIZE]; module_t *module; + sprintf(str, PATH_MODULES "%s" MODULE_TYPE_UNIX, name); // linux #ifdef __WIN32__ sprintf(str, PATH_MODULES "%s" MODULE_TYPE_WIN, name); // windows -#elifdef __APPLE__ - sprintf(str, PATH_MODULES "%s" MODULE_TYPE_DARWIN, name); // apple -#else - sprintf(str, PATH_MODULES "%s" MODULE_TYPE_UNIX, name); // linux +#endif +#ifdef APPLE + sprintf(str, PATH_MODULES "%s" MODULE_TYPE_APPLE, name); // apple #endif accessExistFile(str); diff --git a/src/base/modules.h b/src/base/modules.h index b8e8a34..ec13602 100644 --- a/src/base/modules.h +++ b/src/base/modules.h @@ -14,7 +14,7 @@ #endif #define MODULE_TYPE_UNIX ".so" -#define MODULE_TYPE_DARWIN ".dylib" +#define MODULE_TYPE_APPLE ".dylib" #define MODULE_TYPE_WIN ".dll" typedef struct export_fce_s -- cgit v1.2.3