From fe04e3054da840316b2b95a96f4a2dc5a081dca6 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sun, 11 Sep 2022 11:55:50 -0500 Subject: [PATCH] Resync to ioquake3 2020-09-09 Reaction was already partically updated to 2020-09-08. Resync ioquake3 2018-12-21 to 2020-09-09. --- .github/workflows/build.yml | 49 + .travis.yml | 37 - Makefile | 15 +- README.md | 37 +- code/cgame/cg_weapons.c | 2 +- code/client/cl_cgame.c | 1 - code/game/g_cmds.c | 4 +- code/q3_ui/ui_teamorders.c | 10 +- code/q3_ui/ui_video.c | 24 +- code/tools/stringify.c | 51 + jenkins-ci-build.sh | 53 - make-macosx-app.sh | 2 + misc/xcode/botlib.xcodeproj/project.pbxproj | 46 +- misc/xcode/cgame.xcodeproj/project.pbxproj | 44 +- misc/xcode/game.xcodeproj/project.pbxproj | 44 +- misc/xcode/ioquake3-Info.plist | 6 +- misc/xcode/ioquake3.xcodeproj/project.pbxproj | 400 +++-- .../contents.xcworkspacedata | 6 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 5 + .../xcshareddata/xcschemes/all game.xcscheme | 22 +- .../xcschemes/all ioquake3.xcscheme | 22 +- misc/xcode/jpeg8.xcodeproj/project.pbxproj | 138 +- misc/xcode/opus.xcodeproj/project.pbxproj | 1539 +++++++++++++++++ misc/xcode/q3_ui.xcodeproj/project.pbxproj | 48 +- .../project.pbxproj | 64 +- .../project.pbxproj | 315 ++-- misc/xcode/speex.xcodeproj/project.pbxproj | 519 ------ misc/xcode/ui.xcodeproj/project.pbxproj | 56 +- misc/xcode/xcode-readme.txt | 28 +- travis-ci-build.sh | 15 - 31 files changed, 2556 insertions(+), 1054 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .travis.yml create mode 100644 code/tools/stringify.c delete mode 100755 jenkins-ci-build.sh create mode 100644 misc/xcode/ioquake3.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 misc/xcode/ioquake3.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 misc/xcode/opus.xcodeproj/project.pbxproj delete mode 100644 misc/xcode/speex.xcodeproj/project.pbxproj delete mode 100755 travis-ci-build.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..de630b4e --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,49 @@ +name: Build +on: [push, pull_request] + +jobs: + linux: + name: Linux + runs-on: ubuntu-16.04 + steps: + - uses: actions/checkout@v2 + - name: Install Dependencies + run: | + sudo apt-get update + sudo apt-get install libsdl2-dev + - name: Compile + run: make release + env: + ARCHIVE: 1 + - uses: actions/upload-artifact@v2 + with: + name: Linux + path: build/*.zip + windows: + name: Windows + runs-on: windows-2019 + steps: + - uses: actions/checkout@v2 + - name: Compile + run: | + choco install zip + make release + env: + ARCHIVE: 1 + - uses: actions/upload-artifact@v2 + with: + name: Windows + path: build/*.zip + macos: + name: macOS + runs-on: macos-10.15 + steps: + - uses: actions/checkout@v2 + - name: Compile + run: make release + env: + ARCHIVE: 1 + - uses: actions/upload-artifact@v2 + with: + name: macOS + path: build/*.zip diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4ee5cbc1..00000000 --- a/.travis.yml +++ /dev/null @@ -1,37 +0,0 @@ -# sudo is required for travis-ci to use ubuntu trusty -# ubuntu trusty is required for libsdl2-dev -sudo: required -dist: trusty - -language: c - -env: - matrix: - # standard builds - - CC=gcc - - CC=clang - # extra libs - - CC=gcc USE_FREETYPE=1 - - CC=clang USE_FREETYPE=1 - # cross-compile using mingw - # dlopen curl to workaround link error because mingw-w64 in trusty is missing strtok_r required by libcurl.a - - CC= PLATFORM="mingw32" ARCH="x86" USE_CURL_DLOPEN=1 - - CC= PLATFORM="mingw32" ARCH="x86_64" USE_CURL_DLOPEN=1 - -script: ./travis-ci-build.sh - -notifications: - email: false - -addons: - apt: - packages: - - binutils-mingw-w64-i686 - - gcc-mingw-w64-i686 - - binutils-mingw-w64-x86-64 - - gcc-mingw-w64-x86-64 - - gcc-mingw-w64 - - mingw-w64 - - libgl1-mesa-dev - - libsdl2-dev - - libfreetype6-dev diff --git a/Makefile b/Makefile index 3ab4046f..c5340a75 100644 --- a/Makefile +++ b/Makefile @@ -264,6 +264,7 @@ VORBISDIR=$(MOUNT_DIR)/libvorbis-1.3.6 OPUSDIR=$(MOUNT_DIR)/opus-1.2.1 OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.9 ZDIR=$(MOUNT_DIR)/zlib +TOOLSDIR=$(MOUNT_DIR)/tools Q3ASMDIR=$(MOUNT_DIR)/tools/asm LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg Q3CPPDIR=$(MOUNT_DIR)/tools/lcc/cpp @@ -1223,10 +1224,7 @@ endef define DO_REF_STR $(echo_cmd) "REF_STR $<" $(Q)rm -f $@ -$(Q)echo "const char *fallbackShader_$(notdir $(basename $<)) =" >> $@ -$(Q)cat $< | perl -pe 's/^(.*)$$/\"$$1\\n\"/' >> $@ -$(Q)echo ";" >> $@ -$(Q)cat $@ +$(Q)$(STRINGIFY) $< $@ endef define DO_BOT_CC @@ -1492,6 +1490,7 @@ Q3RCC = $(B)/tools/q3rcc$(TOOLS_BINEXT) Q3CPP = $(B)/tools/q3cpp$(TOOLS_BINEXT) Q3LCC = $(B)/tools/q3lcc$(TOOLS_BINEXT) Q3ASM = $(B)/tools/q3asm$(TOOLS_BINEXT) +STRINGIFY = $(B)/tools/stringify$(TOOLS_BINEXT) LBURGOBJ= \ $(B)/tools/lburg/lburg.o \ @@ -1585,6 +1584,10 @@ $(Q3LCC): $(Q3LCCOBJ) $(Q3RCC) $(Q3CPP) $(echo_cmd) "LD $@" $(Q)$(TOOLS_CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $(Q3LCCOBJ) $(TOOLS_LIBS) +$(STRINGIFY): $(TOOLSDIR)/stringify.c + $(echo_cmd) "CC $@" + $(Q)$(TOOLS_CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $(TOOLSDIR)/stringify.c $(TOOLS_LIBS) + define DO_Q3LCC $(echo_cmd) "Q3LCC $<" $(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -o $@ $< @@ -2704,7 +2707,7 @@ $(B)/renderergl1/tr_altivec.o: $(RGL1DIR)/tr_altivec.c $(DO_REF_CC_ALTIVEC) .PRECIOUS: $(B)/renderergl2/glsl/%.c -$(B)/renderergl2/glsl/%.c: $(RGL2DIR)/glsl/%.glsl +$(B)/renderergl2/glsl/%.c: $(RGL2DIR)/glsl/%.glsl $(STRINGIFY) $(DO_REF_STR) $(B)/renderergl2/glsl/%.o: $(B)/renderergl2/glsl/%.c @@ -2929,7 +2932,7 @@ toolsclean2: @echo "TOOLS_CLEAN $(B)" @rm -f $(TOOLSOBJ) @rm -f $(TOOLSOBJ_D_FILES) - @rm -f $(LBURG) $(DAGCHECK_C) $(Q3RCC) $(Q3CPP) $(Q3LCC) $(Q3ASM) + @rm -f $(LBURG) $(DAGCHECK_C) $(Q3RCC) $(Q3CPP) $(Q3LCC) $(Q3ASM) $(STRINGIFY) distclean: clean toolsclean @rm -rf $(BUILD_DIR) diff --git a/README.md b/README.md index 5e16a3da..b4a530cd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +![Build](https://github.com/ioquake/ioq3/workflows/Build/badge.svg) + ,---------------------------------------. | _ _ ____ | | (_)___ __ _ _ _ __ _| |_____|__ / | @@ -5,7 +7,7 @@ | |_\___/\__, |\_,_\__,_|_\_\___|___/ | | |_| | | | - `---------- http://ioquake3.org --------' + `--------- https://ioquake3.org --------' The intent of this project is to provide a baseline Quake 3 which may be used for further development and baseq3 fun. @@ -45,6 +47,27 @@ If you've got issues that you aren't sure are worth filing as bugs, or just want to chat, please visit our forums: http://discourse.ioquake.org +# Thank You: + +

+ Digital Ocean
+ + +

+--- +

+Discourse
+ +

+--- +

+icculus dot org
+ +

+ + # Compilation and installation For *nix @@ -359,11 +382,13 @@ value in the prototype with intptr_t (arg0, arg1, ...stay int). Add the following code snippet to q_shared.h: - #ifdef Q3_VM - typedef int intptr_t; - #else - #include - #endif +```c +#ifdef Q3_VM +typedef int intptr_t; +#else +#include +#endif +``` Note if you simply wish to run mods on a 64bit platform you do not need to recompile anything since by default Q3 uses a virtual machine system. diff --git a/code/cgame/cg_weapons.c b/code/cgame/cg_weapons.c index 6ca14bcb..c1e6b7f9 100644 --- a/code/cgame/cg_weapons.c +++ b/code/cgame/cg_weapons.c @@ -1441,7 +1441,7 @@ void CG_AddPlayerWeapon( refEntity_t * parent, playerState_t * ps, centity_t * c trap_R_AddRefEntityToScene( &gun2 ); // make sure we aren't looking at cg.predictedPlayerEntity for LG - nonPredictedCent = &cg_entities[ cent->currentState.clientNum ]; + nonPredictedCent = &cg_entities[ cent->currentState.number ]; // if the index of the nonPredictedCent is not the same as the clientNum // then this is a fake player (like on the single player podiums), so diff --git a/code/client/cl_cgame.c b/code/client/cl_cgame.c index 5034f98a..ae4a11f6 100644 --- a/code/client/cl_cgame.c +++ b/code/client/cl_cgame.c @@ -186,7 +186,6 @@ void CL_AddCgameCommand( const char *cmdName ) { Cmd_AddCommand( cmdName, NULL ); } - /* ===================== CL_ConfigstringModified diff --git a/code/game/g_cmds.c b/code/game/g_cmds.c index 64153a5e..d3173cfd 100644 --- a/code/game/g_cmds.c +++ b/code/game/g_cmds.c @@ -1304,13 +1304,13 @@ void SetTeam(gentity_t * ent, const char *s) } } - BroadcastTeamChange(client, oldTeam); - // client hasn't spawned yet, they sent an early team command, teampref userinfo, or g_teamAutoJoin is enabled if (client->pers.connected != CON_CONNECTED) { return; } + BroadcastTeamChange(client, oldTeam); + if (g_gametype.integer == GT_CTF || (g_gametype.integer == GT_TEAM && client->sess.savedTeam == TEAM_SPECTATOR)) MakeSpectator (ent); // JBravo: If the game is in progress, lets spawn players joining. diff --git a/code/q3_ui/ui_teamorders.c b/code/q3_ui/ui_teamorders.c index d116e016..fdcb902a 100644 --- a/code/q3_ui/ui_teamorders.c +++ b/code/q3_ui/ui_teamorders.c @@ -295,7 +295,7 @@ static void UI_TeamOrdersMenu_BuildBotList( void ) { int numPlayers; int isBot; int n; - char playerTeam = '3'; + char playerTeam; char botTeam; char info[MAX_INFO_STRING]; @@ -312,14 +312,16 @@ static void UI_TeamOrdersMenu_BuildBotList( void ) { numPlayers = atoi( Info_ValueForKey( info, "sv_maxclients" ) ); teamOrdersMenuInfo.gametype = atoi( Info_ValueForKey( info, "g_gametype" ) ); - for( n = 0; n < numPlayers && teamOrdersMenuInfo.numBots < 9; n++ ) { - trap_GetConfigString( CS_PLAYERS + n, info, MAX_INFO_STRING ); + trap_GetConfigString( CS_PLAYERS + cs.clientNum, info, MAX_INFO_STRING ); + playerTeam = *Info_ValueForKey( info, "t" ); + for( n = 0; n < numPlayers && teamOrdersMenuInfo.numBots < 9; n++ ) { if( n == cs.clientNum ) { - playerTeam = *Info_ValueForKey( info, "t" ); continue; } + trap_GetConfigString( CS_PLAYERS + n, info, MAX_INFO_STRING ); + isBot = atoi( Info_ValueForKey( info, "skill" ) ); if( !isBot ) { continue; diff --git a/code/q3_ui/ui_video.c b/code/q3_ui/ui_video.c index 093b5a2c..536055db 100644 --- a/code/q3_ui/ui_video.c +++ b/code/q3_ui/ui_video.c @@ -358,6 +358,7 @@ static int resToRatio[ MAX_RESOLUTIONS ]; static char resbuf[ MAX_STRING_CHARS ]; static const char* detectedResolutions[ MAX_RESOLUTIONS ]; +static char currentResolution[ 20 ]; static const char** resolutions = builtinResolutions; static qboolean resolutionsDetected = qfalse; @@ -487,7 +488,7 @@ GraphicsOptions_GetResolutions */ static void GraphicsOptions_GetResolutions( void ) { - Q_strncpyz(resbuf, UI_Cvar_VariableString("r_availableModes"), sizeof(resbuf)); + trap_Cvar_VariableStringBuffer("r_availableModes", resbuf, sizeof(resbuf)); if(*resbuf) { char* s = resbuf; @@ -501,11 +502,26 @@ static void GraphicsOptions_GetResolutions( void ) } detectedResolutions[ i ] = NULL; - if( i > 0 ) + // add custom resolution if not in mode list + if ( i < ARRAY_LEN(detectedResolutions)-1 ) { - resolutions = detectedResolutions; - resolutionsDetected = qtrue; + Com_sprintf( currentResolution, sizeof ( currentResolution ), "%dx%d", uis.glconfig.vidWidth, uis.glconfig.vidHeight ); + + for( i = 0; detectedResolutions[ i ]; i++ ) + { + if ( strcmp( detectedResolutions[ i ], currentResolution ) == 0 ) + break; + } + + if ( detectedResolutions[ i ] == NULL ) + { + detectedResolutions[ i++ ] = currentResolution; + detectedResolutions[ i ] = NULL; + } } + + resolutions = detectedResolutions; + resolutionsDetected = qtrue; } } diff --git a/code/tools/stringify.c b/code/tools/stringify.c new file mode 100644 index 00000000..a5ce84b0 --- /dev/null +++ b/code/tools/stringify.c @@ -0,0 +1,51 @@ +#include +#include +#include +#include + +int main(int argc, char **argv) +{ + FILE *ifp; + FILE *ofp; + char buffer[1024]; + + if(argc < 3) + return 1; + + char *inFile = argv[1]; + char *outFile = argv[2]; + + ifp = fopen(inFile, "r"); + if(!ifp) + return 2; + + ofp = fopen(outFile, "w"); + if(!ofp) + return 3; + + // Strip extension + char *base = basename(inFile); + *strrchr(base, '.') = '\0'; + + fprintf(ofp, "const char *fallbackShader_%s =\n", base); + + while(fgets(buffer, sizeof(buffer), ifp)) + { + // Strip trailing whitespace from line + char *end = buffer + strlen(buffer) - 1; + while(end >= buffer && isspace(*end)) + end--; + + end[1] = '\0'; + + // Write line enquoted, with a newline + fprintf(ofp, "\"%s\\n\"\n", buffer); + } + + fprintf(ofp, ";\n"); + + fclose(ifp); + fclose(ofp); + + return 0; +} diff --git a/jenkins-ci-build.sh b/jenkins-ci-build.sh deleted file mode 100755 index e28c80a5..00000000 --- a/jenkins-ci-build.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -UNAME=`uname` -MASTER_DIR=`dirname $0` -BUILD_DEFAULT="release" - -cd ${MASTER_DIR} - -if [ "${OPTIONS}" == "all_options" ]; -then - export USE_FREETYPE=1 -fi - -if [ "$UNAME" == "Darwin" ]; then - CORES=`sysctl -n hw.ncpu` -elif [ "$UNAME" == "Linux" ]; then - CORES=`awk '/^processor/ { N++} END { print N }' /proc/cpuinfo` -fi - -echo "platform : ${UNAME}" -echo "cores : ${CORES}" -if [ "${BUILD_TYPE}" == "" ]; then - BUILD_TYPE="${BUILD_DEFAULT}" - echo "build type : defaulting to ${BUILD_TYPE}" -else - echo "build type : ${BUILD_TYPE}" -fi - -echo "environment :" -export - -if [ -n "${CPPCHECK}" ]; then - if [ ! -f "${CPPCHECK}" ]; then - command -v cppcheck >/dev/null - if [ "$?" != "0" ]; then - echo "cppcheck not installed" - exit 1 - fi - - cppcheck --enable=all --max-configs=1 --xml --xml-version=2 code 2> ${CPPCHECK} - fi - - ln -sf ${CPPCHECK} cppcheck.xml -fi - -# Bit of a hack; only run scan-build with clang and all options enabled -if [ "${CC}" == "clang" ] && [ "${OPTIONS}" == "all_options" ]; then - MAKE_PREFIX="scan-build" -fi - -${MAKE_PREFIX} make -j${CORES} distclean ${BUILD_TYPE} - -exit $? diff --git a/make-macosx-app.sh b/make-macosx-app.sh index 1fd81653..67187a8b 100755 --- a/make-macosx-app.sh +++ b/make-macosx-app.sh @@ -329,6 +329,8 @@ PLIST="${PLIST} Reaction Copyright © 2000-2012 Boomstick Studios. NSPrincipalClass NSApplication + NSHighResolutionCapable + " diff --git a/misc/xcode/botlib.xcodeproj/project.pbxproj b/misc/xcode/botlib.xcodeproj/project.pbxproj index 3cd97ed4..e48e6ece 100644 --- a/misc/xcode/botlib.xcodeproj/project.pbxproj +++ b/misc/xcode/botlib.xcodeproj/project.pbxproj @@ -256,15 +256,16 @@ isa = PBXProject; attributes = { CLASSPREFIX = io; - LastUpgradeCheck = 0500; + LastUpgradeCheck = 1110; ORGANIZATIONNAME = ioquake; }; buildConfigurationList = 2735306014D11F8B00EB7BD6 /* Build configuration list for PBXProject "botlib" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 2735305B14D11F8B00EB7BD6; productRefGroup = 2735306714D11F8B00EB7BD6 /* Products */; @@ -319,17 +320,31 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -338,14 +353,14 @@ ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_VERSION = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -355,27 +370,40 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = BOTLIB; GCC_VERSION = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; SDKROOT = macosx; }; name = Release; @@ -383,6 +411,7 @@ 2735306B14D11F8B00EB7BD6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -392,6 +421,7 @@ 2735306C14D11F8B00EB7BD6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/misc/xcode/cgame.xcodeproj/project.pbxproj b/misc/xcode/cgame.xcodeproj/project.pbxproj index c54d7779..01c1862b 100644 --- a/misc/xcode/cgame.xcodeproj/project.pbxproj +++ b/misc/xcode/cgame.xcodeproj/project.pbxproj @@ -205,15 +205,16 @@ isa = PBXProject; attributes = { CLASSPREFIX = io; - LastUpgradeCheck = 0500; + LastUpgradeCheck = 1110; ORGANIZATIONNAME = ioquake; }; buildConfigurationList = 2735318F14D125FD00EB7BD6 /* Build configuration list for PBXProject "cgame" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 2735318A14D125FD00EB7BD6; productRefGroup = 2735319614D125FD00EB7BD6 /* Products */; @@ -267,17 +268,31 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -291,7 +306,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -301,17 +316,30 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_VERSION = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -319,7 +347,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; SDKROOT = macosx; }; name = Release; @@ -327,8 +355,10 @@ 2735319A14D125FD00EB7BD6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -336,8 +366,10 @@ 2735319B14D125FD00EB7BD6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/misc/xcode/game.xcodeproj/project.pbxproj b/misc/xcode/game.xcodeproj/project.pbxproj index 279ccd09..4a71b9b0 100644 --- a/misc/xcode/game.xcodeproj/project.pbxproj +++ b/misc/xcode/game.xcodeproj/project.pbxproj @@ -235,15 +235,16 @@ isa = PBXProject; attributes = { CLASSPREFIX = io; - LastUpgradeCheck = 0500; + LastUpgradeCheck = 1110; ORGANIZATIONNAME = ioquake; }; buildConfigurationList = 273531AE14D126C300EB7BD6 /* Build configuration list for PBXProject "game" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 273531A914D126C300EB7BD6; productRefGroup = 273531B514D126C300EB7BD6 /* Products */; @@ -303,17 +304,31 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -327,7 +342,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -337,17 +352,30 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_VERSION = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -355,7 +383,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; SDKROOT = macosx; }; name = Release; @@ -363,8 +391,10 @@ 273531B914D126C300EB7BD6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -372,8 +402,10 @@ 273531BA14D126C300EB7BD6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/misc/xcode/ioquake3-Info.plist b/misc/xcode/ioquake3-Info.plist index 3f5d8817..96b357dc 100644 --- a/misc/xcode/ioquake3-Info.plist +++ b/misc/xcode/ioquake3-Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile quake3_flat CFBundleIdentifier - org.ioquake3.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -21,11 +21,13 @@ CFBundleSignature ???? CFBundleVersion - 3cd8b49-2013-07-17 + c2025d94-2019-10-26 CGDisableCoalescedUpdates LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} + NSHighResolutionCapable + NSHumanReadableCopyright QUAKE III ARENA Copyright © 1999-2000 id Software, Inc. All rights reserved. NSPrincipalClass diff --git a/misc/xcode/ioquake3.xcodeproj/project.pbxproj b/misc/xcode/ioquake3.xcodeproj/project.pbxproj index dc27b3b0..a9ebbad8 100644 --- a/misc/xcode/ioquake3.xcodeproj/project.pbxproj +++ b/misc/xcode/ioquake3.xcodeproj/project.pbxproj @@ -81,12 +81,8 @@ 274FAB8A178FA9AA00B17C7A /* matha.s in Sources */ = {isa = PBXBuildFile; fileRef = 274FAB7E178FA97100B17C7A /* matha.s */; }; 274FABFD178FAC4900B17C7A /* vm_x86.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BE9E14D136DF005EB142 /* vm_x86.c */; }; 274FABFE178FAC6E00B17C7A /* tr_noise.c in Sources */ = {isa = PBXBuildFile; fileRef = 27AAD064178E03620093DFC0 /* tr_noise.c */; }; - 274FAC03178FADFC00B17C7A /* libSDL-1.2.0.dylib in Copy Files - Dynamic Libraries */ = {isa = PBXBuildFile; fileRef = 274FAC02178FADCA00B17C7A /* libSDL-1.2.0.dylib */; }; - 2758B913178FB696007F6582 /* libSDLmain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2758B912178FB696007F6582 /* libSDLmain.a */; }; 2758BB3317905B8F007F6582 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2758BB3217905B8F007F6582 /* IOKit.framework */; }; - 2758BB3417905C17007F6582 /* libSDL-1.2.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 274FAC02178FADCA00B17C7A /* libSDL-1.2.0.dylib */; }; 2758BB42179070C3007F6582 /* quake3_flat.iconset in Resources */ = {isa = PBXBuildFile; fileRef = 2758BB41179070C3007F6582 /* quake3_flat.iconset */; }; - 2772B8011790EABF004CCF57 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2772B8001790EABF004CCF57 /* libspeex.a */; }; 278714D917911C1300094CA3 /* libmumblelink.c in Sources */ = {isa = PBXBuildFile; fileRef = 278714D717911C1300094CA3 /* libmumblelink.c */; }; 27AACFEA178DF8760093DFC0 /* con_log.c in Sources */ = {isa = PBXBuildFile; fileRef = 27AACFDE178DF8760093DFC0 /* con_log.c */; }; 27AACFEC178DF8760093DFC0 /* con_tty.c in Sources */ = {isa = PBXBuildFile; fileRef = 27AACFE0178DF8760093DFC0 /* con_tty.c */; }; @@ -111,6 +107,13 @@ 27AAD06F178E04FF0093DFC0 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27AAD06E178E04FF0093DFC0 /* OpenAL.framework */; }; 27AAD071178E05290093DFC0 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 27AAD070178E05290093DFC0 /* libcurl.dylib */; }; 27AAD073178E052F0093DFC0 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 27AAD072178E052F0093DFC0 /* libz.dylib */; }; + A163B25A2193AEA100C48278 /* libopus.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A1665973219341DF0086B74B /* libopus.dylib */; }; + A163B25C2193AF1E00C48278 /* renderer_opengl1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A163B25B2193AF1E00C48278 /* renderer_opengl1.dylib */; }; + A163B2602193D67700C48278 /* renderer_opengl2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A163B25F2193D67700C48278 /* renderer_opengl2.dylib */; }; + A16659662191052E0086B74B /* libSDL2main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A16659652191052E0086B74B /* libSDL2main.a */; }; + A1665968219105430086B74B /* libSDL2-2.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A1665967219105430086B74B /* libSDL2-2.0.0.dylib */; }; + A1665971219107490086B74B /* sys_autoupdater.c in Sources */ = {isa = PBXBuildFile; fileRef = A1665970219107490086B74B /* sys_autoupdater.c */; }; + A16659722192A3DD0086B74B /* libSDL2-2.0.0.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = A1665967219105430086B74B /* libSDL2-2.0.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -124,15 +127,15 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - 274FABFF178FAD9A00B17C7A /* Copy Files - Dynamic Libraries */ = { + A166596F219105E00086B74B /* Embed Libraries */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; - dstSubfolderSpec = 6; + dstSubfolderSpec = 10; files = ( - 274FAC03178FADFC00B17C7A /* libSDL-1.2.0.dylib in Copy Files - Dynamic Libraries */, + A16659722192A3DD0086B74B /* libSDL2-2.0.0.dylib in Embed Libraries */, ); - name = "Copy Files - Dynamic Libraries"; + name = "Embed Libraries"; runOnlyForDeploymentPostprocessing = 0; }; /* End PBXCopyFilesBuildPhase section */ @@ -271,48 +274,6 @@ 27AAD027178E013E0093DFC0 /* sdl_icon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdl_icon.h; sourceTree = ""; }; 27AAD028178E013E0093DFC0 /* sdl_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_input.c; sourceTree = ""; }; 27AAD029178E013E0093DFC0 /* sdl_snd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_snd.c; sourceTree = ""; }; - 27AAD030178E02D20093DFC0 /* begin_code.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = begin_code.h; sourceTree = ""; }; - 27AAD031178E02D20093DFC0 /* close_code.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = close_code.h; sourceTree = ""; }; - 27AAD032178E02D20093DFC0 /* SDL_active.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_active.h; sourceTree = ""; }; - 27AAD033178E02D20093DFC0 /* SDL_audio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_audio.h; sourceTree = ""; }; - 27AAD034178E02D20093DFC0 /* SDL_byteorder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_byteorder.h; sourceTree = ""; }; - 27AAD035178E02D20093DFC0 /* SDL_cdrom.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_cdrom.h; sourceTree = ""; }; - 27AAD036178E02D20093DFC0 /* SDL_config_amiga.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_amiga.h; sourceTree = ""; }; - 27AAD037178E02D20093DFC0 /* SDL_config_dreamcast.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_dreamcast.h; sourceTree = ""; }; - 27AAD038178E02D20093DFC0 /* SDL_config_macos.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_macos.h; sourceTree = ""; }; - 27AAD039178E02D20093DFC0 /* SDL_config_macosx.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_macosx.h; sourceTree = ""; }; - 27AAD03A178E02D20093DFC0 /* SDL_config_minimal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_minimal.h; sourceTree = ""; }; - 27AAD03B178E02D20093DFC0 /* SDL_config_nds.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_nds.h; sourceTree = ""; }; - 27AAD03C178E02D20093DFC0 /* SDL_config_os2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_os2.h; sourceTree = ""; }; - 27AAD03D178E02D20093DFC0 /* SDL_config_symbian.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_symbian.h; sourceTree = ""; }; - 27AAD03E178E02D20093DFC0 /* SDL_config_win32.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_win32.h; sourceTree = ""; }; - 27AAD03F178E02D20093DFC0 /* SDL_config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config.h; sourceTree = ""; }; - 27AAD040178E02D20093DFC0 /* SDL_copying.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_copying.h; sourceTree = ""; }; - 27AAD041178E02D20093DFC0 /* SDL_cpuinfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_cpuinfo.h; sourceTree = ""; }; - 27AAD042178E02D20093DFC0 /* SDL_endian.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_endian.h; sourceTree = ""; }; - 27AAD043178E02D20093DFC0 /* SDL_error.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_error.h; sourceTree = ""; }; - 27AAD044178E02D20093DFC0 /* SDL_events.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_events.h; sourceTree = ""; }; - 27AAD045178E02D20093DFC0 /* SDL_getenv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_getenv.h; sourceTree = ""; }; - 27AAD046178E02D20093DFC0 /* SDL_joystick.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_joystick.h; sourceTree = ""; }; - 27AAD047178E02D20093DFC0 /* SDL_keyboard.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_keyboard.h; sourceTree = ""; }; - 27AAD048178E02D20093DFC0 /* SDL_keysym.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_keysym.h; sourceTree = ""; }; - 27AAD049178E02D20093DFC0 /* SDL_loadso.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_loadso.h; sourceTree = ""; }; - 27AAD04A178E02D20093DFC0 /* SDL_main.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_main.h; sourceTree = ""; }; - 27AAD04B178E02D20093DFC0 /* SDL_mouse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_mouse.h; sourceTree = ""; }; - 27AAD04C178E02D20093DFC0 /* SDL_mutex.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_mutex.h; sourceTree = ""; }; - 27AAD04D178E02D20093DFC0 /* SDL_name.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_name.h; sourceTree = ""; }; - 27AAD04E178E02D20093DFC0 /* SDL_opengl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_opengl.h; sourceTree = ""; }; - 27AAD04F178E02D20093DFC0 /* SDL_platform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_platform.h; sourceTree = ""; }; - 27AAD050178E02D20093DFC0 /* SDL_quit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_quit.h; sourceTree = ""; }; - 27AAD051178E02D20093DFC0 /* SDL_rwops.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_rwops.h; sourceTree = ""; }; - 27AAD052178E02D20093DFC0 /* SDL_stdinc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_stdinc.h; sourceTree = ""; }; - 27AAD053178E02D20093DFC0 /* SDL_syswm.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_syswm.h; sourceTree = ""; }; - 27AAD054178E02D20093DFC0 /* SDL_thread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_thread.h; sourceTree = ""; }; - 27AAD055178E02D20093DFC0 /* SDL_timer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_timer.h; sourceTree = ""; }; - 27AAD056178E02D20093DFC0 /* SDL_types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_types.h; sourceTree = ""; }; - 27AAD057178E02D20093DFC0 /* SDL_version.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_version.h; sourceTree = ""; }; - 27AAD058178E02D20093DFC0 /* SDL_video.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_video.h; sourceTree = ""; }; - 27AAD059178E02D20093DFC0 /* SDL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL.h; sourceTree = ""; }; 27AAD05B178E03620093DFC0 /* iqm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iqm.h; sourceTree = ""; }; 27AAD05C178E03620093DFC0 /* qgl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qgl.h; sourceTree = ""; }; 27AAD05D178E03620093DFC0 /* tr_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_common.h; sourceTree = ""; }; @@ -334,6 +295,96 @@ 27B0E9F21743E0A800DB1F32 /* null_main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = null_main.c; sourceTree = ""; }; 27B0E9F31743E0A800DB1F32 /* null_net.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = null_net.c; sourceTree = ""; }; 27B0E9F41743E0A800DB1F32 /* null_snddma.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = null_snddma.c; sourceTree = ""; }; + A163B25B2193AF1E00C48278 /* renderer_opengl1.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = renderer_opengl1.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + A163B25F2193D67700C48278 /* renderer_opengl2.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = renderer_opengl2.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + A1665037218BF45D0086B74B /* SDL_opengles2_gl2ext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_opengles2_gl2ext.h; sourceTree = ""; }; + A1665038218BF45D0086B74B /* SDL_test_random.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_test_random.h; sourceTree = ""; }; + A1665039218BF45D0086B74B /* SDL_power.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_power.h; sourceTree = ""; }; + A166503A218BF45D0086B74B /* SDL_revision.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_revision.h; sourceTree = ""; }; + A166503B218BF45D0086B74B /* SDL_events.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_events.h; sourceTree = ""; }; + A166503C218BF45D0086B74B /* SDL_clipboard.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_clipboard.h; sourceTree = ""; }; + A166503D218BF45D0086B74B /* SDL_haptic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_haptic.h; sourceTree = ""; }; + A166503E218BF45D0086B74B /* SDL_test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_test.h; sourceTree = ""; }; + A166503F218BF45D0086B74B /* SDL_test_assert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_test_assert.h; sourceTree = ""; }; + A1665040218BF45D0086B74B /* SDL_endian.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_endian.h; sourceTree = ""; }; + A1665041218BF45D0086B74B /* SDL_error.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_error.h; sourceTree = ""; }; + A1665042218BF45D0086B74B /* begin_code.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = begin_code.h; sourceTree = ""; }; + A1665043218BF45D0086B74B /* SDL_types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_types.h; sourceTree = ""; }; + A1665044218BF45D0086B74B /* SDL_keycode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_keycode.h; sourceTree = ""; }; + A1665045218BF45D0086B74B /* SDL_keyboard.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_keyboard.h; sourceTree = ""; }; + A1665046218BF45D0086B74B /* SDL_config_psp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_psp.h; sourceTree = ""; }; + A1665047218BF45D0086B74B /* SDL_opengl_glext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_opengl_glext.h; sourceTree = ""; }; + A1665048218BF45D0086B74B /* SDL_config_pandora.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_pandora.h; sourceTree = ""; }; + A1665049218BF45D0086B74B /* SDL_test_crc32.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_test_crc32.h; sourceTree = ""; }; + A166504A218BF45D0086B74B /* SDL_test_font.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_test_font.h; sourceTree = ""; }; + A166504B218BF45D0086B74B /* SDL_test_log.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_test_log.h; sourceTree = ""; }; + A166504C218BF45D0086B74B /* SDL_egl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_egl.h; sourceTree = ""; }; + A166504D218BF45D0086B74B /* SDL_vulkan.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_vulkan.h; sourceTree = ""; }; + A166504E218BF45D0086B74B /* SDL_test_memory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_test_memory.h; sourceTree = ""; }; + A166504F218BF45D0086B74B /* SDL_main.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_main.h; sourceTree = ""; }; + A1665050218BF45D0086B74B /* SDL_stdinc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_stdinc.h; sourceTree = ""; }; + A1665051218BF45D0086B74B /* SDL_scancode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_scancode.h; sourceTree = ""; }; + A1665052218BF45D0086B74B /* SDL_quit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_quit.h; sourceTree = ""; }; + A1665053218BF45D0086B74B /* SDL_config_android.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_android.h; sourceTree = ""; }; + A1665054218BF45D0086B74B /* SDL_touch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_touch.h; sourceTree = ""; }; + A1665055218BF45D0086B74B /* SDL_opengles2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_opengles2.h; sourceTree = ""; }; + A1665056218BF45D0086B74B /* SDL_config_winrt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_winrt.h; sourceTree = ""; }; + A1665057218BF45D0086B74B /* SDL_test_images.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_test_images.h; sourceTree = ""; }; + A1665058218BF45D0086B74B /* SDL_name.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_name.h; sourceTree = ""; }; + A1665059218BF45D0086B74B /* SDL_platform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_platform.h; sourceTree = ""; }; + A166505A218BF45D0086B74B /* SDL_shape.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_shape.h; sourceTree = ""; }; + A166505B218BF45D0086B74B /* SDL_config_minimal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_minimal.h; sourceTree = ""; }; + A166505C218BF45D0086B74B /* SDL_config.h.cmake */ = {isa = PBXFileReference; lastKnownFileType = text; path = SDL_config.h.cmake; sourceTree = ""; }; + A166505D218BF45D0086B74B /* SDL_loadso.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_loadso.h; sourceTree = ""; }; + A166505E218BF45D0086B74B /* SDL_config_macosx.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_macosx.h; sourceTree = ""; }; + A166505F218BF45D0086B74B /* SDL_test_common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_test_common.h; sourceTree = ""; }; + A1665060218BF45D0086B74B /* SDL_config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config.h; sourceTree = ""; }; + A1665061218BF45D0086B74B /* SDL_audio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_audio.h; sourceTree = ""; }; + A1665062218BF45D0086B74B /* SDL_opengl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_opengl.h; sourceTree = ""; }; + A1665063218BF45D0086B74B /* SDL_blendmode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_blendmode.h; sourceTree = ""; }; + A1665064218BF45D0086B74B /* SDL_gesture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_gesture.h; sourceTree = ""; }; + A1665065218BF45D0086B74B /* SDL_test_fuzzer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_test_fuzzer.h; sourceTree = ""; }; + A1665066218BF45D0086B74B /* SDL_config_iphoneos.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_iphoneos.h; sourceTree = ""; }; + A1665067218BF45D0086B74B /* SDL_opengles.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_opengles.h; sourceTree = ""; }; + A1665068218BF45D0086B74B /* SDL_system.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_system.h; sourceTree = ""; }; + A1665069218BF45D0086B74B /* SDL_hints.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_hints.h; sourceTree = ""; }; + A166506A218BF45D0086B74B /* SDL_mouse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_mouse.h; sourceTree = ""; }; + A166506B218BF45D0086B74B /* SDL_timer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_timer.h; sourceTree = ""; }; + A166506C218BF45D0086B74B /* SDL_surface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_surface.h; sourceTree = ""; }; + A166506D218BF45D0086B74B /* SDL_atomic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_atomic.h; sourceTree = ""; }; + A166506E218BF45D0086B74B /* SDL_log.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_log.h; sourceTree = ""; }; + A166506F218BF45D0086B74B /* SDL_rwops.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_rwops.h; sourceTree = ""; }; + A1665070218BF45D0086B74B /* SDL_render.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_render.h; sourceTree = ""; }; + A1665071218BF45D0086B74B /* SDL_syswm.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_syswm.h; sourceTree = ""; }; + A1665072218BF45D0086B74B /* SDL_bits.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_bits.h; sourceTree = ""; }; + A1665073218BF45D0086B74B /* SDL_video.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_video.h; sourceTree = ""; }; + A1665074218BF45D0086B74B /* SDL_assert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_assert.h; sourceTree = ""; }; + A1665075218BF45D0086B74B /* SDL_version.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_version.h; sourceTree = ""; }; + A1665076218BF45D0086B74B /* SDL_gamecontroller.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_gamecontroller.h; sourceTree = ""; }; + A1665077218BF45D0086B74B /* SDL_config_windows.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_windows.h; sourceTree = ""; }; + A1665078218BF45D0086B74B /* SDL_copying.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_copying.h; sourceTree = ""; }; + A1665079218BF45D0086B74B /* SDL_thread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_thread.h; sourceTree = ""; }; + A166507A218BF45D0086B74B /* SDL_test_harness.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_test_harness.h; sourceTree = ""; }; + A166507B218BF45D0086B74B /* SDL_rect.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_rect.h; sourceTree = ""; }; + A166507C218BF45D0086B74B /* SDL_mutex.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_mutex.h; sourceTree = ""; }; + A166507D218BF45D0086B74B /* close_code.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = close_code.h; sourceTree = ""; }; + A166507E218BF45D0086B74B /* SDL_config.h.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = SDL_config.h.in; sourceTree = ""; }; + A166507F218BF45D0086B74B /* SDL_config_wiz.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_config_wiz.h; sourceTree = ""; }; + A1665080218BF45D0086B74B /* SDL_joystick.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_joystick.h; sourceTree = ""; }; + A1665081218BF45D0086B74B /* SDL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL.h; sourceTree = ""; }; + A1665082218BF45D0086B74B /* SDL_filesystem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_filesystem.h; sourceTree = ""; }; + A1665083218BF45D0086B74B /* SDL_messagebox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_messagebox.h; sourceTree = ""; }; + A1665084218BF45D0086B74B /* SDL_opengles2_gl2platform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_opengles2_gl2platform.h; sourceTree = ""; }; + A1665085218BF45D0086B74B /* SDL_opengles2_khrplatform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_opengles2_khrplatform.h; sourceTree = ""; }; + A1665086218BF45D0086B74B /* SDL_test_md5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_test_md5.h; sourceTree = ""; }; + A1665087218BF45D0086B74B /* SDL_pixels.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_pixels.h; sourceTree = ""; }; + A1665088218BF45D0086B74B /* SDL_cpuinfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_cpuinfo.h; sourceTree = ""; }; + A1665089218BF45D0086B74B /* SDL_test_compare.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_test_compare.h; sourceTree = ""; }; + A166508A218BF45D0086B74B /* SDL_opengles2_gl2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_opengles2_gl2.h; sourceTree = ""; }; + A16659652191052E0086B74B /* libSDL2main.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2main.a; path = ../../code/libs/macosx/libSDL2main.a; sourceTree = ""; }; + A1665967219105430086B74B /* libSDL2-2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2-2.0.0.dylib"; path = "../../code/libs/macosx/libSDL2-2.0.0.dylib"; sourceTree = ""; }; + A1665970219107490086B74B /* sys_autoupdater.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sys_autoupdater.c; sourceTree = ""; }; + A1665973219341DF0086B74B /* libopus.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libopus.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -341,14 +392,16 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + A163B2602193D67700C48278 /* renderer_opengl2.dylib in Frameworks */, + A163B25C2193AF1E00C48278 /* renderer_opengl1.dylib in Frameworks */, + A163B25A2193AEA100C48278 /* libopus.dylib in Frameworks */, + A1665968219105430086B74B /* libSDL2-2.0.0.dylib in Frameworks */, + A16659662191052E0086B74B /* libSDL2main.a in Frameworks */, 273531F014D1275D00EB7BD6 /* Cocoa.framework in Frameworks */, 2758BB3317905B8F007F6582 /* IOKit.framework in Frameworks */, 27AAD06F178E04FF0093DFC0 /* OpenAL.framework in Frameworks */, 2735379E14D8F13E000D6E73 /* botlib.a in Frameworks */, - 2772B8011790EABF004CCF57 /* libspeex.a in Frameworks */, - 2758B913178FB696007F6582 /* libSDLmain.a in Frameworks */, 27AAD071178E05290093DFC0 /* libcurl.dylib in Frameworks */, - 2758BB3417905C17007F6582 /* libSDL-1.2.0.dylib in Frameworks */, 27AAD073178E052F0093DFC0 /* libz.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -387,7 +440,7 @@ 2711BE8414D136C3005EB142 /* qcommon */, 27AAD05A178E03520093DFC0 /* renderercommon */, 27AAD024178E01260093DFC0 /* sdl */, - 27AAD02E178E02AF0093DFC0 /* SDL12 */, + A1664FEB218BF45D0086B74B /* SDL2 */, 2711BE6E14D1367A005EB142 /* server */, 27AACFDD178DF85B0093DFC0 /* sys */, 2711BE6B14D1365F005EB142 /* ui */, @@ -533,10 +586,10 @@ isa = PBXGroup; children = ( 2711BE6A14D1364A005EB142 /* code */, - 273531F614D1275D00EB7BD6 /* Supporting Files */, 273531EE14D1275D00EB7BD6 /* Frameworks */, 2711BCC414D12CC6005EB142 /* Libraries */, 273531EC14D1275D00EB7BD6 /* Products */, + 273531F614D1275D00EB7BD6 /* Supporting Files */, ); sourceTree = ""; }; @@ -551,6 +604,11 @@ 273531EE14D1275D00EB7BD6 /* Frameworks */ = { isa = PBXGroup; children = ( + A163B25F2193D67700C48278 /* renderer_opengl2.dylib */, + A163B25B2193AF1E00C48278 /* renderer_opengl1.dylib */, + A1665973219341DF0086B74B /* libopus.dylib */, + A1665967219105430086B74B /* libSDL2-2.0.0.dylib */, + A16659652191052E0086B74B /* libSDL2main.a */, 273531EF14D1275D00EB7BD6 /* Cocoa.framework */, 2758BB3217905B8F007F6582 /* IOKit.framework */, 27AAD06E178E04FF0093DFC0 /* OpenAL.framework */, @@ -587,6 +645,7 @@ 27AACFDD178DF85B0093DFC0 /* sys */ = { isa = PBXGroup; children = ( + A1665970219107490086B74B /* sys_autoupdater.c */, 27AACFDE178DF8760093DFC0 /* con_log.c */, 27AACFDF178DF8760093DFC0 /* con_passive.c */, 27AACFE0178DF8760093DFC0 /* con_tty.c */, @@ -615,63 +674,6 @@ path = sdl; sourceTree = ""; }; - 27AAD02E178E02AF0093DFC0 /* SDL12 */ = { - isa = PBXGroup; - children = ( - 27AAD02F178E02BE0093DFC0 /* include */, - ); - path = SDL12; - sourceTree = ""; - }; - 27AAD02F178E02BE0093DFC0 /* include */ = { - isa = PBXGroup; - children = ( - 27AAD030178E02D20093DFC0 /* begin_code.h */, - 27AAD031178E02D20093DFC0 /* close_code.h */, - 27AAD032178E02D20093DFC0 /* SDL_active.h */, - 27AAD033178E02D20093DFC0 /* SDL_audio.h */, - 27AAD034178E02D20093DFC0 /* SDL_byteorder.h */, - 27AAD035178E02D20093DFC0 /* SDL_cdrom.h */, - 27AAD036178E02D20093DFC0 /* SDL_config_amiga.h */, - 27AAD037178E02D20093DFC0 /* SDL_config_dreamcast.h */, - 27AAD038178E02D20093DFC0 /* SDL_config_macos.h */, - 27AAD039178E02D20093DFC0 /* SDL_config_macosx.h */, - 27AAD03A178E02D20093DFC0 /* SDL_config_minimal.h */, - 27AAD03B178E02D20093DFC0 /* SDL_config_nds.h */, - 27AAD03C178E02D20093DFC0 /* SDL_config_os2.h */, - 27AAD03D178E02D20093DFC0 /* SDL_config_symbian.h */, - 27AAD03E178E02D20093DFC0 /* SDL_config_win32.h */, - 27AAD03F178E02D20093DFC0 /* SDL_config.h */, - 27AAD040178E02D20093DFC0 /* SDL_copying.h */, - 27AAD041178E02D20093DFC0 /* SDL_cpuinfo.h */, - 27AAD042178E02D20093DFC0 /* SDL_endian.h */, - 27AAD043178E02D20093DFC0 /* SDL_error.h */, - 27AAD044178E02D20093DFC0 /* SDL_events.h */, - 27AAD045178E02D20093DFC0 /* SDL_getenv.h */, - 27AAD046178E02D20093DFC0 /* SDL_joystick.h */, - 27AAD047178E02D20093DFC0 /* SDL_keyboard.h */, - 27AAD048178E02D20093DFC0 /* SDL_keysym.h */, - 27AAD049178E02D20093DFC0 /* SDL_loadso.h */, - 27AAD04A178E02D20093DFC0 /* SDL_main.h */, - 27AAD04B178E02D20093DFC0 /* SDL_mouse.h */, - 27AAD04C178E02D20093DFC0 /* SDL_mutex.h */, - 27AAD04D178E02D20093DFC0 /* SDL_name.h */, - 27AAD04E178E02D20093DFC0 /* SDL_opengl.h */, - 27AAD04F178E02D20093DFC0 /* SDL_platform.h */, - 27AAD050178E02D20093DFC0 /* SDL_quit.h */, - 27AAD051178E02D20093DFC0 /* SDL_rwops.h */, - 27AAD052178E02D20093DFC0 /* SDL_stdinc.h */, - 27AAD053178E02D20093DFC0 /* SDL_syswm.h */, - 27AAD054178E02D20093DFC0 /* SDL_thread.h */, - 27AAD055178E02D20093DFC0 /* SDL_timer.h */, - 27AAD056178E02D20093DFC0 /* SDL_types.h */, - 27AAD057178E02D20093DFC0 /* SDL_version.h */, - 27AAD058178E02D20093DFC0 /* SDL_video.h */, - 27AAD059178E02D20093DFC0 /* SDL.h */, - ); - path = include; - sourceTree = ""; - }; 27AAD05A178E03520093DFC0 /* renderercommon */ = { isa = PBXGroup; children = ( @@ -704,6 +706,105 @@ path = null; sourceTree = ""; }; + A1664FEB218BF45D0086B74B /* SDL2 */ = { + isa = PBXGroup; + children = ( + A1665036218BF45D0086B74B /* include */, + ); + path = SDL2; + sourceTree = ""; + }; + A1665036218BF45D0086B74B /* include */ = { + isa = PBXGroup; + children = ( + A1665042218BF45D0086B74B /* begin_code.h */, + A166507D218BF45D0086B74B /* close_code.h */, + A1665074218BF45D0086B74B /* SDL_assert.h */, + A166506D218BF45D0086B74B /* SDL_atomic.h */, + A1665061218BF45D0086B74B /* SDL_audio.h */, + A1665072218BF45D0086B74B /* SDL_bits.h */, + A1665063218BF45D0086B74B /* SDL_blendmode.h */, + A166503C218BF45D0086B74B /* SDL_clipboard.h */, + A1665053218BF45D0086B74B /* SDL_config_android.h */, + A1665066218BF45D0086B74B /* SDL_config_iphoneos.h */, + A166505E218BF45D0086B74B /* SDL_config_macosx.h */, + A166505B218BF45D0086B74B /* SDL_config_minimal.h */, + A1665048218BF45D0086B74B /* SDL_config_pandora.h */, + A1665046218BF45D0086B74B /* SDL_config_psp.h */, + A1665077218BF45D0086B74B /* SDL_config_windows.h */, + A1665056218BF45D0086B74B /* SDL_config_winrt.h */, + A166507F218BF45D0086B74B /* SDL_config_wiz.h */, + A1665060218BF45D0086B74B /* SDL_config.h */, + A166505C218BF45D0086B74B /* SDL_config.h.cmake */, + A166507E218BF45D0086B74B /* SDL_config.h.in */, + A1665078218BF45D0086B74B /* SDL_copying.h */, + A1665088218BF45D0086B74B /* SDL_cpuinfo.h */, + A166504C218BF45D0086B74B /* SDL_egl.h */, + A1665040218BF45D0086B74B /* SDL_endian.h */, + A1665041218BF45D0086B74B /* SDL_error.h */, + A166503B218BF45D0086B74B /* SDL_events.h */, + A1665082218BF45D0086B74B /* SDL_filesystem.h */, + A1665076218BF45D0086B74B /* SDL_gamecontroller.h */, + A1665064218BF45D0086B74B /* SDL_gesture.h */, + A166503D218BF45D0086B74B /* SDL_haptic.h */, + A1665069218BF45D0086B74B /* SDL_hints.h */, + A1665080218BF45D0086B74B /* SDL_joystick.h */, + A1665045218BF45D0086B74B /* SDL_keyboard.h */, + A1665044218BF45D0086B74B /* SDL_keycode.h */, + A166505D218BF45D0086B74B /* SDL_loadso.h */, + A166506E218BF45D0086B74B /* SDL_log.h */, + A166504F218BF45D0086B74B /* SDL_main.h */, + A1665083218BF45D0086B74B /* SDL_messagebox.h */, + A166506A218BF45D0086B74B /* SDL_mouse.h */, + A166507C218BF45D0086B74B /* SDL_mutex.h */, + A1665058218BF45D0086B74B /* SDL_name.h */, + A1665047218BF45D0086B74B /* SDL_opengl_glext.h */, + A1665062218BF45D0086B74B /* SDL_opengl.h */, + A1665067218BF45D0086B74B /* SDL_opengles.h */, + A166508A218BF45D0086B74B /* SDL_opengles2_gl2.h */, + A1665037218BF45D0086B74B /* SDL_opengles2_gl2ext.h */, + A1665084218BF45D0086B74B /* SDL_opengles2_gl2platform.h */, + A1665085218BF45D0086B74B /* SDL_opengles2_khrplatform.h */, + A1665055218BF45D0086B74B /* SDL_opengles2.h */, + A1665087218BF45D0086B74B /* SDL_pixels.h */, + A1665059218BF45D0086B74B /* SDL_platform.h */, + A1665039218BF45D0086B74B /* SDL_power.h */, + A1665052218BF45D0086B74B /* SDL_quit.h */, + A166507B218BF45D0086B74B /* SDL_rect.h */, + A1665070218BF45D0086B74B /* SDL_render.h */, + A166503A218BF45D0086B74B /* SDL_revision.h */, + A166506F218BF45D0086B74B /* SDL_rwops.h */, + A1665051218BF45D0086B74B /* SDL_scancode.h */, + A166505A218BF45D0086B74B /* SDL_shape.h */, + A1665050218BF45D0086B74B /* SDL_stdinc.h */, + A166506C218BF45D0086B74B /* SDL_surface.h */, + A1665068218BF45D0086B74B /* SDL_system.h */, + A1665071218BF45D0086B74B /* SDL_syswm.h */, + A166503F218BF45D0086B74B /* SDL_test_assert.h */, + A166505F218BF45D0086B74B /* SDL_test_common.h */, + A1665089218BF45D0086B74B /* SDL_test_compare.h */, + A1665049218BF45D0086B74B /* SDL_test_crc32.h */, + A166504A218BF45D0086B74B /* SDL_test_font.h */, + A1665065218BF45D0086B74B /* SDL_test_fuzzer.h */, + A166507A218BF45D0086B74B /* SDL_test_harness.h */, + A1665057218BF45D0086B74B /* SDL_test_images.h */, + A166504B218BF45D0086B74B /* SDL_test_log.h */, + A1665086218BF45D0086B74B /* SDL_test_md5.h */, + A166504E218BF45D0086B74B /* SDL_test_memory.h */, + A1665038218BF45D0086B74B /* SDL_test_random.h */, + A166503E218BF45D0086B74B /* SDL_test.h */, + A1665079218BF45D0086B74B /* SDL_thread.h */, + A166506B218BF45D0086B74B /* SDL_timer.h */, + A1665054218BF45D0086B74B /* SDL_touch.h */, + A1665043218BF45D0086B74B /* SDL_types.h */, + A1665075218BF45D0086B74B /* SDL_version.h */, + A1665073218BF45D0086B74B /* SDL_video.h */, + A166504D218BF45D0086B74B /* SDL_vulkan.h */, + A1665081218BF45D0086B74B /* SDL.h */, + ); + path = include; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -713,10 +814,10 @@ buildPhases = ( 273531E714D1275D00EB7BD6 /* Sources */, 273531E814D1275D00EB7BD6 /* Frameworks */, - 274FABFF178FAD9A00B17C7A /* Copy Files - Dynamic Libraries */, 274FAC8C178FB4C500B17C7A /* Run Script - Bump Version Number */, 2758BB35179061C1007F6582 /* Run Script - Copy Renderer & Game Dynamic Libraries, Symlink Architecture */, 273531E914D1275D00EB7BD6 /* Resources */, + A166596F219105E00086B74B /* Embed Libraries */, ); buildRules = ( ); @@ -734,15 +835,16 @@ isa = PBXProject; attributes = { CLASSPREFIX = io; - LastUpgradeCheck = 0500; + LastUpgradeCheck = 1110; ORGANIZATIONNAME = ioquake; }; buildConfigurationList = 273531E514D1275D00EB7BD6 /* Build configuration list for PBXProject "ioquake3" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 273531E014D1275D00EB7BD6; productRefGroup = 273531EC14D1275D00EB7BD6 /* Products */; @@ -809,6 +911,7 @@ 2711BE7D14D13696005EB142 /* sv_game.c in Sources */, 2711BE7E14D13696005EB142 /* sv_init.c in Sources */, 2711BE7F14D13696005EB142 /* sv_main.c in Sources */, + A1665971219107490086B74B /* sys_autoupdater.c in Sources */, 2711BE8014D13696005EB142 /* sv_net_chan.c in Sources */, 2711BE8214D13696005EB142 /* sv_snapshot.c in Sources */, 2711BE8314D13696005EB142 /* sv_world.c in Sources */, @@ -890,17 +993,31 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( MACOS_X, @@ -927,13 +1044,13 @@ ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_VERSION = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -943,17 +1060,30 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( MACOS_X, BOTLIB, @@ -967,13 +1097,13 @@ "USE_RENDERER_DLOPEN=1", ); GCC_VERSION = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; SDKROOT = macosx; }; name = Release; @@ -981,15 +1111,16 @@ 2735320A14D1275D00EB7BD6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "ioquake3-Prefix.pch"; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../code/jpeg-8c\"", - "\"$(SRCROOT)/../../code/libspeex/include\"", - "\"$(SRCROOT)/../../code/opus-1.0.2/include\"", - "\"$(SRCROOT)/../../code/opusfile-0.2/include\"", - "\"$(SRCROOT)/../../code/libogg-1.3.0/include\"", + "\"$(SRCROOT)/../../code/opus-1.2.1/include\"", + "\"$(SRCROOT)/../../code/opusfile-0.9/include\"", + "\"$(SRCROOT)/../../code/libogg-1.3.3/include\"", ); INFOPLIST_FILE = "ioquake3-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -997,7 +1128,8 @@ "\"$(BUILT_PRODUCTS_DIR)\"", "\"$(SRCROOT)/../../code/libs/macosx\"", ); - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_BUNDLE_IDENTIFIER = "org.ioquake3.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = ioquake3; WRAPPER_EXTENSION = app; }; @@ -1006,15 +1138,16 @@ 2735320B14D1275D00EB7BD6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "ioquake3-Prefix.pch"; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../code/jpeg-8c\"", - "\"$(SRCROOT)/../../code/libspeex/include\"", - "\"$(SRCROOT)/../../code/opus-1.0.2/include\"", - "\"$(SRCROOT)/../../code/opusfile-0.2/include\"", - "\"$(SRCROOT)/../../code/libogg-1.3.0/include\"", + "\"$(SRCROOT)/../../code/opus-1.2.1/include\"", + "\"$(SRCROOT)/../../code/opusfile-0.9/include\"", + "\"$(SRCROOT)/../../code/libogg-1.3.3/include\"", ); INFOPLIST_FILE = "ioquake3-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -1022,7 +1155,8 @@ "\"$(BUILT_PRODUCTS_DIR)\"", "\"$(SRCROOT)/../../code/libs/macosx\"", ); - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_BUNDLE_IDENTIFIER = "org.ioquake3.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = ioquake3; WRAPPER_EXTENSION = app; }; @@ -1031,6 +1165,7 @@ 2772B8041790EBE0004CCF57 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1038,6 +1173,7 @@ 2772B8051790EBE0004CCF57 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -1045,6 +1181,7 @@ 2772B80A1790EC7F004CCF57 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1052,6 +1189,7 @@ 2772B80B1790EC7F004CCF57 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata b/misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata index 6917d587..1613b4ce 100644 --- a/misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata +++ b/misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata @@ -25,10 +25,10 @@ - - + + diff --git a/misc/xcode/ioquake3.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/misc/xcode/ioquake3.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/misc/xcode/ioquake3.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/misc/xcode/ioquake3.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/misc/xcode/ioquake3.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..0c67376e --- /dev/null +++ b/misc/xcode/ioquake3.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,5 @@ + + + + + diff --git a/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all game.xcscheme b/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all game.xcscheme index 713f91d3..26d71dfd 100644 --- a/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all game.xcscheme +++ b/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all game.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> - - + + + + + shouldUseLaunchSchemeArgsEnv = "YES"> - - + + + + ${OUTFILE}\n cat ${INFILE} | sed 's/^/\\\"/;s/$/\\\\n\\\"/' >> ${OUTFILE}\n echo \";\" >> ${OUTFILE}\n}\n\npushd \"${GLSLPATH}\"\n\nfind *.glsl | while read GLSLFILE; do glslToDotC \"${GLSLFILE}\"; done\n\npopd\n"; - }; - 2758BA48178FD003007F6582 /* Run Script - Delete GLSL-Generated C Files */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script - Delete GLSL-Generated C Files"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "GLSLPATH=\"${SRCROOT}/../../code/renderergl2/glsl\"\n\npushd \"${GLSLPATH}\"\n\nfind *.c -delete\n\npopd\n"; + shellScript = "GLSLPATH=\"${SRCROOT}/../../code/renderergl2/glsl\"\nGLSLCPATH=\"${SRCROOT}/../../build/dynamic/renderergl2\"\n\nfunction glslToDotC()\n{\n INFILE=\"${1}\"\n INEXT=\"${1##*.}\"\n INSTRIP=\"${1##*/}\"\n INBASE=\"${INSTRIP%.glsl}\"\n OUTFILE=\"../../../build/dynamic/renderergl2/${1%.glsl}.c\"\n\n if [ ! ${INFILE} ] || [ ! -e ${INFILE} ]; then\n echo \"**** ERROR: no input file\"\n exit -1\n fi\n\n if [ ${INEXT} != \"glsl\" ]; then\n echo \"**** ERROR: input file must have .glsl extension\"\n exit -2\n fi\n\n echo \"const char *fallbackShader_${INBASE} =\" > ${OUTFILE}\n cat ${INFILE} | sed 's/^/\\\"/;s/$/\\\\n\\\"/' >> ${OUTFILE}\n echo \";\" >> ${OUTFILE}\n}\n\nmkdir -p \"${GLSLCPATH}\"\n\npushd \"${GLSLPATH}\"\n\nfind *.glsl | while read GLSLFILE; do glslToDotC \"${GLSLFILE}\"; done\n\npopd\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -491,12 +487,22 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + A1F1105E23F21AF10030D586 /* bokeh_vp.c in Sources */, + A1F1106D23F21AF10030D586 /* ssao_vp.c in Sources */, 2758B918178FBB4B007F6582 /* sdl_gamma.c in Sources */, + A1F1106623F21AF10030D586 /* calclevels4x_vp.c in Sources */, 2758B919178FBB4B007F6582 /* sdl_glimp.c in Sources */, + A1F1107123F21AF10030D586 /* down4x_vp.c in Sources */, + A1F1106323F21AF10030D586 /* dlight_vp.c in Sources */, + A1F1106823F21AF10030D586 /* shadowmask_vp.c in Sources */, 2758B981178FBB77007F6582 /* tr_animation.c in Sources */, 2758B982178FBB77007F6582 /* tr_backend.c in Sources */, + A1F1106E23F21AF10030D586 /* lightall_fp.c in Sources */, 2758B983178FBB77007F6582 /* tr_bsp.c in Sources */, 2758B984178FBB77007F6582 /* tr_cmds.c in Sources */, + A1F1106723F21AF10030D586 /* fogpass_vp.c in Sources */, + A1F1106123F21AF10030D586 /* shadowmask_fp.c in Sources */, + A1F1106523F21AF10030D586 /* bokeh_fp.c in Sources */, 2758B985178FBB77007F6582 /* tr_curve.c in Sources */, 2758B986178FBB77007F6582 /* tr_extensions.c in Sources */, 2758B987178FBB77007F6582 /* tr_extramath.c in Sources */, @@ -506,15 +512,27 @@ 2758B98E178FBB77007F6582 /* tr_image.c in Sources */, 2758B98F178FBB77007F6582 /* tr_init.c in Sources */, 2758B990178FBB77007F6582 /* tr_light.c in Sources */, + A1F1107523F21AF10030D586 /* ssao_fp.c in Sources */, + A1F1106A23F21AF10030D586 /* tonemap_vp.c in Sources */, 2758B992178FBB77007F6582 /* tr_main.c in Sources */, + A1F1107323F21AF10030D586 /* generic_vp.c in Sources */, 2758B993178FBB77007F6582 /* tr_marks.c in Sources */, + A1F1107423F21AF10030D586 /* shadowfill_vp.c in Sources */, + A1F1106423F21AF10030D586 /* dlight_fp.c in Sources */, + A1F1106F23F21AF10030D586 /* pshadow_fp.c in Sources */, 2758B994178FBB77007F6582 /* tr_mesh.c in Sources */, 2758B995178FBB77007F6582 /* tr_model_iqm.c in Sources */, 2758B996178FBB77007F6582 /* tr_model.c in Sources */, 2758B997178FBB77007F6582 /* tr_postprocess.c in Sources */, + A1F1106223F21AF10030D586 /* calclevels4x_fp.c in Sources */, + A1F1105F23F21AF10030D586 /* depthblur_fp.c in Sources */, + A1F1106023F21AF10030D586 /* texturecolor_fp.c in Sources */, 2758B999178FBB77007F6582 /* tr_scene.c in Sources */, 2758B99A178FBB77007F6582 /* tr_shade_calc.c in Sources */, + A1F1107223F21AF10030D586 /* pshadow_vp.c in Sources */, 2758B99B178FBB77007F6582 /* tr_shade.c in Sources */, + A163B2672193DF8300C48278 /* tr_dsa.c in Sources */, + A1F1107823F21AF10030D586 /* texturecolor_vp.c in Sources */, 2758B99C178FBB77007F6582 /* tr_shader.c in Sources */, 2758B99D178FBB77007F6582 /* tr_shadows.c in Sources */, 2758B99E178FBB77007F6582 /* tr_sky.c in Sources */, @@ -523,8 +541,14 @@ 2758B9A1178FBB77007F6582 /* tr_vbo.c in Sources */, 2758B9A2178FBB77007F6582 /* tr_world.c in Sources */, 2758B9B3178FBB8E007F6582 /* tr_font.c in Sources */, + A1F1106B23F21AF10030D586 /* down4x_fp.c in Sources */, + A1F1106C23F21AF10030D586 /* depthblur_vp.c in Sources */, 2758B9B4178FBB8E007F6582 /* tr_image_bmp.c in Sources */, + A1F1107623F21AF10030D586 /* generic_fp.c in Sources */, + A1F1107723F21AF10030D586 /* fogpass_fp.c in Sources */, + A1F1105D23F21AF10030D586 /* shadowfill_fp.c in Sources */, 2758B9B5178FBB8E007F6582 /* tr_image_jpg.c in Sources */, + A1F1107023F21AF10030D586 /* lightall_vp.c in Sources */, 2758B9B6178FBB8E007F6582 /* tr_image_pcx.c in Sources */, 2758B9B7178FBB8E007F6582 /* tr_image_png.c in Sources */, 2758B9B8178FBB8E007F6582 /* tr_image_tga.c in Sources */, @@ -532,34 +556,8 @@ 2758B9C3178FBBAC007F6582 /* puff.c in Sources */, 2758B9C5178FBBAC007F6582 /* q_math.c in Sources */, 2758B9C6178FBBAC007F6582 /* q_shared.c in Sources */, - 2758BA2C178FCFC0007F6582 /* bokeh_fp.c in Sources */, - 2758BA2D178FCFC0007F6582 /* bokeh_vp.c in Sources */, - 2758BA2E178FCFC0007F6582 /* calclevels4x_fp.c in Sources */, - 2758BA2F178FCFC0007F6582 /* calclevels4x_vp.c in Sources */, - 2758BA30178FCFC0007F6582 /* depthblur_fp.c in Sources */, - 2758BA31178FCFC0007F6582 /* depthblur_vp.c in Sources */, - 2758BA32178FCFC0007F6582 /* dlight_fp.c in Sources */, - 2758BA33178FCFC0007F6582 /* dlight_vp.c in Sources */, - 2758BA34178FCFC0007F6582 /* down4x_fp.c in Sources */, - 2758BA35178FCFC0007F6582 /* down4x_vp.c in Sources */, - 2758BA36178FCFC0007F6582 /* fogpass_fp.c in Sources */, - 2758BA37178FCFC0007F6582 /* fogpass_vp.c in Sources */, - 2758BA38178FCFC0007F6582 /* generic_fp.c in Sources */, - 2758BA39178FCFC0007F6582 /* generic_vp.c in Sources */, - 2758BA3A178FCFC0007F6582 /* lightall_fp.c in Sources */, - 2758BA3B178FCFC1007F6582 /* lightall_vp.c in Sources */, - 2758BA3C178FCFC1007F6582 /* pshadow_fp.c in Sources */, - 2758BA3D178FCFC1007F6582 /* pshadow_vp.c in Sources */, - 2758BA3E178FCFC1007F6582 /* shadowfill_fp.c in Sources */, - 2758BA3F178FCFC1007F6582 /* shadowfill_vp.c in Sources */, - 2758BA40178FCFC1007F6582 /* shadowmask_fp.c in Sources */, - 2758BA41178FCFC1007F6582 /* shadowmask_vp.c in Sources */, - 2758BA42178FCFC1007F6582 /* ssao_fp.c in Sources */, - 2758BA43178FCFC1007F6582 /* ssao_vp.c in Sources */, - 2758BA44178FCFC1007F6582 /* texturecolor_fp.c in Sources */, - 2758BA45178FCFC1007F6582 /* texturecolor_vp.c in Sources */, - 2758BA46178FCFC1007F6582 /* tonemap_fp.c in Sources */, - 2758BA47178FCFC1007F6582 /* tonemap_vp.c in Sources */, + A1F1106923F21AF10030D586 /* tonemap_fp.c in Sources */, + A163B2662193DF8300C48278 /* tr_image_dds.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -570,18 +568,33 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "USE_LOCAL_HEADERS=1", @@ -590,11 +603,13 @@ ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_VERSION = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -604,25 +619,41 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = "USE_LOCAL_HEADERS=1"; GCC_VERSION = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; SDKROOT = macosx; }; name = Release; @@ -630,9 +661,11 @@ 274FAC22178FAF0C00B17C7A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../code/jpeg-8c\"", - "\"$(SRCROOT)/../../code/SDL12/include\"", + "\"$(SRCROOT)/../../code/SDL2/include\"", ); LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../code/libs/macosx\"", @@ -645,9 +678,11 @@ 274FAC23178FAF0C00B17C7A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../code/jpeg-8c\"", - "\"$(SRCROOT)/../../code/SDL12/include\"", + "\"$(SRCROOT)/../../code/SDL2/include\"", ); LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../code/libs/macosx\"", diff --git a/misc/xcode/speex.xcodeproj/project.pbxproj b/misc/xcode/speex.xcodeproj/project.pbxproj deleted file mode 100644 index 701f026a..00000000 --- a/misc/xcode/speex.xcodeproj/project.pbxproj +++ /dev/null @@ -1,519 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 2758BAD717905A41007F6582 /* bits.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA7C17905A41007F6582 /* bits.c */; }; - 2758BAD817905A41007F6582 /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA7D17905A41007F6582 /* buffer.c */; }; - 2758BADC17905A41007F6582 /* cb_search.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8117905A41007F6582 /* cb_search.c */; }; - 2758BAE017905A41007F6582 /* exc_5_64_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8517905A41007F6582 /* exc_5_64_table.c */; }; - 2758BAE117905A41007F6582 /* exc_5_256_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8617905A41007F6582 /* exc_5_256_table.c */; }; - 2758BAE217905A41007F6582 /* exc_8_128_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8717905A41007F6582 /* exc_8_128_table.c */; }; - 2758BAE317905A41007F6582 /* exc_10_16_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8817905A41007F6582 /* exc_10_16_table.c */; }; - 2758BAE417905A41007F6582 /* exc_10_32_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8917905A41007F6582 /* exc_10_32_table.c */; }; - 2758BAE517905A41007F6582 /* exc_20_32_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8A17905A41007F6582 /* exc_20_32_table.c */; }; - 2758BAE617905A41007F6582 /* fftwrap.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8B17905A41007F6582 /* fftwrap.c */; }; - 2758BAE817905A41007F6582 /* filterbank.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA8D17905A41007F6582 /* filterbank.c */; }; - 2758BAED17905A41007F6582 /* filters.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9217905A41007F6582 /* filters.c */; }; - 2758BAF417905A41007F6582 /* gain_table_lbr.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9917905A41007F6582 /* gain_table_lbr.c */; }; - 2758BAF517905A41007F6582 /* gain_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9A17905A41007F6582 /* gain_table.c */; }; - 2758BAF617905A41007F6582 /* hexc_10_32_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9B17905A41007F6582 /* hexc_10_32_table.c */; }; - 2758BAF717905A41007F6582 /* hexc_table.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9C17905A41007F6582 /* hexc_table.c */; }; - 2758BAF817905A41007F6582 /* high_lsp_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9D17905A41007F6582 /* high_lsp_tables.c */; }; - 2758BAF917905A41007F6582 /* jitter.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9E17905A41007F6582 /* jitter.c */; }; - 2758BAFA17905A41007F6582 /* kiss_fft.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BA9F17905A41007F6582 /* kiss_fft.c */; }; - 2758BAFC17905A41007F6582 /* kiss_fftr.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAA117905A41007F6582 /* kiss_fftr.c */; }; - 2758BAFF17905A41007F6582 /* lpc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAA417905A41007F6582 /* lpc.c */; }; - 2758BB0217905A41007F6582 /* lsp_tables_nb.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAA717905A41007F6582 /* lsp_tables_nb.c */; }; - 2758BB0317905A41007F6582 /* lsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAA817905A41007F6582 /* lsp.c */; }; - 2758BB0817905A41007F6582 /* ltp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAAD17905A41007F6582 /* ltp.c */; }; - 2758BB0B17905A41007F6582 /* mdf.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAB017905A41007F6582 /* mdf.c */; }; - 2758BB0D17905A41007F6582 /* modes_wb.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAB217905A41007F6582 /* modes_wb.c */; }; - 2758BB0E17905A41007F6582 /* modes.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAB317905A41007F6582 /* modes.c */; }; - 2758BB1017905A41007F6582 /* nb_celp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAB517905A41007F6582 /* nb_celp.c */; }; - 2758BB1317905A41007F6582 /* preprocess.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAB817905A41007F6582 /* preprocess.c */; }; - 2758BB1617905A41007F6582 /* quant_lsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BABB17905A41007F6582 /* quant_lsp.c */; }; - 2758BB1817905A41007F6582 /* resample.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BABD17905A41007F6582 /* resample.c */; }; - 2758BB1917905A41007F6582 /* sb_celp.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BABE17905A41007F6582 /* sb_celp.c */; }; - 2758BB1B17905A41007F6582 /* smallft.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAC017905A41007F6582 /* smallft.c */; }; - 2758BB1D17905A41007F6582 /* speex_callbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAC217905A41007F6582 /* speex_callbacks.c */; }; - 2758BB1E17905A41007F6582 /* speex_header.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAC317905A41007F6582 /* speex_header.c */; }; - 2758BB1F17905A41007F6582 /* speex.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAC417905A41007F6582 /* speex.c */; }; - 2758BB2117905A41007F6582 /* stereo.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAC617905A41007F6582 /* stereo.c */; }; - 2758BB2717905A41007F6582 /* vbr.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BACC17905A41007F6582 /* vbr.c */; }; - 2758BB2D17905A41007F6582 /* vq.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAD217905A41007F6582 /* vq.c */; }; - 2758BB2F17905A41007F6582 /* window.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758BAD417905A41007F6582 /* window.c */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 2758BA57179059C1007F6582 /* libspeex.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libspeex.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 2758BA6217905A2B007F6582 /* speex_bits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_bits.h; sourceTree = ""; }; - 2758BA6317905A2B007F6582 /* speex_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_buffer.h; sourceTree = ""; }; - 2758BA6417905A2B007F6582 /* speex_callbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_callbacks.h; sourceTree = ""; }; - 2758BA6517905A2B007F6582 /* speex_config_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_config_types.h; sourceTree = ""; }; - 2758BA6617905A2B007F6582 /* speex_echo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_echo.h; sourceTree = ""; }; - 2758BA6717905A2B007F6582 /* speex_header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_header.h; sourceTree = ""; }; - 2758BA6817905A2B007F6582 /* speex_jitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_jitter.h; sourceTree = ""; }; - 2758BA6917905A2B007F6582 /* speex_preprocess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_preprocess.h; sourceTree = ""; }; - 2758BA6A17905A2B007F6582 /* speex_resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_resampler.h; sourceTree = ""; }; - 2758BA6B17905A2B007F6582 /* speex_stereo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_stereo.h; sourceTree = ""; }; - 2758BA6C17905A2B007F6582 /* speex_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_types.h; sourceTree = ""; }; - 2758BA6D17905A2B007F6582 /* speex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex.h; sourceTree = ""; }; - 2758BA7A17905A41007F6582 /* _kiss_fft_guts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _kiss_fft_guts.h; sourceTree = ""; }; - 2758BA7B17905A41007F6582 /* arch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = arch.h; sourceTree = ""; }; - 2758BA7C17905A41007F6582 /* bits.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bits.c; sourceTree = ""; }; - 2758BA7D17905A41007F6582 /* buffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = buffer.c; sourceTree = ""; }; - 2758BA7E17905A41007F6582 /* cb_search_arm4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cb_search_arm4.h; sourceTree = ""; }; - 2758BA7F17905A41007F6582 /* cb_search_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cb_search_bfin.h; sourceTree = ""; }; - 2758BA8017905A41007F6582 /* cb_search_sse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cb_search_sse.h; sourceTree = ""; }; - 2758BA8117905A41007F6582 /* cb_search.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cb_search.c; sourceTree = ""; }; - 2758BA8217905A41007F6582 /* cb_search.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cb_search.h; sourceTree = ""; }; - 2758BA8317905A41007F6582 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; }; - 2758BA8417905A41007F6582 /* echo_diagnostic.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = echo_diagnostic.m; sourceTree = ""; }; - 2758BA8517905A41007F6582 /* exc_5_64_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exc_5_64_table.c; sourceTree = ""; }; - 2758BA8617905A41007F6582 /* exc_5_256_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exc_5_256_table.c; sourceTree = ""; }; - 2758BA8717905A41007F6582 /* exc_8_128_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exc_8_128_table.c; sourceTree = ""; }; - 2758BA8817905A41007F6582 /* exc_10_16_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exc_10_16_table.c; sourceTree = ""; }; - 2758BA8917905A41007F6582 /* exc_10_32_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exc_10_32_table.c; sourceTree = ""; }; - 2758BA8A17905A41007F6582 /* exc_20_32_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exc_20_32_table.c; sourceTree = ""; }; - 2758BA8B17905A41007F6582 /* fftwrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fftwrap.c; sourceTree = ""; }; - 2758BA8C17905A41007F6582 /* fftwrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fftwrap.h; sourceTree = ""; }; - 2758BA8D17905A41007F6582 /* filterbank.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filterbank.c; sourceTree = ""; }; - 2758BA8E17905A41007F6582 /* filterbank.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filterbank.h; sourceTree = ""; }; - 2758BA8F17905A41007F6582 /* filters_arm4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filters_arm4.h; sourceTree = ""; }; - 2758BA9017905A41007F6582 /* filters_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filters_bfin.h; sourceTree = ""; }; - 2758BA9117905A41007F6582 /* filters_sse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filters_sse.h; sourceTree = ""; }; - 2758BA9217905A41007F6582 /* filters.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filters.c; sourceTree = ""; }; - 2758BA9317905A41007F6582 /* filters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filters.h; sourceTree = ""; }; - 2758BA9417905A41007F6582 /* fixed_arm4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fixed_arm4.h; sourceTree = ""; }; - 2758BA9517905A41007F6582 /* fixed_arm5e.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fixed_arm5e.h; sourceTree = ""; }; - 2758BA9617905A41007F6582 /* fixed_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fixed_bfin.h; sourceTree = ""; }; - 2758BA9717905A41007F6582 /* fixed_debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fixed_debug.h; sourceTree = ""; }; - 2758BA9817905A41007F6582 /* fixed_generic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fixed_generic.h; sourceTree = ""; }; - 2758BA9917905A41007F6582 /* gain_table_lbr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gain_table_lbr.c; sourceTree = ""; }; - 2758BA9A17905A41007F6582 /* gain_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gain_table.c; sourceTree = ""; }; - 2758BA9B17905A41007F6582 /* hexc_10_32_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hexc_10_32_table.c; sourceTree = ""; }; - 2758BA9C17905A41007F6582 /* hexc_table.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hexc_table.c; sourceTree = ""; }; - 2758BA9D17905A41007F6582 /* high_lsp_tables.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = high_lsp_tables.c; sourceTree = ""; }; - 2758BA9E17905A41007F6582 /* jitter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jitter.c; sourceTree = ""; }; - 2758BA9F17905A41007F6582 /* kiss_fft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kiss_fft.c; sourceTree = ""; }; - 2758BAA017905A41007F6582 /* kiss_fft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kiss_fft.h; sourceTree = ""; }; - 2758BAA117905A41007F6582 /* kiss_fftr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kiss_fftr.c; sourceTree = ""; }; - 2758BAA217905A41007F6582 /* kiss_fftr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kiss_fftr.h; sourceTree = ""; }; - 2758BAA317905A41007F6582 /* lpc_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lpc_bfin.h; sourceTree = ""; }; - 2758BAA417905A41007F6582 /* lpc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lpc.c; sourceTree = ""; }; - 2758BAA517905A41007F6582 /* lpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lpc.h; sourceTree = ""; }; - 2758BAA617905A41007F6582 /* lsp_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lsp_bfin.h; sourceTree = ""; }; - 2758BAA717905A41007F6582 /* lsp_tables_nb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsp_tables_nb.c; sourceTree = ""; }; - 2758BAA817905A41007F6582 /* lsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsp.c; sourceTree = ""; }; - 2758BAA917905A41007F6582 /* lsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lsp.h; sourceTree = ""; }; - 2758BAAA17905A41007F6582 /* ltp_arm4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ltp_arm4.h; sourceTree = ""; }; - 2758BAAB17905A41007F6582 /* ltp_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ltp_bfin.h; sourceTree = ""; }; - 2758BAAC17905A41007F6582 /* ltp_sse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ltp_sse.h; sourceTree = ""; }; - 2758BAAD17905A41007F6582 /* ltp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ltp.c; sourceTree = ""; }; - 2758BAAE17905A41007F6582 /* ltp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ltp.h; sourceTree = ""; }; - 2758BAAF17905A41007F6582 /* math_approx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = math_approx.h; sourceTree = ""; }; - 2758BAB017905A41007F6582 /* mdf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mdf.c; sourceTree = ""; }; - 2758BAB117905A41007F6582 /* misc_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = misc_bfin.h; sourceTree = ""; }; - 2758BAB217905A41007F6582 /* modes_wb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = modes_wb.c; sourceTree = ""; }; - 2758BAB317905A41007F6582 /* modes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = modes.c; sourceTree = ""; }; - 2758BAB417905A41007F6582 /* modes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = modes.h; sourceTree = ""; }; - 2758BAB517905A41007F6582 /* nb_celp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nb_celp.c; sourceTree = ""; }; - 2758BAB617905A41007F6582 /* nb_celp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nb_celp.h; sourceTree = ""; }; - 2758BAB717905A41007F6582 /* os_support.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = os_support.h; sourceTree = ""; }; - 2758BAB817905A41007F6582 /* preprocess.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = preprocess.c; sourceTree = ""; }; - 2758BAB917905A41007F6582 /* pseudofloat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pseudofloat.h; sourceTree = ""; }; - 2758BABA17905A41007F6582 /* quant_lsp_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quant_lsp_bfin.h; sourceTree = ""; }; - 2758BABB17905A41007F6582 /* quant_lsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = quant_lsp.c; sourceTree = ""; }; - 2758BABC17905A41007F6582 /* quant_lsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quant_lsp.h; sourceTree = ""; }; - 2758BABD17905A41007F6582 /* resample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = resample.c; sourceTree = ""; }; - 2758BABE17905A41007F6582 /* sb_celp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sb_celp.c; sourceTree = ""; }; - 2758BABF17905A41007F6582 /* sb_celp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sb_celp.h; sourceTree = ""; }; - 2758BAC017905A41007F6582 /* smallft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = smallft.c; sourceTree = ""; }; - 2758BAC117905A41007F6582 /* smallft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smallft.h; sourceTree = ""; }; - 2758BAC217905A41007F6582 /* speex_callbacks.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = speex_callbacks.c; sourceTree = ""; }; - 2758BAC317905A41007F6582 /* speex_header.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = speex_header.c; sourceTree = ""; }; - 2758BAC417905A41007F6582 /* speex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = speex.c; sourceTree = ""; }; - 2758BAC517905A41007F6582 /* stack_alloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stack_alloc.h; sourceTree = ""; }; - 2758BAC617905A41007F6582 /* stereo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stereo.c; sourceTree = ""; }; - 2758BAC717905A41007F6582 /* testdenoise.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testdenoise.c; sourceTree = ""; }; - 2758BAC817905A41007F6582 /* testecho.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testecho.c; sourceTree = ""; }; - 2758BAC917905A41007F6582 /* testenc_uwb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testenc_uwb.c; sourceTree = ""; }; - 2758BACA17905A41007F6582 /* testenc_wb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testenc_wb.c; sourceTree = ""; }; - 2758BACB17905A41007F6582 /* testenc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testenc.c; sourceTree = ""; }; - 2758BACC17905A41007F6582 /* vbr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vbr.c; sourceTree = ""; }; - 2758BACD17905A41007F6582 /* vbr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vbr.h; sourceTree = ""; }; - 2758BACE17905A41007F6582 /* vorbis_psy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbis_psy.h; sourceTree = ""; }; - 2758BACF17905A41007F6582 /* vq_arm4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vq_arm4.h; sourceTree = ""; }; - 2758BAD017905A41007F6582 /* vq_bfin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vq_bfin.h; sourceTree = ""; }; - 2758BAD117905A41007F6582 /* vq_sse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vq_sse.h; sourceTree = ""; }; - 2758BAD217905A41007F6582 /* vq.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vq.c; sourceTree = ""; }; - 2758BAD317905A41007F6582 /* vq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vq.h; sourceTree = ""; }; - 2758BAD417905A41007F6582 /* window.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = window.c; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 2758BA54179059C1007F6582 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 2758BA4E179059C1007F6582 = { - isa = PBXGroup; - children = ( - 2758BA5E179059E4007F6582 /* code */, - 2758BA58179059C1007F6582 /* Products */, - ); - sourceTree = ""; - }; - 2758BA58179059C1007F6582 /* Products */ = { - isa = PBXGroup; - children = ( - 2758BA57179059C1007F6582 /* libspeex.a */, - ); - name = Products; - sourceTree = ""; - }; - 2758BA5E179059E4007F6582 /* code */ = { - isa = PBXGroup; - children = ( - 2758BA5F179059F0007F6582 /* libspeex */, - ); - name = code; - path = ../../code; - sourceTree = ""; - }; - 2758BA5F179059F0007F6582 /* libspeex */ = { - isa = PBXGroup; - children = ( - 2758BA6017905A02007F6582 /* include */, - 2758BA7A17905A41007F6582 /* _kiss_fft_guts.h */, - 2758BA7B17905A41007F6582 /* arch.h */, - 2758BA7C17905A41007F6582 /* bits.c */, - 2758BA7D17905A41007F6582 /* buffer.c */, - 2758BA7E17905A41007F6582 /* cb_search_arm4.h */, - 2758BA7F17905A41007F6582 /* cb_search_bfin.h */, - 2758BA8017905A41007F6582 /* cb_search_sse.h */, - 2758BA8117905A41007F6582 /* cb_search.c */, - 2758BA8217905A41007F6582 /* cb_search.h */, - 2758BA8317905A41007F6582 /* config.h */, - 2758BA8417905A41007F6582 /* echo_diagnostic.m */, - 2758BA8517905A41007F6582 /* exc_5_64_table.c */, - 2758BA8617905A41007F6582 /* exc_5_256_table.c */, - 2758BA8717905A41007F6582 /* exc_8_128_table.c */, - 2758BA8817905A41007F6582 /* exc_10_16_table.c */, - 2758BA8917905A41007F6582 /* exc_10_32_table.c */, - 2758BA8A17905A41007F6582 /* exc_20_32_table.c */, - 2758BA8B17905A41007F6582 /* fftwrap.c */, - 2758BA8C17905A41007F6582 /* fftwrap.h */, - 2758BA8D17905A41007F6582 /* filterbank.c */, - 2758BA8E17905A41007F6582 /* filterbank.h */, - 2758BA8F17905A41007F6582 /* filters_arm4.h */, - 2758BA9017905A41007F6582 /* filters_bfin.h */, - 2758BA9117905A41007F6582 /* filters_sse.h */, - 2758BA9217905A41007F6582 /* filters.c */, - 2758BA9317905A41007F6582 /* filters.h */, - 2758BA9417905A41007F6582 /* fixed_arm4.h */, - 2758BA9517905A41007F6582 /* fixed_arm5e.h */, - 2758BA9617905A41007F6582 /* fixed_bfin.h */, - 2758BA9717905A41007F6582 /* fixed_debug.h */, - 2758BA9817905A41007F6582 /* fixed_generic.h */, - 2758BA9917905A41007F6582 /* gain_table_lbr.c */, - 2758BA9A17905A41007F6582 /* gain_table.c */, - 2758BA9B17905A41007F6582 /* hexc_10_32_table.c */, - 2758BA9C17905A41007F6582 /* hexc_table.c */, - 2758BA9D17905A41007F6582 /* high_lsp_tables.c */, - 2758BA9E17905A41007F6582 /* jitter.c */, - 2758BA9F17905A41007F6582 /* kiss_fft.c */, - 2758BAA017905A41007F6582 /* kiss_fft.h */, - 2758BAA117905A41007F6582 /* kiss_fftr.c */, - 2758BAA217905A41007F6582 /* kiss_fftr.h */, - 2758BAA317905A41007F6582 /* lpc_bfin.h */, - 2758BAA417905A41007F6582 /* lpc.c */, - 2758BAA517905A41007F6582 /* lpc.h */, - 2758BAA617905A41007F6582 /* lsp_bfin.h */, - 2758BAA717905A41007F6582 /* lsp_tables_nb.c */, - 2758BAA817905A41007F6582 /* lsp.c */, - 2758BAA917905A41007F6582 /* lsp.h */, - 2758BAAA17905A41007F6582 /* ltp_arm4.h */, - 2758BAAB17905A41007F6582 /* ltp_bfin.h */, - 2758BAAC17905A41007F6582 /* ltp_sse.h */, - 2758BAAD17905A41007F6582 /* ltp.c */, - 2758BAAE17905A41007F6582 /* ltp.h */, - 2758BAAF17905A41007F6582 /* math_approx.h */, - 2758BAB017905A41007F6582 /* mdf.c */, - 2758BAB117905A41007F6582 /* misc_bfin.h */, - 2758BAB217905A41007F6582 /* modes_wb.c */, - 2758BAB317905A41007F6582 /* modes.c */, - 2758BAB417905A41007F6582 /* modes.h */, - 2758BAB517905A41007F6582 /* nb_celp.c */, - 2758BAB617905A41007F6582 /* nb_celp.h */, - 2758BAB717905A41007F6582 /* os_support.h */, - 2758BAB817905A41007F6582 /* preprocess.c */, - 2758BAB917905A41007F6582 /* pseudofloat.h */, - 2758BABA17905A41007F6582 /* quant_lsp_bfin.h */, - 2758BABB17905A41007F6582 /* quant_lsp.c */, - 2758BABC17905A41007F6582 /* quant_lsp.h */, - 2758BABD17905A41007F6582 /* resample.c */, - 2758BABE17905A41007F6582 /* sb_celp.c */, - 2758BABF17905A41007F6582 /* sb_celp.h */, - 2758BAC017905A41007F6582 /* smallft.c */, - 2758BAC117905A41007F6582 /* smallft.h */, - 2758BAC217905A41007F6582 /* speex_callbacks.c */, - 2758BAC317905A41007F6582 /* speex_header.c */, - 2758BAC417905A41007F6582 /* speex.c */, - 2758BAC517905A41007F6582 /* stack_alloc.h */, - 2758BAC617905A41007F6582 /* stereo.c */, - 2758BAC717905A41007F6582 /* testdenoise.c */, - 2758BAC817905A41007F6582 /* testecho.c */, - 2758BAC917905A41007F6582 /* testenc_uwb.c */, - 2758BACA17905A41007F6582 /* testenc_wb.c */, - 2758BACB17905A41007F6582 /* testenc.c */, - 2758BACC17905A41007F6582 /* vbr.c */, - 2758BACD17905A41007F6582 /* vbr.h */, - 2758BACE17905A41007F6582 /* vorbis_psy.h */, - 2758BACF17905A41007F6582 /* vq_arm4.h */, - 2758BAD017905A41007F6582 /* vq_bfin.h */, - 2758BAD117905A41007F6582 /* vq_sse.h */, - 2758BAD217905A41007F6582 /* vq.c */, - 2758BAD317905A41007F6582 /* vq.h */, - 2758BAD417905A41007F6582 /* window.c */, - ); - path = libspeex; - sourceTree = ""; - }; - 2758BA6017905A02007F6582 /* include */ = { - isa = PBXGroup; - children = ( - 2758BA6117905A19007F6582 /* speex */, - ); - path = include; - sourceTree = ""; - }; - 2758BA6117905A19007F6582 /* speex */ = { - isa = PBXGroup; - children = ( - 2758BA6217905A2B007F6582 /* speex_bits.h */, - 2758BA6317905A2B007F6582 /* speex_buffer.h */, - 2758BA6417905A2B007F6582 /* speex_callbacks.h */, - 2758BA6517905A2B007F6582 /* speex_config_types.h */, - 2758BA6617905A2B007F6582 /* speex_echo.h */, - 2758BA6717905A2B007F6582 /* speex_header.h */, - 2758BA6817905A2B007F6582 /* speex_jitter.h */, - 2758BA6917905A2B007F6582 /* speex_preprocess.h */, - 2758BA6A17905A2B007F6582 /* speex_resampler.h */, - 2758BA6B17905A2B007F6582 /* speex_stereo.h */, - 2758BA6C17905A2B007F6582 /* speex_types.h */, - 2758BA6D17905A2B007F6582 /* speex.h */, - ); - path = speex; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 2758BA56179059C1007F6582 /* speex */ = { - isa = PBXNativeTarget; - buildConfigurationList = 2758BA5B179059C1007F6582 /* Build configuration list for PBXNativeTarget "speex" */; - buildPhases = ( - 2758BA53179059C1007F6582 /* Sources */, - 2758BA54179059C1007F6582 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = speex; - productName = speex; - productReference = 2758BA57179059C1007F6582 /* libspeex.a */; - productType = "com.apple.product-type.library.static"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 2758BA4F179059C1007F6582 /* Project object */ = { - isa = PBXProject; - attributes = { - CLASSPREFIX = io; - LastUpgradeCheck = 0460; - ORGANIZATIONNAME = ioquake; - }; - buildConfigurationList = 2758BA52179059C1007F6582 /* Build configuration list for PBXProject "speex" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = 2758BA4E179059C1007F6582; - productRefGroup = 2758BA58179059C1007F6582 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 2758BA56179059C1007F6582 /* speex */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - 2758BA53179059C1007F6582 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 2758BAD717905A41007F6582 /* bits.c in Sources */, - 2758BAD817905A41007F6582 /* buffer.c in Sources */, - 2758BADC17905A41007F6582 /* cb_search.c in Sources */, - 2758BAE017905A41007F6582 /* exc_5_64_table.c in Sources */, - 2758BAE117905A41007F6582 /* exc_5_256_table.c in Sources */, - 2758BAE217905A41007F6582 /* exc_8_128_table.c in Sources */, - 2758BAE317905A41007F6582 /* exc_10_16_table.c in Sources */, - 2758BAE417905A41007F6582 /* exc_10_32_table.c in Sources */, - 2758BAE517905A41007F6582 /* exc_20_32_table.c in Sources */, - 2758BAE617905A41007F6582 /* fftwrap.c in Sources */, - 2758BAE817905A41007F6582 /* filterbank.c in Sources */, - 2758BAED17905A41007F6582 /* filters.c in Sources */, - 2758BAF417905A41007F6582 /* gain_table_lbr.c in Sources */, - 2758BAF517905A41007F6582 /* gain_table.c in Sources */, - 2758BAF617905A41007F6582 /* hexc_10_32_table.c in Sources */, - 2758BAF717905A41007F6582 /* hexc_table.c in Sources */, - 2758BAF817905A41007F6582 /* high_lsp_tables.c in Sources */, - 2758BAF917905A41007F6582 /* jitter.c in Sources */, - 2758BAFA17905A41007F6582 /* kiss_fft.c in Sources */, - 2758BAFC17905A41007F6582 /* kiss_fftr.c in Sources */, - 2758BAFF17905A41007F6582 /* lpc.c in Sources */, - 2758BB0217905A41007F6582 /* lsp_tables_nb.c in Sources */, - 2758BB0317905A41007F6582 /* lsp.c in Sources */, - 2758BB0817905A41007F6582 /* ltp.c in Sources */, - 2758BB0B17905A41007F6582 /* mdf.c in Sources */, - 2758BB0D17905A41007F6582 /* modes_wb.c in Sources */, - 2758BB0E17905A41007F6582 /* modes.c in Sources */, - 2758BB1017905A41007F6582 /* nb_celp.c in Sources */, - 2758BB1317905A41007F6582 /* preprocess.c in Sources */, - 2758BB1617905A41007F6582 /* quant_lsp.c in Sources */, - 2758BB1817905A41007F6582 /* resample.c in Sources */, - 2758BB1917905A41007F6582 /* sb_celp.c in Sources */, - 2758BB1B17905A41007F6582 /* smallft.c in Sources */, - 2758BB1D17905A41007F6582 /* speex_callbacks.c in Sources */, - 2758BB1E17905A41007F6582 /* speex_header.c in Sources */, - 2758BB1F17905A41007F6582 /* speex.c in Sources */, - 2758BB2117905A41007F6582 /* stereo.c in Sources */, - 2758BB2717905A41007F6582 /* vbr.c in Sources */, - 2758BB2D17905A41007F6582 /* vq.c in Sources */, - 2758BB2F17905A41007F6582 /* window.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 2758BA59179059C1007F6582 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - HAVE_CONFIG_H, - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - 2758BA5A179059C1007F6582 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = macosx; - }; - name = Release; - }; - 2758BA5C179059C1007F6582 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../code/libspeex/include\""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 2758BA5D179059C1007F6582 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../code/libspeex/include\""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 2758BA52179059C1007F6582 /* Build configuration list for PBXProject "speex" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2758BA59179059C1007F6582 /* Debug */, - 2758BA5A179059C1007F6582 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 2758BA5B179059C1007F6582 /* Build configuration list for PBXNativeTarget "speex" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2758BA5C179059C1007F6582 /* Debug */, - 2758BA5D179059C1007F6582 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 2758BA4F179059C1007F6582 /* Project object */; -} diff --git a/misc/xcode/ui.xcodeproj/project.pbxproj b/misc/xcode/ui.xcodeproj/project.pbxproj index c0f95c9e..60576a02 100644 --- a/misc/xcode/ui.xcodeproj/project.pbxproj +++ b/misc/xcode/ui.xcodeproj/project.pbxproj @@ -159,14 +159,15 @@ 273531D014D1272300EB7BD6 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0460; + LastUpgradeCheck = 1110; }; buildConfigurationList = 273531D314D1272300EB7BD6 /* Build configuration list for PBXProject "ui" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 273531CE14D1272300EB7BD6; productRefGroup = 273531DA14D1272300EB7BD6 /* Products */; @@ -203,15 +204,31 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( MISSIONPACK, @@ -220,11 +237,13 @@ ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_VERSION = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -234,22 +253,39 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = MISSIONPACK; GCC_VERSION = ""; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; SDKROOT = macosx; }; name = Release; @@ -257,8 +293,10 @@ 273531DE14D1272300EB7BD6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -266,8 +304,10 @@ 273531DF14D1272300EB7BD6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/misc/xcode/xcode-readme.txt b/misc/xcode/xcode-readme.txt index fc53f65a..63fff75c 100644 --- a/misc/xcode/xcode-readme.txt +++ b/misc/xcode/xcode-readme.txt @@ -1,22 +1,26 @@ ioquake3 Xcode Projects -Created & Maintained by Jeremiah Sypult & Contributors -Updated: 2013/07/13 - +Created by Jeremiah Sypult & Contributors +Updated: 2019/10/28 by Tom Kidd GENERAL: From the ioquake3 root, navigate to misc/xcode and open the ioquake3.xcworkspace. The workspace embeds all the projects and currently builds universal (fat) binaries supporting i386 and x86_64. -An older version of Xcode may be able to add support for PowerPC, but it is not currently supported in the Xcode version I produced these projects with (4.6.3). - -Hopefully people working with ioquake3 on OS X will benefit from using Xcodes IDE for building, hacking and debugging. +Hopefully people working with ioquake3 on macOS will benefit from using Xcode for building, hacking and debugging. +NOTE: THE FIRST BUILD WITH XCODE WILL LIKELY FAIL. Subsequent builds will succeed. This is related to the second bullet point below. Some of the files necessary are created via a build phase but more recent versions of Xcode are less forgiving about the files being missing initially so the first build will fail. If anyone has a better way to handle this please let me know. LIBRARIES: -- Game libraries (cgame, game, ui) compile to universal binary dylib for native (versus qvm bytecode/interpreted). -- Renderer libraries also compile to universal binary dylib. The OpenGL 2 renderer project will normally show missing .c files in code/renderergl2/glsl. This is normal, as these .c files are automatically generated during the build process and deleted when building completes. This step is required in order for the renderer to link due to symbol dependencies in tr_glsl.c for fallback shaders. + +- Game libraries (cgame, game, ui) currently compile to universal binary dylib for native (versus qvm bytecode/interpreted). + +- Renderer libraries also compile to universal binary dylib. The OpenGL 2 renderer project will normally show missing .c files in code/renderergl2/glsl. This is normal, as these .c files are automatically generated during the build process and excluded from source control. This step is required in order for the renderer to link due to symbol dependencies in tr_glsl.c for fallback shaders. + - ioquake3 searches for game & renderer libraries with an abbreviated architecture suffix in the filename. Xcode scripts handle symlink creation for the appropriate architectures at build time in order to support universal (fat) binaries. -- Static libraries are used for botlib, jpeg and speex. -- Currently links OS X system libcurl.dylib and libz.dylib. + +- Static libraries are used for botlib, jpeg and opus. + +- Currently links macOS system libcurl.dylib and libz.dylib. + - SDL binary dylib is included. @@ -25,7 +29,6 @@ TODO: - missionpack support - curl.xcodeproj - ogg.xcodeproj (ogg vorbis support) -- opusfile.xcodeproj - zlib.xcodeproj - q3asm.xcodeproj - q3cpp.xcodeproj @@ -44,8 +47,5 @@ TODO: - - - NO CARRIER diff --git a/travis-ci-build.sh b/travis-ci-build.sh deleted file mode 100755 index 008bc7e1..00000000 --- a/travis-ci-build.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -failed=0; - -# Default Build -(make clean release) || failed=1; - -if [ $failed -eq 1 ]; then - echo "Build failure."; -else - echo "Build successful."; -fi - -exit $failed; -