From 9bcbd7a9628eb94d6695042c82f6abbe1c0bfd28 Mon Sep 17 00:00:00 2001 From: scarab Date: Tue, 15 Jul 2008 20:39:44 +0000 Subject: - uprava cmakelist - oprava config.h :=] git-svn-id: http://opensvn.csie.org/tuxanci_ng@148 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- CMakeLists.txt | 6 +++++- config.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef15a66..883b571 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,10 @@ ENDIF ( NOT Win ) IF ( Server ) INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/conf/server.conf DESTINATION ${CMAKE_INSTALL_ETCDIR}/${APPNAME} ) ELSE ( Server ) - INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/tuxanci-ng.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/) + INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/tuxanci.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/) +IF ( NOT Win ) + INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/tuxanci.ico DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/) +ENDIF ( NOT Win ) INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/conf/keytable.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/conf/ ) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/font/*.ttf" ) INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/font/ ) @@ -113,6 +116,7 @@ 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/) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.dll" ) INSTALL ( FILES ${files} DESTINATION bin/ ) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.lib" ) diff --git a/config.h b/config.h index cbe7ea4..50ca326 100644 --- a/config.h +++ b/config.h @@ -1 +1 @@ -#define TUXANCI_NG_VERSION "svn145" +#define TUXANCI_NG_VERSION "svn148" -- cgit v1.2.3