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

Fix stuff that got lost in the merge.

master
dak180 2011-04-25 18:13:08 -04:00
parent 779fdd62bd
commit 1b684c1d15
5 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,5 +12,5 @@ HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_QUOTED_2)
FRAMEWORK_SEARCH_PATHS = $(inherited) $(FRAMEWORK_SEARCH_PATHS_QUOTED_2)
GCC_MODEL_TUNING = G5
GCC_NO_COMMON_BLOCKS = YES
GCC_PREPROCESSOR_DEFINITIONS = $(inherited)
GCC_PREPROCESSOR_DEFINITIONS = $(inherited)
WARNING_CFLAGS = -Wall

24
macosx/configs/QuesoGLC-All.xcconfig
View File

@ -1,24 +0,0 @@
// QuesoGLC settings for all configurations
INSTALL_PATH = @executable_path/../Frameworks
DYLIB_COMPATIBILITY_VERSION = 1
DYLIB_CURRENT_VERSION = 1
PREBINDING = NO
FRAMEWORK_VERSION = A
INFOPLIST_FILE = Resources/GenericFramework-Info.plist
PRODUCT_NAME = QuesoGLC
FRAMEWORK_SEARCH_PATHS = $(inherited) $(FRAMEWORK_SEARCH_PATHS_QUOTED_1)
HEADER_SEARCH_PATHS = $(inherited) $(HEADER_SEARCH_PATHS_QUOTED_2) $(HEADER_SEARCH_PATHS_QUOTED_3) $(HEADER_SEARCH_PATHS_QUOTED_4)
LIBRARY_SEARCH_PATHS = $(inherited) $(LIBRARY_SEARCH_PATHS_QUOTED_4)
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/external/quesoglc/src" "$(SRCROOT)/external/quesoglc/include"
GCC_MODEL_TUNING = G5
GCC_PREPROCESSOR_DEFINITIONS = SIZEOF_INT=4 SIZEOF_SHORT=2 $(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1) GLEW_DISABLE_VBOS GLEW_MX $(inherited)
GCC_WARN_INHIBIT_ALL_WARNINGS = YES // uses deprecated stuff
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = QUESOGLC_VERSION="\"0.6.5\""
LIBRARY_SEARCH_PATHS_QUOTED_4 = "$(SDK_DIR)/usr/X11R6/lib"
HEADER_SEARCH_PATHS_QUOTED_3 = "$(SDK_DIR)/usr/X11R6/include/freetype2"
HEADER_SEARCH_PATHS_QUOTED_4 = "$(SDK_DIR)/usr/X11R6/include"

9
macosx/configs/QuesoGLC-Debug.xcconfig
View File

@ -1,9 +0,0 @@
// QuesoGLC settings for Debug configuration
#include "QuesoGLC-All.xcconfig"
GCC_ENABLE_FIX_AND_CONTINUE = YES
GCC_DYNAMIC_NO_PIC = NO
GCC_OPTIMIZATION_LEVEL = 0
ZERO_LINK = YES

7
macosx/configs/QuesoGLC-Release.xcconfig
View File

@ -1,7 +0,0 @@
// QuesoGLC settings for Release configuration
#include "QuesoGLC-All.xcconfig"
GCC_ENABLE_FIX_AND_CONTINUE = NO
ZERO_LINK = NO

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

@ -10,12 +10,17 @@ INFOPLIST_PREFIX_HEADER = $(SRCROOT)/build/autorevision.h
INFOPLIST_PREPROCESS = YES
PRODUCT_NAME = Warzone
WRAPPER_EXTENSION = app
FRAMEWORK_SEARCH_PATHS = $(inherited) $(FRAMEWORK_SEARCH_PATHS_QUOTED_1) $(FRAMEWORK_SEARCH_PATHS_QUOTED_2) $(FRAMEWORK_SEARCH_PATHS_QUOTED_3)
HEADER_SEARCH_PATHS = $(inherited) $(HEADER_SEARCH_PATHS_QUOTED_1) $(HEADER_SEARCH_PATHS_QUOTED_2)
LIBRARY_SEARCH_PATHS = $(inherited) $(LIBRARY_SEARCH_PATHS_QUOTED_1) $(LIBRARY_SEARCH_PATHS_QUOTED_3)
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.."
GCC_ENABLE_SSE3_EXTENSIONS = YES // -msse3
GCC_MODEL_TUNING = G5
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(BUILD_PREPROCESSOR_DEFINITIONS)
OTHER_CFLAGS = $(FlagsForCandCpp) $(WarnForC) $(inherited)
OTHER_CFLAGS[arch=i386] = $(inherited) // intel 32 bit only