diff options
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/base/arenaFile.c | 2 | ||||
| -rw-r--r-- | src/base/tux.c | 2 | ||||
| -rw-r--r-- | src/client/game.c | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 70f083c..5d0be45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,12 +34,7 @@ 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 ( CMAKE_BUILD_TYPE_SHARED_LIBS ON ) -#MESSAGE ( "PREFIX ${CMAKE_INSTALL_PREFIX}" ) -#SET ( CMAKE_INSTALL_PREFIX ${DESTDIR} ) -#ADD_DEFINITIONS ( -DDESTDIR "${CMAKE_INSTALL_PREFIX}/" ) -#MESSAGE ( "PREFIX ${CMAKE_INSTALL_PREFIX}" ) -#SET ( $ENV{DESTDIR} ${DESTDIR} ) +SET ( CMAKE_BUILD_TYPE_SHARED_LIBS ON ) # flagy SET( CMAKE_C_FLAGS $ENV{CFLAGS} ) SET( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} ) @@ -1,4 +1,4 @@ -#define TUXANCI_NG_VERSION "svn107" +#define TUXANCI_NG_VERSION "svn108" #define DESTDIR "/usr/local/" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f67e4b3..d2d93c7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,7 +29,7 @@ IF ( Server ) ADD_DEFINITIONS ( -DPUBLIC_SERVER ) ADD_DEFINITIONS ( -DNO_SOUND ) ENDIF ( Server ) -ADD_DEFINITIONS ( -DPREFIX = ${PREFIX} ) +ADD_DEFINITIONS ( -DPREFIX="${PREFIX}" ) #include zdrojaku INCLUDE_DIRECTORIES ( ${WORKDIR}/base ) INCLUDE_DIRECTORIES ( ${WORKDIR}/net ) diff --git a/src/base/arenaFile.c b/src/base/arenaFile.c index 265946f..3493fe6 100644 --- a/src/base/arenaFile.c +++ b/src/base/arenaFile.c @@ -18,6 +18,8 @@ #ifndef PUBLIC_SERVER #include "configFile.h" #include "image.h" +#endif +#ifndef NO_SOUND #include "music.h" #endif diff --git a/src/base/tux.c b/src/base/tux.c index 84bc87d..e954fec 100644 --- a/src/base/tux.c +++ b/src/base/tux.c @@ -23,7 +23,9 @@ #include "term.h" #include "radar.h" +#ifndef NO_SOUND #include "sound.h" +#endif #include "screen_world.h" #endif diff --git a/src/client/game.c b/src/client/game.c index e70fdae..a20e3fa 100644 --- a/src/client/game.c +++ b/src/client/game.c @@ -25,9 +25,11 @@ #include "panel.h" #include "radar.h" +#ifndef NO_SOUND #include "audio.h" #include "sound.h" #include "music.h" +#endif #include "screen_world.h" #include "screen_mainMenu.h" |