diff options
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/net_multiplayer.c | 2 | ||||
| -rw-r--r-- | src/base/path.h.in | 17 |
2 files changed, 6 insertions, 13 deletions
diff --git a/src/base/net_multiplayer.c b/src/base/net_multiplayer.c index d0732d7..a2ec849 100644 --- a/src/base/net_multiplayer.c +++ b/src/base/net_multiplayer.c @@ -12,9 +12,7 @@ #include "net_multiplayer.h" #include "server.h" -#ifdef SUPPORT_NET_UNIX_UDP #include "udp.h" -#endif #ifndef PUBLIC_SERVER #include "screen_setting.h" diff --git a/src/base/path.h.in b/src/base/path.h.in index 696ca36..c9f9a53 100644 --- a/src/base/path.h.in +++ b/src/base/path.h.in @@ -1,26 +1,21 @@ #ifndef PATH_H #cmakedefine USE_MAGICK - #define TUXANCI_VERSION "@TUXANCI_VERSION@" + #define TUXANCI_VERSION "@TUXANCI_VERSION@" #define PATH_H - #ifndef __WIN32__ - #define PREFIX "@CMAKE_INSTALL_PREFIX@" - #define PATH_DIR "@CMAKE_DATA_PATH@" "/" APPNAME "/" - #else - #define PREFIX ".." - #define PATH_DIR PREFIX "/share/" APPNAME "/" - #endif + #define PREFIX "@CMAKE_INSTALL_PREFIX@" + #define PATH_DIR "@CMAKE_DATA_PATH@" "/" APPNAME "/" #ifdef PUBLIC_SERVER #define APPNAME "tuxanci-server" + #define SERVER_CONFIG "@CMAKE_CONF_PATH@" "/" APPNAME "/server.conf" #else #define APPNAME "tuxanci" #endif + // windows bug #ifndef __WIN32__ - #define PATH_MODULES PREFIX "/lib/" APPNAME "/" - #define SERVER_CONFIG "/etc/tuxanci-server/server.conf" + #define PATH_MODULES "@LIB_INSTALL_DIR@" "/" APPNAME "/" #else #define PATH_MODULES PREFIX "/bin/" - #define SERVER_CONFIG PREFIX "/etc/tuxanci-server/server.conf" #endif #define PATH_IMAGE PATH_DIR "images/" #define PATH_FONT PATH_DIR "font/" |