Switch the xcode project from GLee to Glew.

Refs #2378.
Warzone2100 · Apr 20, 2011 · 19c0a75 · 19c0a75
1 parent c80e14c
commit 19c0a75
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/macosx/configs/Glew-Release.xcconfig 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
diff --git 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"
+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
@@ -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"
+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
@@ -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
diff --git 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 = 
+HEADER_SEARCH_PATHS = $(inherited)
+USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/external/libvorbis/lib/"
+GCC_MODEL_TUNING = G5
diff --git 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