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

Use only one glew for QuesoGLC and Warzone.

master
dak180 2011-01-23 18:01:22 -05:00 committed by Per Inge Mathisen
parent 19c0a75eaf
commit 6b6cdc0b5e
4 changed files with 17 additions and 5 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) GLEW_MX
WARNING_CFLAGS = -Wall

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

@ -16,7 +16,7 @@ GCC_DEBUGGING_SYMBOLS = full
GCC_C_LANGUAGE_STANDARD = gnu99
GCC_ALTIVEC_EXTENSIONS = YES
OTHER_CFLAGS = $(inherited)
GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__ $(inherited)
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) __MACOSX__
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "$(SDK_DIR)/System/Library/Frameworks"
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "$(SRCROOT)/build/$(CONFIGURATION)"

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

@ -9,13 +9,20 @@ 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_PREPROCESSOR_DEFINITIONS = $(inherited) SIZEOF_INT=4 SIZEOF_SHORT=2 $(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1) HAVE_LIBGLEW GLEW_MX
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"

9
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 = $(FRAMEWORK_SEARCH_PATHS_QUOTED_1) $(FRAMEWORK_SEARCH_PATHS_QUOTED_2) $(FRAMEWORK_SEARCH_PATHS_QUOTED_3) $(inherited)
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) GLEW_MX
OTHER_CFLAGS = $(FlagsForCandCpp) $(WarnForC) $(inherited)
OTHER_CFLAGS[arch=i386] = $(inherited) // intel 32 bit only
@ -40,7 +45,7 @@ GCC_WARN_UNUSED_VALUE = YES // -Wunused-value
GCC_WARN_UNUSED_VARIABLE = YES // -Wunused-variable
// Build setting dependent warnings
WarnForCandCpp = -Wall -Wextra -Wcast-align -Wwrite-strings -Wpointer-arith $(WarnForCandCppDep) // Wno-missing-declarations is set on GLee.c; otherwise we would have +3000 warnings
WarnForCandCpp = -Wall -Wextra -Wcast-align -Wwrite-strings -Wpointer-arith $(WarnForCandCppDep)
WarnForC = -Wstrict-prototypes -Wdeclaration-after-statement $(WarnForCDep)
WarnForCpp = $(WarnForCppDep)