From 19c0a75eaff7f332ac395cc3d2717c0cf086705c Mon Sep 17 00:00:00 2001 From: dak180 Date: Tue, 28 Dec 2010 02:35:42 -0500 Subject: [PATCH] Switch the xcode project from GLee to Glew. Refs #2378. --- macosx/configs/FetchSource.sh | 2 +- macosx/configs/Glew-All.xcconfig | 16 ++++++++++++++++ macosx/configs/Glew-Debug.xcconfig | 8 ++++++++ macosx/configs/Glew-Release.xcconfig | 6 ++++++ macosx/configs/Project-All.xcconfig | 3 ++- macosx/configs/QuesoGLC-All.xcconfig | 11 ++++++----- macosx/configs/Theora-All.xcconfig | 3 ++- macosx/configs/Vorbis-All.xcconfig | 7 +++---- macosx/configs/Warzone-All.xcconfig | 3 ++- 9 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 macosx/configs/Glew-All.xcconfig create mode 100644 macosx/configs/Glew-Debug.xcconfig create mode 100644 macosx/configs/Glew-Release.xcconfig diff --git a/macosx/configs/FetchSource.sh b/macosx/configs/FetchSource.sh index 36a93fb8660..d75aa442dfd 100755 --- a/macosx/configs/FetchSource.sh +++ b/macosx/configs/FetchSource.sh @@ -72,7 +72,7 @@ fi # Unpack ExtensioN=`echo ${FileName} | sed -e 's:^.*\.\([^.]*\):\1:'` -if [ "${ExtensioN}" = "gz" ]; then +if [[ "${ExtensioN}" = "gz" ]] || [[ "${ExtensioN}" = "tgz" ]]; then if ! tar -zxf "${FileName}"; then echo "error: Unpacking ${FileName} failed" >&2 exit 1 diff --git a/macosx/configs/Glew-All.xcconfig b/macosx/configs/Glew-All.xcconfig new file mode 100644 index 00000000000..7a44c3b01f8 --- /dev/null +++ b/macosx/configs/Glew-All.xcconfig @@ -0,0 +1,16 @@ +// Glew 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 = GLExtensionWrangler +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) +WARNING_CFLAGS = -Wall diff --git a/macosx/configs/Glew-Debug.xcconfig b/macosx/configs/Glew-Debug.xcconfig new file mode 100644 index 00000000000..7b2a9cb8865 --- /dev/null +++ b/macosx/configs/Glew-Debug.xcconfig @@ -0,0 +1,8 @@ +// Glew settings for Debug configuration + +#include "Glew-All.xcconfig" + + +GCC_ENABLE_FIX_AND_CONTINUE = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 \ No newline at end of file diff --git a/macosx/configs/Glew-Release.xcconfig b/macosx/configs/Glew-Release.xcconfig new file mode 100644 index 00000000000..c1b83a16996 --- /dev/null +++ b/macosx/configs/Glew-Release.xcconfig @@ -0,0 +1,6 @@ +// Glew settings for Release configuration + +#include "Glew-All.xcconfig" + + +GCC_ENABLE_FIX_AND_CONTINUE = NO \ No newline at end of file diff --git a/macosx/configs/Project-All.xcconfig b/macosx/configs/Project-All.xcconfig index 77264f37237..b3eb06c6c28 100644 --- a/macosx/configs/Project-All.xcconfig +++ b/macosx/configs/Project-All.xcconfig @@ -26,4 +26,5 @@ LIBRARY_SEARCH_PATHS_QUOTED_1 = "$(SRCROOT)/build/$(CONFIGURATION)" LIBRARY_SEARCH_PATHS_QUOTED_2 = "$(SDK_DIR)/usr/lib" LIBRARY_SEARCH_PATHS_QUOTED_3 = "$(SRCROOT)/external/SDL" -HEADER_SEARCH_PATHS_QUOTED_1 = "$(SRCROOT)/external/SDL/SDL.framework/Headers" \ No newline at end of file +HEADER_SEARCH_PATHS_QUOTED_1 = "$(SRCROOT)/external/SDL/SDL.framework/Headers" +HEADER_SEARCH_PATHS_QUOTED_2 = "$(SRCROOT)/external/glew/include/**" diff --git a/macosx/configs/QuesoGLC-All.xcconfig b/macosx/configs/QuesoGLC-All.xcconfig index dbe7b1cb557..aa1f5077f40 100644 --- a/macosx/configs/QuesoGLC-All.xcconfig +++ b/macosx/configs/QuesoGLC-All.xcconfig @@ -9,15 +9,16 @@ FRAMEWORK_VERSION = A INFOPLIST_FILE = Resources/GenericFramework-Info.plist PRODUCT_NAME = QuesoGLC FRAMEWORK_SEARCH_PATHS = $(inherited) $(FRAMEWORK_SEARCH_PATHS_QUOTED_1) -HEADER_SEARCH_PATHS = external/quesoglc/src external/quesoglc/include $(HEADER_SEARCH_PATHS_QUOTED_1) $(HEADER_SEARCH_PATHS_QUOTED_2) $(inherited) -LIBRARY_SEARCH_PATHS = $(inherited) $(LIBRARY_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_1 = "$(SDK_DIR)/usr/X11R6/lib" +LIBRARY_SEARCH_PATHS_QUOTED_4 = "$(SDK_DIR)/usr/X11R6/lib" -HEADER_SEARCH_PATHS_QUOTED_1 = "$(SDK_DIR)/usr/X11R6/include/freetype2" -HEADER_SEARCH_PATHS_QUOTED_2 = "$(SDK_DIR)/usr/X11R6/include" \ No newline at end of file +HEADER_SEARCH_PATHS_QUOTED_3 = "$(SDK_DIR)/usr/X11R6/include/freetype2" +HEADER_SEARCH_PATHS_QUOTED_4 = "$(SDK_DIR)/usr/X11R6/include" diff --git a/macosx/configs/Theora-All.xcconfig b/macosx/configs/Theora-All.xcconfig index 95155f8249c..68404dc791b 100644 --- a/macosx/configs/Theora-All.xcconfig +++ b/macosx/configs/Theora-All.xcconfig @@ -8,6 +8,7 @@ PREBINDING = NO FRAMEWORK_VERSION = A INFOPLIST_FILE = Resources/theora/Info.plist PRODUCT_NAME = Theora -HEADER_SEARCH_PATHS = external/libtheora/lib external/libtheora/include/** $(inherited) +HEADER_SEARCH_PATHS = $(inherited) +USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/external/libtheora/lib" "$(SRCROOT)/external/libtheora/include/**" GCC_MODEL_TUNING = G5 WARNING_CFLAGS = -Wno-parentheses // Silence warnings that are not ours \ No newline at end of file diff --git a/macosx/configs/Vorbis-All.xcconfig b/macosx/configs/Vorbis-All.xcconfig index 09806a37f83..1bf8f7b6460 100644 --- a/macosx/configs/Vorbis-All.xcconfig +++ b/macosx/configs/Vorbis-All.xcconfig @@ -9,7 +9,6 @@ PREBINDING = NO FRAMEWORK_VERSION = A INFOPLIST_FILE = Resources/vorbis/Info.plist PRODUCT_NAME = Vorbis -HEADER_SEARCH_PATHS = external/libvorbis/lib/ $(inherited) -GCC_MODEL_TUNING = G5 -GCC_PRECOMPILE_PREFIX_HEADER = YES -GCC_PREFIX_HEADER = \ No newline at end of file +HEADER_SEARCH_PATHS = $(inherited) +USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/external/libvorbis/lib/" +GCC_MODEL_TUNING = G5 \ No newline at end of file diff --git a/macosx/configs/Warzone-All.xcconfig b/macosx/configs/Warzone-All.xcconfig index a3f5513fec5..f1ff85ec958 100644 --- a/macosx/configs/Warzone-All.xcconfig +++ b/macosx/configs/Warzone-All.xcconfig @@ -11,8 +11,9 @@ 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) -HEADER_SEARCH_PATHS = .. $(inherited) $(HEADER_SEARCH_PATHS_QUOTED_1) +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