diff options
| author | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-12-09 22:03:56 +0100 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-12-09 22:03:56 +0100 |
| commit | fdc9151ba47a5c4b97bc742e6953920595109eac (patch) | |
| tree | 08f48f11908c74cf62d64e7da073d0299b151ad2 /src | |
| parent | 7af605d1d42b2760799e816b7b25efe90a07d269 (diff) | |
Try to implement path handling for windows too.
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/path.h.in | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/src/base/path.h.in b/src/base/path.h.in index edd38e2..b0c383b 100644 --- a/src/base/path.h.in +++ b/src/base/path.h.in @@ -4,32 +4,25 @@ #include "main.h" #cmakedefine USE_MAGICK -#ifdef BUILD_PACKAGE - #define PACKAGE_PREFIX "../" -#else /* BUILD_PACKAGE */ - #define PACKAGE_PREFIX "" -#endif /* BUILD_PACKAGE */ +#define APPNAME "@APPNAME@" +#ifdef __WIN32___ + #define PATH_MODULES "mods" PATH_SEPARATOR + #define PATH_DIR "data" PATH_SEPARATOR +#else + #define PATH_MODULES "@LIB_INSTALL_DIR@" PATH_SEPARATOR APPNAME PATH_SEPARATOR + #define PATH_DIR "@CMAKE_DATA_PATH@" PATH_SEPARATOR APPNAME PATH_SEPARATOR +#endif #define TUXANCI_VERSION "@TUXANCI_VERSION@" -#define PREFIX PACKAGE_PREFIX "@CMAKE_INSTALL_PREFIX@" "/" -#define APPNAME "@APPNAME@" +#define PREFIX "@CMAKE_INSTALL_PREFIX@" PATH_SEPARATOR #ifdef PUBLIC_SERVER - #define SERVER_CONFIG PACKAGE_PREFIX "@CMAKE_CONF_PATH@" "/" APPNAME "/server.conf" + #define SERVER_CONFIG "@CMAKE_CONF_PATH@" PATH_SEPARATOR APPNAME PATH_SEPARATOR "server.conf" #endif /* PUBLIC_SERVER */ -#define PATH_DIR PACKAGE_PREFIX "@CMAKE_DATA_PATH@" "/" APPNAME "/" - -/* windows bug */ -#ifndef __WIN32__ - #define PATH_MODULES PACKAGE_PREFIX "@LIB_INSTALL_DIR@" "/" APPNAME "/" -#else /* __WIN32__ */ - #define PATH_MODULES "./" -#endif /* __WIN32__ */ - -#define PATH_IMAGE PATH_DIR "images/" -#define PATH_ARENA PATH_DIR "arena/" -#define PATH_SOUND PATH_DIR "sound/" -#define PATH_MUSIC PATH_DIR "music/" -#define PATH_LOCALE PACKAGE_PREFIX "@CMAKE_LOCALE_PATH@" "/" -#define PATH_DOC PACKAGE_PREFIX "@CMAKE_DOC_PATH@" "/" +#define PATH_IMAGE PATH_DIR "images" PATH_SEPARATOR +#define PATH_ARENA PATH_DIR "arena" PATH_SEPARATOR +#define PATH_SOUND PATH_DIR "sound" PATH_SEPARATOR +#define PATH_MUSIC PATH_DIR "music" PATH_SEPARATOR +#define PATH_LOCALE "@CMAKE_LOCALE_PATH@" PATH_SEPARATOR +#define PATH_DOC "@CMAKE_DOC_PATH@" PATH_SEPARATOR #define PACKAGE APPNAME #endif /* PATH_H */ |