Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the OV_EXCLUDE_STATIC_CALLBACKS define out of the code.

master
dak180 2013-01-13 10:31:49 -05:00
parent 7d928f109c
commit c855c90c81
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/sound/oggvorbis.cpp
View File

@ -21,9 +21,6 @@
#include <physfs.h>
#ifndef WZ_NOSOUND
# if defined(WZ_OS_MAC) // FIXME: this would be better if we could only have this for PPC builds, that may come later
# define OV_EXCLUDE_STATIC_CALLBACKS
# endif
# include <vorbis/vorbisfile.h>
# include <vorbis/codec.h>
#endif

2
macosx/configs/Warzone-All.xcconfig
View File

@ -23,7 +23,7 @@ LIBRARY_SEARCH_PATHS = $(inherited) $(LIBRARY_SEARCH_PATHS_QUOTED_1) $(LIBRARY_S
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.."
GCC_ENABLE_SSE3_EXTENSIONS = YES // -msse3
GCC_MODEL_TUNING = G5
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(BUILD_PREPROCESSOR_DEFINITIONS)
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(BUILD_PREPROCESSOR_DEFINITIONS) OV_EXCLUDE_STATIC_CALLBACKS
OTHER_CFLAGS = $(FlagsForCandCpp) $(WarnForC) $(inherited)
OTHER_CFLAGS[arch=i386] = $(inherited) // intel 32 bit only