diff options
| author | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-07-06 19:28:35 +0000 |
|---|---|---|
| committer | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-07-06 19:28:35 +0000 |
| commit | 05f2c8aacf46e643b2bd916b7c8139e8a259122a (patch) | |
| tree | 9e2a6f2090882fd960b6393d8b6d4330ddcfc8a6 /src | |
| parent | 898a7b6c072400e25b5ac2d673d79cef37993148 (diff) | |
- oprava NO_SOUND zalezitosti
- pouze par ifndef pridano
git-svn-id: http://opensvn.csie.org/tuxanci_ng@108 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'src')
| -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 |
4 files changed, 7 insertions, 1 deletions
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" |