diff options
| -rw-r--r-- | CMakeLists.txt | 40 | ||||
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | config.h | 1 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/base/main.h | 1 | ||||
| -rw-r--r-- | src/base/path.h | 38 | ||||
| -rw-r--r-- | src/base/path.h.in | 34 | ||||
| -rw-r--r-- | src/modules/CMakeLists.txt | 2 |
9 files changed, 57 insertions, 71 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fa7929..82da736 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,9 +16,9 @@ # ALSO CONTAINS IMPORTANT DEFINITIONS [PREFIX,...] ############################################################################### ADD_DEFINITIONS ( -DSUPPORT_NET_UNIX_UDP ) -IF ( PREFIX ) - ADD_DEFINITIONS ( -DPREFIX="${PREFIX}" ) -ENDIF ( PREFIX ) +SET ( TUXANCI_VERSION "9999" ) +SET ( WORKDIR ${CMAKE_SOURCE_DIR}/src ) +CONFIGURE_FILE ( ${WORKDIR}/base/path.h.in ${WORKDIR}/base/path.h ) ############################################################################### # BASIC PROJECT VALUES ############################################################################### @@ -32,7 +32,6 @@ SET ( APPNAME "tuxanci") IF ( Server ) SET ( APPNAME "tuxanci-server" ) ENDIF ( Server ) -SET ( VERSION "9999" ) MESSAGE ( "<******************************>" ) MESSAGE ( "Configure for ${APPNAME} Started" ) MESSAGE ( "<******************************>" ) @@ -49,7 +48,6 @@ SET ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ) #various variables SET ( CMAKE_INSTALL_DATADIR share/ ) SET ( CMAKE_INSTALL_ETCDIR /etc ) -SET ( WORKDIR ${CMAKE_SOURCE_DIR}/src ) SET ( CMAKE_INSTALL_BINDIR bin ) SET ( CMAKE_INSTALL_LIBDIR lib ) # uninstall @@ -62,16 +60,16 @@ ADD_CUSTOM_TARGET ( uninstall "${CMAKE_COMMAND}" ############################################################################### # CPACK (Not used for now) ############################################################################### -SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README" ) -SET ( CPACK_GENERATOR "TBZ2" ) -SET ( CPACK_SOURCE_GENERATOR "TBZ2" ) -SET ( CPACK_PACKAGE_VERSION_MAJOR "0" ) -SET ( CPACK_PACKAGE_VERSION_MINOR "2" ) -SET ( CPACK_PACKAGE_VERSION_PATCH "0" ) -SET ( TUXANCI_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}" ) -SET ( TUXANCI_VERSION_FULL "${TUXANCI_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}" ) -SET ( CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${TUXANCI_VERSION_FULL}" ) -INCLUDE ( CPack ) +#SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README" ) +#SET ( CPACK_GENERATOR "TBZ2" ) +#SET ( CPACK_SOURCE_GENERATOR "TBZ2" ) +#SET ( CPACK_PACKAGE_VERSION_MAJOR "0" ) +#SET ( CPACK_PACKAGE_VERSION_MINOR "2" ) +#SET ( CPACK_PACKAGE_VERSION_PATCH "0" ) +#SET ( TUXANCI_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}" ) +#SET ( TUXANCI_VERSION_FULL "${TUXANCI_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}" ) +#SET ( CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${TUXANCI_VERSION_FULL}" ) +#INCLUDE ( CPack ) ############################################################################### # DEBUG STUFF ############################################################################### @@ -171,20 +169,14 @@ ADD_SUBDIRECTORY ( src ) ############################################################################### # path which user send us ADD_SUBDIRECTORY ( data ) -INSTALL ( FILES ${CMAKE_SOURCE_DIR}/LICENCE DESTINATION doc/${APPNAME}-${VERSION}/ ) -INSTALL ( FILES ${CMAKE_SOURCE_DIR}/AUTHORS DESTINATION doc/${APPNAME}-${VERSION}/ ) -INSTALL ( FILES ${CMAKE_SOURCE_DIR}/README DESTINATION doc/${APPNAME}-${VERSION}/ ) +INSTALL ( FILES ${CMAKE_SOURCE_DIR}/LICENCE DESTINATION share/doc/${APPNAME}-${TUXANCI_VERSION}/ ) +INSTALL ( FILES ${CMAKE_SOURCE_DIR}/AUTHORS DESTINATION share/doc/${APPNAME}-${TUXANCI_VERSION}/ ) +INSTALL ( FILES ${CMAKE_SOURCE_DIR}/README DESTINATION share/doc/${APPNAME}-${TUXANCI_VERSION}/ ) # windows quirk IF ( NOT Server ) IF ( Win ) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.dll" ) INSTALL ( FILES ${files} DESTINATION ${APPNAME}/bin/ ) - FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.lib" ) - INSTALL ( FILES ${files} DESTINATION ${APPNAME}/bin/ ) - FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.a" ) - INSTALL ( FILES ${files} DESTINATION ${APPNAME}/bin/ ) - FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.la" ) - INSTALL ( FILES ${files} DESTINATION ${APPNAME}/bin/ ) ENDIF ( Win ) ENDIF ( NOT Server ) ###############################################################################
\ No newline at end of file @@ -92,9 +92,8 @@ HOWTO COMPILE On Apple use please -DApple=1 variable for cmake. If you want another prefix than /usr/local/, you can achieve this by - adding -DPREFIX=\\\"/usr/games/\\\" and - -DCMAKE_INSTALL_PREFIX:PATH=/usr/games. Change /usr/games/ to path you - intend to use. + adding "-DCMAKE_INSTALL_PREFIX=/what/ever/you/want" Change /usr/games/ + to path you want to use. GAME USAGE ========== diff --git a/config.h b/config.h deleted file mode 100644 index 07b2696..0000000 --- a/config.h +++ /dev/null @@ -1 +0,0 @@ -#define TUXANCI_VERSION "svn201" diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 3b103c9..03976e5 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -14,10 +14,11 @@ ADD_SUBDIRECTORY ( sound ) # CURRENT DIRECTORY FILES ############################################################################### IF ( NOT Server ) - INSTALL ( FILES tuxanci.desktop DESTINATION doc/${APPNAME}-${VERSION}/) + INSTALL ( FILES tuxanci.desktop + DESTINATION doc/${APPNAME}-${TUXANCI_VERSION}/) IF ( NOT Win ) INSTALL ( FILES tuxanci.ico - DESTINATION doc/${APPNAME}-${VERSION}/) + DESTINATION share/doc/${APPNAME}-${TUXANCI_VERSION}/ ) ENDIF ( NOT Win ) ENDIF ( NOT Server ) ###############################################################################
\ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 039b6ff..b38714a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -64,7 +64,7 @@ SET ( SRC_client ${WORKDIR}/widget/widget_textfield ${WORKDIR}/widget/widget_label ${WORKDIR}/widget/widget_buttonimage ${WORKDIR}/widget/widget_image ${WORKDIR}/widget/widget_select ${WORKDIR}/widget/widget_catchkey - ${WORKDIR}/widget/widget_choicegroup ${WORKDIR}/widget/widget + ${WORKDIR}/widget/widget_choicegroup ${WORKDIR}/widget/widget ) SET ( SRC_audio diff --git a/src/base/main.h b/src/base/main.h index cfa4ee0..b50e56c 100644 --- a/src/base/main.h +++ b/src/base/main.h @@ -13,7 +13,6 @@ #include <libintl.h> #include <locale.h> #endif - #include "../../config.h" #include "bool.h" #include "string_length.h" #include "path.h" diff --git a/src/base/path.h b/src/base/path.h deleted file mode 100644 index 3c44600..0000000 --- a/src/base/path.h +++ /dev/null @@ -1,38 +0,0 @@ - -#ifndef PATH_H - #define PATH_H - #ifndef PREFIX - #ifndef __WIN32__ - #define PREFIX "/usr/local" - #else - #define PREFIX ".." - #endif - #endif - #ifndef PUBLIC_SERVER - #define PATH_DIR PREFIX "/share/tuxanci/" - #ifndef __WIN32__ - #define PATH_MODULES PREFIX "/lib/tuxanci/" - #else - #define PATH_MODULES PREFIX "/bin/" - #endif - #else - #define PATH_DIR PREFIX "/share/tuxanci-server/" - #ifndef __WIN32__ - #define PATH_MODULES PREFIX "/lib/tuxanci-server/" - #define SERVER_CONFIG "/etc/tuxanci-server/server.conf" - #else - #define PATH_MODULES PREFIX "/bin/" - #define SERVER_CONFIG PREFIX "/etc/tuxanci-server/server.conf" - #endif - #endif - #define PATH_IMAGE PATH_DIR "image/" - #define PATH_FONT PATH_DIR "font/" - #define PATH_ARENA PATH_DIR "arena/" - #define PATH_SOUND PATH_DIR "sound/" - #define PATH_MUSIC PATH_DIR "music/" - #define PATH_CONFIG PATH_DIR "conf/" - #define PATH_LANG PATH_DIR "lang/" - #define PATH_DATA PATH_DIR "doc/" - #define PATH_LOCALE PREFIX "share/locale/" - #include "main.h" -#endif diff --git a/src/base/path.h.in b/src/base/path.h.in new file mode 100644 index 0000000..93750e6 --- /dev/null +++ b/src/base/path.h.in @@ -0,0 +1,34 @@ + +#ifndef PATH_H + #cmakedefine USE_MAGICK + #define TUXANCI_VERSION "@TUXANCI_VERSION@" + #define PATH_H + #ifndef __WIN32__ + #define PREFIX "@CMAKE_INSTALL_PREFIX@" + #else + #define PREFIX ".." + #endif + #ifdef PUBLIC_SERVER + #define APPNAME "tuxanci-server" + #else + #define APPNAME "tuxanci" + #endif + #define PATH_DIR PREFIX "/share/" APPNAME "/" + #ifndef __WIN32__ + #define PATH_MODULES PREFIX "/lib/" APPNAME + #define SERVER_CONFIG "/etc/tuxanci-server/server.conf" + #else + #define PATH_MODULES PREFIX "/bin/" + #define SERVER_CONFIG PREFIX "/etc/tuxanci-server/server.conf" + #endif + #define PATH_IMAGE PATH_DIR "image/" + #define PATH_FONT PATH_DIR "font/" + #define PATH_ARENA PATH_DIR "arena/" + #define PATH_SOUND PATH_DIR "sound/" + #define PATH_MUSIC PATH_DIR "music/" + #define PATH_CONFIG PATH_DIR "conf/" + #define PATH_LANG PATH_DIR "lang/" + #define PATH_DATA PATH_DIR "doc/" + #define PATH_LOCALE PREFIX "share/locale/" + #include "main.h" +#endif diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 7b8a6ea..6931f68 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -52,7 +52,7 @@ SET ( SRC_modAI modAI.c ) ############################################################################### -# COMPILATION ITSELF +# COMPILATION AND INSTALLATION ITSELF ############################################################################### ADD_LIBRARY ( modWall SHARED ${SRC_modWall} ) ADD_LIBRARY ( modPipe SHARED ${SRC_modPipe} ) |