diff options
| author | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-07-21 14:37:15 +0000 |
|---|---|---|
| committer | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-07-21 14:37:15 +0000 |
| commit | 5db4fc63dc273e8a4a57f63de3f73e43c2751747 (patch) | |
| tree | ae77ca1702089d7af1b144704fc8bf1f1e0dd7d1 | |
| parent | d02ee64a52007d50a1647641630e77601a43d26d (diff) | |
-- tuxanci se bundluji s ikonkou
-- uprava instalace na win
git-svn-id: http://opensvn.csie.org/tuxanci_ng@161 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
| -rw-r--r-- | CMakeLists.txt | 22 | ||||
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | src/tuxanci.rc | 1 |
4 files changed, 28 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e172d42..6c5f336 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,7 @@ MESSAGE ( "Configure for ${APPNAME} Started" ) MESSAGE ( "<******************************>" ) CMAKE_MINIMUM_REQUIRED ( VERSION 2.4.6 ) CMAKE_MINIMUM_REQUIRED ( VERSION 2.4.6 FATAL_ERROR ) + IF ( COMMAND cmake_policy ) cmake_policy( SET CMP0003 NEW ) ENDIF ( COMMAND cmake_policy ) @@ -47,6 +48,10 @@ IF ( Win AND NOT Server ) SET ( SDLIMAGE_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include/" ) SET ( SDLTTF_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include/" ) ENDIF ( Win AND NOT Server) +IF ( Win ) + SET ( CMAKE_RC_COMPILER "C:/MinGW/bin/windres.exe" ) # toto neni vubec dobre vuubec + ENABLE_LANGUAGE ( RC ) +ENDIF ( Win ) SET ( CMAKE_COLOR_MAKEFILE ON ) ## balickovani SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README" ) @@ -71,7 +76,7 @@ PROJECT ( tuxanci ) IF ( Debug ) SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -Wall -pipe") SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -Wall -pipe") - #SET ( CMAKE_VERBOSE_MAKEFILE off ) + SET ( CMAKE_VERBOSE_MAKEFILE on ) ENDIF ( Debug) MESSAGE ( "EXTRA Cflags:${CMAKE_C_FLAGS}" ) MESSAGE ( "EXTRA CXXflags:${CMAKE_CXX_FLAGS}" ) @@ -83,11 +88,12 @@ ADD_SUBDIRECTORY ( src ) #MESSAGE(STATUS "<******************************>") #ADD_SUBDIRECTORY ( lang ) -SET ( CMAKE_INSTALL_DATADIR share/ ) IF ( NOT Win ) + SET ( CMAKE_INSTALL_DATADIR share/ ) SET ( CMAKE_INSTALL_ETCDIR /etc ) ELSE ( NOT Win ) - SET ( CMAKE_INSTALL_ETCDIR etc ) + SET ( CMAKE_INSTALL_DATADIR ${APPNAME}/share/ ) + SET ( CMAKE_INSTALL_ETCDIR ${APPNAME}/etc ) ENDIF ( NOT Win ) IF ( Server ) INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/conf/server.conf DESTINATION ${CMAKE_INSTALL_ETCDIR}/${APPNAME} ) @@ -115,15 +121,15 @@ FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/arena/*.map" ) INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/arena/ ) IF ( NOT Server ) IF ( Win ) - INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/tuxanci.ico DESTINATION bin/) + #INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/tuxanci.ico DESTINATION bin/) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.dll" ) - INSTALL ( FILES ${files} DESTINATION bin/ ) + INSTALL ( FILES ${files} DESTINATION ${APPNAME}/bin/ ) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.lib" ) - INSTALL ( FILES ${files} DESTINATION bin/ ) + INSTALL ( FILES ${files} DESTINATION ${APPNAME}/bin/ ) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.a" ) - INSTALL ( FILES ${files} DESTINATION bin/ ) + INSTALL ( FILES ${files} DESTINATION ${APPNAME}/bin/ ) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.la" ) - INSTALL ( FILES ${files} DESTINATION bin/ ) + INSTALL ( FILES ${files} DESTINATION ${APPNAME}/bin/ ) ENDIF ( Win ) ENDIF ( NOT Server ) CONFIGURE_FILE( @@ -1 +1 @@ -#define TUXANCI_NG_VERSION "svn160" +#define TUXANCI_NG_VERSION "svn161" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d182c7a..ab0a5f3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,15 +33,24 @@ ENDIF ( Server ) IF ( PREFIX ) ADD_DEFINITIONS ( -DPREFIX="${PREFIX}" ) ENDIF ( PREFIX ) -IF ( Win AND NOT Server ) - ADD_DEFINITIONS ( -mwindows ) -ENDIF ( Win AND NOT Server ) +#IF ( Win AND NOT Server ) +# ADD_DEFINITIONS ( -mwindows ) +#ENDIF ( Win AND NOT Server ) +IF ( Win ) + SET ( SRC_base ${SRC_base} ${WORKDIR}/tuxanci.rc ) +ENDIF ( Win ) #include zdrojaku INCLUDE_DIRECTORIES ( ${WORKDIR}/base ) INCLUDE_DIRECTORIES ( ${WORKDIR}/net ) #vytvoreni knihoven +IF ( NOT Win ) SET ( CMAKE_INSTALL_BINDIR bin ) SET ( CMAKE_INSTALL_LIBDIR lib ) +ELSE ( NOT Win ) + +SET ( CMAKE_INSTALL_BINDIR ${APPNAME}/bin ) +SET ( CMAKE_INSTALL_LIBDIR ${APPNAME}/lib ) +ENDIF ( NOT Win ) ADD_SUBDIRECTORY ( modules ) IF ( NOT Server ) # server nebo klient IF ( NOT Win ) diff --git a/src/tuxanci.rc b/src/tuxanci.rc new file mode 100644 index 0000000..062d1e3 --- /dev/null +++ b/src/tuxanci.rc @@ -0,0 +1 @@ +1 ICON "../data/tuxanci.ico"
|