diff --git a/Makefile b/Makefile index 9a7920f6..7ec4fa32 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,14 @@ COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr '[:upper:]' '[:lower:]' | sed -e 's/\//_/g') COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e 's/^arm.*/arm/') +#arm64 hack! +ifeq ($(shell uname -m), arm64) + COMPILE_ARCH=arm64 +endif +ifeq ($(shell uname -m), aarch64) + COMPILE_ARCH=arm64 +endif + ifeq ($(COMPILE_PLATFORM),sunos) # Solaris uname and GNU uname differ COMPILE_ARCH=$(shell uname -p | sed -e 's/i.86/x86/') @@ -471,6 +479,10 @@ ifeq ($(PLATFORM),darwin) OPTIMIZEVM += -mfpmath=sse BASE_CFLAGS += -arch x86_64 endif + ifeq ($(ARCH),arm64) + HAVE_VM_COMPILED=false # TODO: implement compiled vm + BASE_CFLAGS += -arch arm64 + endif # When compiling on OSX for OSX, we're not cross compiling as far as the # Makefile is concerned, as target architecture is specified as a compiler diff --git a/code/asm/ftola.c b/code/asm/ftola.c index e805acb4..b49a5faf 100644 --- a/code/asm/ftola.c +++ b/code/asm/ftola.c @@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "qasm-inline.h" +#if defined (__i386__) || defined(__x86_64__) static const unsigned short fpucw = 0x0C7F; /* @@ -97,3 +98,4 @@ int qvmftolx87(void) return retval; } +#endif diff --git a/code/asm/snapvector.c b/code/asm/snapvector.c index 44e81f58..da4a430d 100644 --- a/code/asm/snapvector.c +++ b/code/asm/snapvector.c @@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "qasm-inline.h" #include "../qcommon/q_shared.h" +#if defined (__i386__) || defined(__x86_64__) + /* * GNU inline asm version of qsnapvector * See MASM snapvector.asm for commentary @@ -71,3 +73,5 @@ void qsnapvectorx87(vec3_t vec) : "memory" ); } + +#endif diff --git a/code/libs/macosx/libSDL2-2.0.0.dylib b/code/libs/macosx/libSDL2-2.0.0.dylib index 30a0dea9..52782494 100755 Binary files a/code/libs/macosx/libSDL2-2.0.0.dylib and b/code/libs/macosx/libSDL2-2.0.0.dylib differ diff --git a/code/libs/macosx/libSDL2main.a b/code/libs/macosx/libSDL2main.a index 12279e2c..63141e63 100644 Binary files a/code/libs/macosx/libSDL2main.a and b/code/libs/macosx/libSDL2main.a differ diff --git a/code/opus-1.2.1/celt/x86/celt_lpc_sse.c b/code/opus-1.2.1/celt/x86/celt_lpc_sse.c index 54785688..ab227b84 100644 --- a/code/opus-1.2.1/celt/x86/celt_lpc_sse.c +++ b/code/opus-1.2.1/celt/x86/celt_lpc_sse.c @@ -29,6 +29,8 @@ #include "config.h" #endif +#if defined (__i386__) || defined(__x86_64__) + #include #include #include @@ -87,3 +89,4 @@ void celt_fir_sse4_1(const opus_val16 *x, } #endif +#endif diff --git a/code/opus-1.2.1/celt/x86/pitch_sse2.c b/code/opus-1.2.1/celt/x86/pitch_sse2.c index a0e7d1be..7ae0ba57 100644 --- a/code/opus-1.2.1/celt/x86/pitch_sse2.c +++ b/code/opus-1.2.1/celt/x86/pitch_sse2.c @@ -29,6 +29,7 @@ #include "config.h" #endif +#if defined (__i386__) || defined(__x86_64__) #include #include @@ -93,3 +94,4 @@ opus_val32 celt_inner_prod_sse2(const opus_val16 *x, const opus_val16 *y, return sum; } #endif +#endif diff --git a/code/opus-1.2.1/celt/x86/pitch_sse4_1.c b/code/opus-1.2.1/celt/x86/pitch_sse4_1.c index a092c68b..1ef29e70 100644 --- a/code/opus-1.2.1/celt/x86/pitch_sse4_1.c +++ b/code/opus-1.2.1/celt/x86/pitch_sse4_1.c @@ -29,6 +29,8 @@ #include "config.h" #endif +#if defined (__i386__) || defined(__x86_64__) + #include #include @@ -193,3 +195,4 @@ void xcorr_kernel_sse4_1(const opus_val16 * x, const opus_val16 * y, opus_val32 _mm_storeu_si128((__m128i *)sum, initSum); } #endif +#endif diff --git a/code/opus-1.2.1/celt/x86/vq_sse2.c b/code/opus-1.2.1/celt/x86/vq_sse2.c index 6a317703..99e0adf8 100644 --- a/code/opus-1.2.1/celt/x86/vq_sse2.c +++ b/code/opus-1.2.1/celt/x86/vq_sse2.c @@ -30,6 +30,8 @@ #include "config.h" #endif +#if defined (__i386__) || defined(__x86_64__) + #include #include #include "celt_lpc.h" @@ -215,3 +217,4 @@ opus_val16 op_pvq_search_sse2(celt_norm *_X, int *iy, int K, int N, int arch) } #endif +#endif diff --git a/code/opus-1.2.1/silk/x86/VAD_sse.c b/code/opus-1.2.1/silk/x86/VAD_sse.c index 4e90f441..b8f8add7 100644 --- a/code/opus-1.2.1/silk/x86/VAD_sse.c +++ b/code/opus-1.2.1/silk/x86/VAD_sse.c @@ -29,6 +29,8 @@ #include "config.h" #endif +#if defined (__i386__) || defined(__x86_64__) + #include #include #include @@ -275,3 +277,4 @@ opus_int silk_VAD_GetSA_Q8_sse4_1( /* O Return value, 0 if s RESTORE_STACK; return( ret ); } +#endif diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h index 27ca856e..72dbfe1d 100644 --- a/code/qcommon/q_platform.h +++ b/code/qcommon/q_platform.h @@ -156,6 +156,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define idx64 1 #define ARCH_STRING "x86_64" #define Q3_LITTLE_ENDIAN +#elif defined __aarch64__ +#define ARCH_STRING "arm64" +#define Q3_LITTLE_ENDIAN +#ifndef NO_VM_COMPILED +#define NO_VM_COMPILED +#endif #endif #define DLL_EXT ".dylib" diff --git a/code/qcommon/vm_x86.c b/code/qcommon/vm_x86.c index 6bf349f2..8d6321a6 100644 --- a/code/qcommon/vm_x86.c +++ b/code/qcommon/vm_x86.c @@ -42,6 +42,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #endif #endif +#if defined (__i386__) || defined(__x86_64__) static void VM_Destroy_Compiled(vm_t* self); /* @@ -1807,3 +1808,4 @@ int VM_CallCompiled(vm_t *vm, int *args) return opStack[opStackOfs]; } +#endif diff --git a/code/sys/sys_osx.m b/code/sys/sys_osx.m index b0ecf6a5..bb89f319 100644 --- a/code/sys/sys_osx.m +++ b/code/sys/sys_osx.m @@ -50,9 +50,9 @@ dialogResult_t Sys_Dialog( dialogType_t type, const char *message, const char *t [alert setInformativeText: [NSString stringWithUTF8String: message]]; if( type == DT_ERROR ) - [alert setAlertStyle: NSCriticalAlertStyle]; + [alert setAlertStyle: NSAlertStyleCritical]; else - [alert setAlertStyle: NSWarningAlertStyle]; + [alert setAlertStyle: NSAlertStyleWarning]; switch( type ) { diff --git a/make-macosx-app.sh b/make-macosx-app.sh index ab7f5d65..a44b8266 100755 --- a/make-macosx-app.sh +++ b/make-macosx-app.sh @@ -14,6 +14,7 @@ if [ $# == 0 ] || [ $# -gt 2 ]; then echo " x86" echo " x86_64" echo " ppc" + echo " arm64" echo exit 1 fi @@ -41,6 +42,8 @@ if [ "$2" != "" ]; then CURRENT_ARCH="x86_64" elif [ "$2" == "ppc" ]; then CURRENT_ARCH="ppc" + elif [ "$2" == "arm64" ]; then + CURRENT_ARCH="arm64" else echo "Invalid architecture: $2" echo "Valid architectures are:" @@ -78,6 +81,7 @@ function symlinkArch() IS32=`file "${SRCFILE}.${EXT}" | grep "i386"` IS64=`file "${SRCFILE}.${EXT}" | grep "x86_64"` ISPPC=`file "${SRCFILE}.${EXT}" | grep "ppc"` + ISARM=`file "${SRCFILE}.${EXT}" | grep "arm64"` if [ "${IS32}" != "" ]; then if [ ! -L "${DSTFILE}x86.${EXT}" ]; then @@ -103,6 +107,14 @@ function symlinkArch() rm "${DSTFILE}ppc.${EXT}" fi + if [ "${ISARM}" != "" ]; then + if [ ! -L "${DSTFILE}arm64.${EXT}" ]; then + ln -s "${SRCFILE}.${EXT}" "${DSTFILE}arm64.${EXT}" + fi + elif [ -L "${DSTFILE}arm64.${EXT}" ]; then + rm "${DSTFILE}arm64.${EXT}" + fi + popd > /dev/null } @@ -110,6 +122,7 @@ SEARCH_ARCHS=" \ x86 \ x86_64 \ ppc \ + arm64 \ " HAS_LIPO=`command -v lipo` @@ -314,7 +327,7 @@ PLIST=" LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET}" -if [ -n "${MACOSX_DEPLOYMENT_TARGET_PPC}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_X86}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_X86_64}" ]; then +if [ -n "${MACOSX_DEPLOYMENT_TARGET_PPC}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_X86}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_X86_64}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_ARM64}" ]; then PLIST="${PLIST} LSMinimumSystemVersionByArchitecture " @@ -336,6 +349,11 @@ if [ -n "${MACOSX_DEPLOYMENT_TARGET_PPC}" ] || [ -n "${MACOSX_DEPLOYMENT_TARGET_ x86_64 ${MACOSX_DEPLOYMENT_TARGET_X86_64}" fi + if [ -n "${MACOSX_DEPLOYMENT_TARGET_ARM64}" ]; then + PLIST="${PLIST} + arm64 + ${MACOSX_DEPLOYMENT_TARGET_ARM64}" + fi PLIST="${PLIST} " diff --git a/make-macosx.sh b/make-macosx.sh index be1ae774..4d68f673 100755 --- a/make-macosx.sh +++ b/make-macosx.sh @@ -18,9 +18,11 @@ elif [ "$1" == "x86_64" ]; then BUILDARCH=x86_64 elif [ "$1" == "ppc" ]; then BUILDARCH=ppc +elif [ "$1" == "arm64" ]; then + BUILDARCH=arm64 else echo "Invalid architecture: $1" - echo "Valid architectures are x86, x86_64 or ppc" + echo "Valid architectures are x86, x86_64, arm64 or ppc" exit 1 fi @@ -55,6 +57,8 @@ elif [ -d /Developer/SDKs/MacOSX10.6.sdk ]; then ARCH_SDK=/Developer/SDKs/MacOSX10.6.sdk ARCH_CFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk" ARCH_MACOSX_VERSION_MIN="10.6" +elif [ $BUILDARCH = "arm64" ]; then + ARCH_MACOSX_VERSION_MIN="11.0" else ARCH_MACOSX_VERSION_MIN="10.7" fi @@ -82,4 +86,5 @@ export MACOSX_DEPLOYMENT_TARGET="${ARCH_MACOSX_VERSION_MIN}" export MACOSX_DEPLOYMENT_TARGET_PPC= export MACOSX_DEPLOYMENT_TARGET_X86= export MACOSX_DEPLOYMENT_TARGET_X86_64= +export MACOSX_DEPLOYMENT_TARGET_ARM64= "./make-macosx-app.sh" release ${BUILDARCH} diff --git a/misc/xcode/botlib.xcodeproj/project.pbxproj b/misc/xcode/botlib.xcodeproj/project.pbxproj index e48e6ece..32db349d 100644 --- a/misc/xcode/botlib.xcodeproj/project.pbxproj +++ b/misc/xcode/botlib.xcodeproj/project.pbxproj @@ -256,7 +256,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = io; - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1220; ORGANIZATIONNAME = ioquake; }; buildConfigurationList = 2735306014D11F8B00EB7BD6 /* Build configuration list for PBXProject "botlib" */; @@ -333,6 +333,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -360,7 +361,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -383,6 +384,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -403,7 +405,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; }; name = Release; diff --git a/misc/xcode/cgame.xcodeproj/project.pbxproj b/misc/xcode/cgame.xcodeproj/project.pbxproj index 01c1862b..f5abe45d 100644 --- a/misc/xcode/cgame.xcodeproj/project.pbxproj +++ b/misc/xcode/cgame.xcodeproj/project.pbxproj @@ -34,6 +34,34 @@ 2711BD2F14D12F01005EB142 /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD2414D12F01005EB142 /* q_shared.c */; }; 27AACFF7178DFDDE0093DFC0 /* ui_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 27AACFF6178DFDDE0093DFC0 /* ui_shared.c */; }; 27AACFFA178DFE9A0093DFC0 /* cg_particles.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF314D12E99005EB142 /* cg_particles.c */; }; + A137C9C8258DCEE8009AC639 /* cg_consolecmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCE714D12E99005EB142 /* cg_consolecmds.c */; }; + A137C9C9258DCEE8009AC639 /* cg_draw.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCE814D12E99005EB142 /* cg_draw.c */; }; + A137C9CA258DCEE8009AC639 /* cg_drawtools.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCE914D12E99005EB142 /* cg_drawtools.c */; }; + A137C9CB258DCEE8009AC639 /* cg_effects.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCEA14D12E99005EB142 /* cg_effects.c */; }; + A137C9CC258DCEE8009AC639 /* cg_ents.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCEB14D12E99005EB142 /* cg_ents.c */; }; + A137C9CD258DCEE8009AC639 /* cg_event.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCEC14D12E99005EB142 /* cg_event.c */; }; + A137C9CE258DCEE8009AC639 /* cg_info.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCED14D12E99005EB142 /* cg_info.c */; }; + A137C9CF258DCEE8009AC639 /* cg_localents.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCEF14D12E99005EB142 /* cg_localents.c */; }; + A137C9D0258DCEE8009AC639 /* cg_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF014D12E99005EB142 /* cg_main.c */; }; + A137C9D1258DCEE8009AC639 /* cg_marks.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF114D12E99005EB142 /* cg_marks.c */; }; + A137C9D2258DCEE8009AC639 /* cg_players.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF414D12E99005EB142 /* cg_players.c */; }; + A137C9D3258DCEE8009AC639 /* cg_playerstate.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF514D12E99005EB142 /* cg_playerstate.c */; }; + A137C9D4258DCEE8009AC639 /* cg_predict.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF614D12E99005EB142 /* cg_predict.c */; }; + A137C9D5258DCEE8009AC639 /* cg_scoreboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF814D12E99005EB142 /* cg_scoreboard.c */; }; + A137C9D6258DCEE8009AC639 /* cg_servercmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF914D12E99005EB142 /* cg_servercmds.c */; }; + A137C9D7258DCEE8009AC639 /* cg_snapshot.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCFA14D12E99005EB142 /* cg_snapshot.c */; }; + A137C9D8258DCEE8009AC639 /* cg_syscalls.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCFB14D12E99005EB142 /* cg_syscalls.c */; }; + A137C9D9258DCEE8009AC639 /* cg_view.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCFC14D12E99005EB142 /* cg_view.c */; }; + A137C9DA258DCEE8009AC639 /* cg_weapons.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCFD14D12E99005EB142 /* cg_weapons.c */; }; + A137C9DB258DCEE8009AC639 /* bg_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD1C14D12F01005EB142 /* bg_lib.c */; }; + A137C9DC258DCEE8009AC639 /* bg_misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD1F14D12F01005EB142 /* bg_misc.c */; }; + A137C9DD258DCEE8009AC639 /* bg_pmove.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD2014D12F01005EB142 /* bg_pmove.c */; }; + A137C9DE258DCEE8009AC639 /* bg_slidemove.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD2214D12F01005EB142 /* bg_slidemove.c */; }; + A137C9DF258DCEE8009AC639 /* q_math.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD2314D12F01005EB142 /* q_math.c */; }; + A137C9E0258DCEE8009AC639 /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD2414D12F01005EB142 /* q_shared.c */; }; + A137C9E1258DCEE8009AC639 /* ui_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 27AACFF6178DFDDE0093DFC0 /* ui_shared.c */; }; + A137C9E2258DCEE8009AC639 /* cg_particles.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF314D12E99005EB142 /* cg_particles.c */; }; + A137C9EE258DCFED009AC639 /* cg_newdraw.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BCF214D12E99005EB142 /* cg_newdraw.c */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -72,8 +100,9 @@ 2711BD2414D12F01005EB142 /* q_shared.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_shared.c; sourceTree = ""; }; 2711BD2514D12F01005EB142 /* q_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = q_shared.h; sourceTree = ""; }; 2711BD2614D12F01005EB142 /* surfaceflags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surfaceflags.h; sourceTree = ""; }; - 2735319514D125FD00EB7BD6 /* cgame.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = cgame.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 2735319514D125FD00EB7BD6 /* baseq3/cgame.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = baseq3/cgame.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 27AACFF6178DFDDE0093DFC0 /* ui_shared.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ui_shared.c; path = ui/ui_shared.c; sourceTree = ""; }; + A137C9E7258DCEE8009AC639 /* missionpack/cgame.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = missionpack/cgame.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -84,6 +113,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + A137C9E3258DCEE8009AC639 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -121,7 +157,8 @@ 2735319614D125FD00EB7BD6 /* Products */ = { isa = PBXGroup; children = ( - 2735319514D125FD00EB7BD6 /* cgame.dylib */, + 2735319514D125FD00EB7BD6 /* baseq3/cgame.dylib */, + A137C9E7258DCEE8009AC639 /* missionpack/cgame.dylib */, ); name = Products; sourceTree = ""; @@ -182,9 +219,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 2735319414D125FD00EB7BD6 /* cgame */ = { + 2735319414D125FD00EB7BD6 /* cgame - baseq3 */ = { isa = PBXNativeTarget; - buildConfigurationList = 2735319914D125FD00EB7BD6 /* Build configuration list for PBXNativeTarget "cgame" */; + buildConfigurationList = 2735319914D125FD00EB7BD6 /* Build configuration list for PBXNativeTarget "cgame - baseq3" */; buildPhases = ( 2735319114D125FD00EB7BD6 /* Sources */, 2735319214D125FD00EB7BD6 /* Frameworks */, @@ -193,9 +230,25 @@ ); dependencies = ( ); - name = cgame; + name = "cgame - baseq3"; productName = cgame; - productReference = 2735319514D125FD00EB7BD6 /* cgame.dylib */; + productReference = 2735319514D125FD00EB7BD6 /* baseq3/cgame.dylib */; + productType = "com.apple.product-type.library.dynamic"; + }; + A137C9C6258DCEE8009AC639 /* cgame - missionpack */ = { + isa = PBXNativeTarget; + buildConfigurationList = A137C9E4258DCEE8009AC639 /* Build configuration list for PBXNativeTarget "cgame - missionpack" */; + buildPhases = ( + A137C9C7258DCEE8009AC639 /* Sources */, + A137C9E3258DCEE8009AC639 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "cgame - missionpack"; + productName = cgame; + productReference = A137C9E7258DCEE8009AC639 /* missionpack/cgame.dylib */; productType = "com.apple.product-type.library.dynamic"; }; /* End PBXNativeTarget section */ @@ -205,7 +258,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = io; - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1220; ORGANIZATIONNAME = ioquake; }; buildConfigurationList = 2735318F14D125FD00EB7BD6 /* Build configuration list for PBXProject "cgame" */; @@ -221,7 +274,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 2735319414D125FD00EB7BD6 /* cgame */, + 2735319414D125FD00EB7BD6 /* cgame - baseq3 */, + A137C9C6258DCEE8009AC639 /* cgame - missionpack */, ); }; /* End PBXProject section */ @@ -261,6 +315,41 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + A137C9C7258DCEE8009AC639 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A137C9C8258DCEE8009AC639 /* cg_consolecmds.c in Sources */, + A137C9C9258DCEE8009AC639 /* cg_draw.c in Sources */, + A137C9EE258DCFED009AC639 /* cg_newdraw.c in Sources */, + A137C9CA258DCEE8009AC639 /* cg_drawtools.c in Sources */, + A137C9CB258DCEE8009AC639 /* cg_effects.c in Sources */, + A137C9CC258DCEE8009AC639 /* cg_ents.c in Sources */, + A137C9CD258DCEE8009AC639 /* cg_event.c in Sources */, + A137C9CE258DCEE8009AC639 /* cg_info.c in Sources */, + A137C9CF258DCEE8009AC639 /* cg_localents.c in Sources */, + A137C9D0258DCEE8009AC639 /* cg_main.c in Sources */, + A137C9D1258DCEE8009AC639 /* cg_marks.c in Sources */, + A137C9D2258DCEE8009AC639 /* cg_players.c in Sources */, + A137C9D3258DCEE8009AC639 /* cg_playerstate.c in Sources */, + A137C9D4258DCEE8009AC639 /* cg_predict.c in Sources */, + A137C9D5258DCEE8009AC639 /* cg_scoreboard.c in Sources */, + A137C9D6258DCEE8009AC639 /* cg_servercmds.c in Sources */, + A137C9D7258DCEE8009AC639 /* cg_snapshot.c in Sources */, + A137C9D8258DCEE8009AC639 /* cg_syscalls.c in Sources */, + A137C9D9258DCEE8009AC639 /* cg_view.c in Sources */, + A137C9DA258DCEE8009AC639 /* cg_weapons.c in Sources */, + A137C9DB258DCEE8009AC639 /* bg_lib.c in Sources */, + A137C9DC258DCEE8009AC639 /* bg_misc.c in Sources */, + A137C9DD258DCEE8009AC639 /* bg_pmove.c in Sources */, + A137C9DE258DCEE8009AC639 /* bg_slidemove.c in Sources */, + A137C9DF258DCEE8009AC639 /* q_math.c in Sources */, + A137C9E0258DCEE8009AC639 /* q_shared.c in Sources */, + A137C9E1258DCEE8009AC639 /* ui_shared.c in Sources */, + A137C9E2258DCEE8009AC639 /* cg_particles.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -281,6 +370,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -306,7 +396,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -329,6 +419,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -347,7 +438,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; }; name = Release; @@ -359,7 +450,7 @@ COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = baseq3/cgame; }; name = Debug; }; @@ -370,7 +461,35 @@ COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = baseq3/cgame; + }; + name = Release; + }; + A137C9E5258DCEE8009AC639 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + COMBINE_HIDPI_IMAGES = YES; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + MISSIONPACK, + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + PRODUCT_NAME = missionpack/cgame; + }; + name = Debug; + }; + A137C9E6258DCEE8009AC639 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + COMBINE_HIDPI_IMAGES = YES; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = MISSIONPACK; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + PRODUCT_NAME = missionpack/cgame; }; name = Release; }; @@ -386,7 +505,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2735319914D125FD00EB7BD6 /* Build configuration list for PBXNativeTarget "cgame" */ = { + 2735319914D125FD00EB7BD6 /* Build configuration list for PBXNativeTarget "cgame - baseq3" */ = { isa = XCConfigurationList; buildConfigurations = ( 2735319A14D125FD00EB7BD6 /* Debug */, @@ -395,6 +514,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + A137C9E4258DCEE8009AC639 /* Build configuration list for PBXNativeTarget "cgame - missionpack" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A137C9E5258DCEE8009AC639 /* Debug */, + A137C9E6258DCEE8009AC639 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 2735318C14D125FD00EB7BD6 /* Project object */; diff --git a/misc/xcode/game.xcodeproj/project.pbxproj b/misc/xcode/game.xcodeproj/project.pbxproj index 4a71b9b0..703690bd 100644 --- a/misc/xcode/game.xcodeproj/project.pbxproj +++ b/misc/xcode/game.xcodeproj/project.pbxproj @@ -40,6 +40,39 @@ 2711BDAE14D12F4E005EB142 /* g_weapon.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6D14D12F4E005EB142 /* g_weapon.c */; }; 2711BDB114D12F4E005EB142 /* q_math.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD7014D12F4E005EB142 /* q_math.c */; }; 2711BDB214D12F4E005EB142 /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD7114D12F4E005EB142 /* q_shared.c */; }; + A137C98F258DCD55009AC639 /* ai_chat.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD3414D12F4E005EB142 /* ai_chat.c */; }; + A137C990258DCD55009AC639 /* ai_cmd.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD3614D12F4E005EB142 /* ai_cmd.c */; }; + A137C991258DCD55009AC639 /* ai_dmnet.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD3814D12F4E005EB142 /* ai_dmnet.c */; }; + A137C992258DCD55009AC639 /* ai_dmq3.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD3A14D12F4E005EB142 /* ai_dmq3.c */; }; + A137C993258DCD55009AC639 /* ai_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD3C14D12F4E005EB142 /* ai_main.c */; }; + A137C994258DCD55009AC639 /* ai_team.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD3E14D12F4E005EB142 /* ai_team.c */; }; + A137C995258DCD55009AC639 /* ai_vcmd.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD4014D12F4E005EB142 /* ai_vcmd.c */; }; + A137C996258DCD55009AC639 /* bg_misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD4D14D12F4E005EB142 /* bg_misc.c */; }; + A137C997258DCD55009AC639 /* bg_pmove.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD4E14D12F4E005EB142 /* bg_pmove.c */; }; + A137C998258DCD55009AC639 /* bg_slidemove.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5014D12F4E005EB142 /* bg_slidemove.c */; }; + A137C999258DCD55009AC639 /* g_active.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5314D12F4E005EB142 /* g_active.c */; }; + A137C99A258DCD55009AC639 /* g_arenas.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5414D12F4E005EB142 /* g_arenas.c */; }; + A137C99B258DCD55009AC639 /* g_bot.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5514D12F4E005EB142 /* g_bot.c */; }; + A137C99C258DCD55009AC639 /* g_client.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5614D12F4E005EB142 /* g_client.c */; }; + A137C99D258DCD55009AC639 /* g_cmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5714D12F4E005EB142 /* g_cmds.c */; }; + A137C99E258DCD55009AC639 /* g_combat.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5814D12F4E005EB142 /* g_combat.c */; }; + A137C99F258DCD55009AC639 /* g_items.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5914D12F4E005EB142 /* g_items.c */; }; + A137C9A0258DCD55009AC639 /* g_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5B14D12F4E005EB142 /* g_main.c */; }; + A137C9A1258DCD55009AC639 /* g_mem.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5C14D12F4E005EB142 /* g_mem.c */; }; + A137C9A2258DCD55009AC639 /* g_misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5D14D12F4E005EB142 /* g_misc.c */; }; + A137C9A3258DCD55009AC639 /* g_missile.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5E14D12F4E005EB142 /* g_missile.c */; }; + A137C9A4258DCD55009AC639 /* g_mover.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD5F14D12F4E005EB142 /* g_mover.c */; }; + A137C9A5258DCD55009AC639 /* g_session.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6314D12F4E005EB142 /* g_session.c */; }; + A137C9A6258DCD55009AC639 /* g_spawn.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6414D12F4E005EB142 /* g_spawn.c */; }; + A137C9A7258DCD55009AC639 /* g_svcmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6514D12F4E005EB142 /* g_svcmds.c */; }; + A137C9A8258DCD55009AC639 /* g_syscalls.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6714D12F4E005EB142 /* g_syscalls.c */; }; + A137C9A9258DCD55009AC639 /* g_target.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6814D12F4E005EB142 /* g_target.c */; }; + A137C9AA258DCD55009AC639 /* g_team.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6914D12F4E005EB142 /* g_team.c */; }; + A137C9AB258DCD55009AC639 /* g_trigger.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6B14D12F4E005EB142 /* g_trigger.c */; }; + A137C9AC258DCD55009AC639 /* g_utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6C14D12F4E005EB142 /* g_utils.c */; }; + A137C9AD258DCD55009AC639 /* g_weapon.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD6D14D12F4E005EB142 /* g_weapon.c */; }; + A137C9AE258DCD55009AC639 /* q_math.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD7014D12F4E005EB142 /* q_math.c */; }; + A137C9AF258DCD55009AC639 /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BD7114D12F4E005EB142 /* q_shared.c */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -99,7 +132,8 @@ 2711BD7214D12F4E005EB142 /* q_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = q_shared.h; sourceTree = ""; }; 2711BD7314D12F4E005EB142 /* surfaceflags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surfaceflags.h; sourceTree = ""; }; 2711BD7414D12F4E005EB142 /* syn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = syn.h; sourceTree = ""; }; - 273531B414D126C300EB7BD6 /* game.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = game.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 273531B414D126C300EB7BD6 /* baseq3/qagame.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = baseq3/qagame.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + A137C9B4258DCD55009AC639 /* missionpack/qagame.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = missionpack/qagame.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -110,6 +144,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + A137C9B0258DCD55009AC639 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -183,7 +224,8 @@ 273531B514D126C300EB7BD6 /* Products */ = { isa = PBXGroup; children = ( - 273531B414D126C300EB7BD6 /* game.dylib */, + 273531B414D126C300EB7BD6 /* baseq3/qagame.dylib */, + A137C9B4258DCD55009AC639 /* missionpack/qagame.dylib */, ); name = Products; sourceTree = ""; @@ -212,9 +254,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 273531B314D126C300EB7BD6 /* game */ = { + 273531B314D126C300EB7BD6 /* game - baseq3 */ = { isa = PBXNativeTarget; - buildConfigurationList = 273531B814D126C300EB7BD6 /* Build configuration list for PBXNativeTarget "game" */; + buildConfigurationList = 273531B814D126C300EB7BD6 /* Build configuration list for PBXNativeTarget "game - baseq3" */; buildPhases = ( 273531B014D126C300EB7BD6 /* Sources */, 273531B114D126C300EB7BD6 /* Frameworks */, @@ -223,9 +265,25 @@ ); dependencies = ( ); - name = game; + name = "game - baseq3"; productName = game; - productReference = 273531B414D126C300EB7BD6 /* game.dylib */; + productReference = 273531B414D126C300EB7BD6 /* baseq3/qagame.dylib */; + productType = "com.apple.product-type.library.dynamic"; + }; + A137C98D258DCD55009AC639 /* game - missionpack */ = { + isa = PBXNativeTarget; + buildConfigurationList = A137C9B1258DCD55009AC639 /* Build configuration list for PBXNativeTarget "game - missionpack" */; + buildPhases = ( + A137C98E258DCD55009AC639 /* Sources */, + A137C9B0258DCD55009AC639 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "game - missionpack"; + productName = game; + productReference = A137C9B4258DCD55009AC639 /* missionpack/qagame.dylib */; productType = "com.apple.product-type.library.dynamic"; }; /* End PBXNativeTarget section */ @@ -235,7 +293,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = io; - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1220; ORGANIZATIONNAME = ioquake; }; buildConfigurationList = 273531AE14D126C300EB7BD6 /* Build configuration list for PBXProject "game" */; @@ -251,7 +309,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 273531B314D126C300EB7BD6 /* game */, + 273531B314D126C300EB7BD6 /* game - baseq3 */, + A137C98D258DCD55009AC639 /* game - missionpack */, ); }; /* End PBXProject section */ @@ -297,6 +356,46 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + A137C98E258DCD55009AC639 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A137C98F258DCD55009AC639 /* ai_chat.c in Sources */, + A137C990258DCD55009AC639 /* ai_cmd.c in Sources */, + A137C991258DCD55009AC639 /* ai_dmnet.c in Sources */, + A137C992258DCD55009AC639 /* ai_dmq3.c in Sources */, + A137C993258DCD55009AC639 /* ai_main.c in Sources */, + A137C994258DCD55009AC639 /* ai_team.c in Sources */, + A137C995258DCD55009AC639 /* ai_vcmd.c in Sources */, + A137C996258DCD55009AC639 /* bg_misc.c in Sources */, + A137C997258DCD55009AC639 /* bg_pmove.c in Sources */, + A137C998258DCD55009AC639 /* bg_slidemove.c in Sources */, + A137C999258DCD55009AC639 /* g_active.c in Sources */, + A137C99A258DCD55009AC639 /* g_arenas.c in Sources */, + A137C99B258DCD55009AC639 /* g_bot.c in Sources */, + A137C99C258DCD55009AC639 /* g_client.c in Sources */, + A137C99D258DCD55009AC639 /* g_cmds.c in Sources */, + A137C99E258DCD55009AC639 /* g_combat.c in Sources */, + A137C99F258DCD55009AC639 /* g_items.c in Sources */, + A137C9A0258DCD55009AC639 /* g_main.c in Sources */, + A137C9A1258DCD55009AC639 /* g_mem.c in Sources */, + A137C9A2258DCD55009AC639 /* g_misc.c in Sources */, + A137C9A3258DCD55009AC639 /* g_missile.c in Sources */, + A137C9A4258DCD55009AC639 /* g_mover.c in Sources */, + A137C9A5258DCD55009AC639 /* g_session.c in Sources */, + A137C9A6258DCD55009AC639 /* g_spawn.c in Sources */, + A137C9A7258DCD55009AC639 /* g_svcmds.c in Sources */, + A137C9A8258DCD55009AC639 /* g_syscalls.c in Sources */, + A137C9A9258DCD55009AC639 /* g_target.c in Sources */, + A137C9AA258DCD55009AC639 /* g_team.c in Sources */, + A137C9AB258DCD55009AC639 /* g_trigger.c in Sources */, + A137C9AC258DCD55009AC639 /* g_utils.c in Sources */, + A137C9AD258DCD55009AC639 /* g_weapon.c in Sources */, + A137C9AE258DCD55009AC639 /* q_math.c in Sources */, + A137C9AF258DCD55009AC639 /* q_shared.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -317,6 +416,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -342,7 +442,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -365,6 +465,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -383,7 +484,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; }; name = Release; @@ -395,7 +496,7 @@ COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = baseq3/qagame; }; name = Debug; }; @@ -406,7 +507,35 @@ COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = baseq3/qagame; + }; + name = Release; + }; + A137C9B2258DCD55009AC639 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + COMBINE_HIDPI_IMAGES = YES; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + MISSIONPACK, + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + PRODUCT_NAME = missionpack/qagame; + }; + name = Debug; + }; + A137C9B3258DCD55009AC639 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + COMBINE_HIDPI_IMAGES = YES; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = MISSIONPACK; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + PRODUCT_NAME = missionpack/qagame; }; name = Release; }; @@ -422,7 +551,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 273531B814D126C300EB7BD6 /* Build configuration list for PBXNativeTarget "game" */ = { + 273531B814D126C300EB7BD6 /* Build configuration list for PBXNativeTarget "game - baseq3" */ = { isa = XCConfigurationList; buildConfigurations = ( 273531B914D126C300EB7BD6 /* Debug */, @@ -431,6 +560,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + A137C9B1258DCD55009AC639 /* Build configuration list for PBXNativeTarget "game - missionpack" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A137C9B2258DCD55009AC639 /* Debug */, + A137C9B3258DCD55009AC639 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 273531AB14D126C300EB7BD6 /* Project object */; diff --git a/misc/xcode/ioquake3-Info.plist b/misc/xcode/ioquake3-Info.plist index 96b357dc..e1789e69 100644 --- a/misc/xcode/ioquake3-Info.plist +++ b/misc/xcode/ioquake3-Info.plist @@ -6,8 +6,6 @@ en CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - quake3_flat CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion @@ -21,7 +19,7 @@ CFBundleSignature ???? CFBundleVersion - c2025d94-2019-10-26 + 451f21cb-2020-12-19 CGDisableCoalescedUpdates LSMinimumSystemVersion diff --git a/misc/xcode/ioquake3.xcodeproj/project.pbxproj b/misc/xcode/ioquake3.xcodeproj/project.pbxproj index a9ebbad8..963aa73b 100644 --- a/misc/xcode/ioquake3.xcodeproj/project.pbxproj +++ b/misc/xcode/ioquake3.xcodeproj/project.pbxproj @@ -6,30 +6,6 @@ objectVersion = 46; objects = { -/* Begin PBXAggregateTarget section */ - 2772B8021790EBE0004CCF57 /* all ioquake3 */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 2772B8031790EBE0004CCF57 /* Build configuration list for PBXAggregateTarget "all ioquake3" */; - buildPhases = ( - ); - dependencies = ( - 2772B80D1790ECAB004CCF57 /* PBXTargetDependency */, - ); - name = "all ioquake3"; - productName = "all ioquake3"; - }; - 2772B8081790EC7F004CCF57 /* all game */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 2772B8091790EC7F004CCF57 /* Build configuration list for PBXAggregateTarget "all game" */; - buildPhases = ( - ); - dependencies = ( - ); - name = "all game"; - productName = "all game"; - }; -/* End PBXAggregateTarget section */ - /* Begin PBXBuildFile section */ 2711BE7A14D13696005EB142 /* sv_bot.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BE7014D13696005EB142 /* sv_bot.c */; }; 2711BE7B14D13696005EB142 /* sv_ccmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BE7114D13696005EB142 /* sv_ccmds.c */; }; @@ -82,7 +58,6 @@ 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 */; }; 2758BB3317905B8F007F6582 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2758BB3217905B8F007F6582 /* IOKit.framework */; }; - 2758BB42179070C3007F6582 /* quake3_flat.iconset in Resources */ = {isa = PBXBuildFile; fileRef = 2758BB41179070C3007F6582 /* quake3_flat.iconset */; }; 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 */; }; @@ -107,35 +82,25 @@ 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 */; }; + A115085925B9CD0A000CF482 /* libSDL2-2.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A1665967219105430086B74B /* libSDL2-2.0.0.dylib */; }; + A115085A25B9CD0A000CF482 /* libSDL2main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A16659652191052E0086B74B /* libSDL2main.a */; }; + A115087425BA520A000CF482 /* libSDL2-2.0.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = A115087325BA520A000CF482 /* libSDL2-2.0.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + A1203449257C937600CA384C /* renderer_opengl2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A1203448257C937600CA384C /* renderer_opengl2.dylib */; }; + A1403E58256F15E700DFAD74 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A1403E57256F15E700DFAD74 /* Images.xcassets */; }; 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 */ - 2772B80C1790ECAB004CCF57 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 273531E214D1275D00EB7BD6 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 273531EA14D1275D00EB7BD6; - remoteInfo = ioquake3; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ - A166596F219105E00086B74B /* Embed Libraries */ = { + A115087225BA51E4000CF482 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; - dstSubfolderSpec = 10; + dstSubfolderSpec = 6; files = ( - A16659722192A3DD0086B74B /* libSDL2-2.0.0.dylib in Embed Libraries */, + A115087425BA520A000CF482 /* libSDL2-2.0.0.dylib in CopyFiles */, ); - name = "Embed Libraries"; runOnlyForDeploymentPostprocessing = 0; }; /* End PBXCopyFilesBuildPhase section */ @@ -221,11 +186,9 @@ 2758B912178FB696007F6582 /* libSDLmain.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDLmain.a; path = ../../code/libs/macosx/libSDLmain.a; sourceTree = SOURCE_ROOT; }; 2758BA49178FD062007F6582 /* renderer_opengl2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = renderer_opengl2.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 2758BB3217905B8F007F6582 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; - 2758BB41179070C3007F6582 /* quake3_flat.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = quake3_flat.iconset; path = ../quake3_flat.iconset; sourceTree = ""; }; 2772B8001790EABF004CCF57 /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libspeex.a; sourceTree = BUILT_PRODUCTS_DIR; }; 2772B8401790F05B004CCF57 /* cgame.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = cgame.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 2772B8411790F05B004CCF57 /* game.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = game.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; - 2772B8421790F05B004CCF57 /* q3_ui.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = q3_ui.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 2772B8431790F05B004CCF57 /* ui.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = ui.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 278714D717911C1300094CA3 /* libmumblelink.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = libmumblelink.c; sourceTree = ""; }; 278714D817911C1300094CA3 /* libmumblelink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libmumblelink.h; sourceTree = ""; }; @@ -295,8 +258,10 @@ 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 = ""; }; + A115087325BA520A000CF482 /* 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 = ""; }; + A1203448257C937600CA384C /* renderer_opengl2.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = renderer_opengl2.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + A1403E57256F15E700DFAD74 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ioquake3/Images.xcassets; 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 = ""; }; @@ -392,11 +357,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A163B2602193D67700C48278 /* renderer_opengl2.dylib in Frameworks */, + A115085925B9CD0A000CF482 /* libSDL2-2.0.0.dylib in Frameworks */, + A115085A25B9CD0A000CF482 /* libSDL2main.a 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 */, + A1203449257C937600CA384C /* renderer_opengl2.dylib in Frameworks */, 273531F014D1275D00EB7BD6 /* Cocoa.framework in Frameworks */, 2758BB3317905B8F007F6582 /* IOKit.framework in Frameworks */, 27AAD06F178E04FF0093DFC0 /* OpenAL.framework in Frameworks */, @@ -414,7 +379,6 @@ children = ( 2772B8401790F05B004CCF57 /* cgame.dylib */, 2772B8411790F05B004CCF57 /* game.dylib */, - 2772B8421790F05B004CCF57 /* q3_ui.dylib */, 2772B8431790F05B004CCF57 /* ui.dylib */, 274FAC89178FB20C00B17C7A /* renderer_opengl1.dylib */, 2758BA49178FD062007F6582 /* renderer_opengl2.dylib */, @@ -604,7 +568,8 @@ 273531EE14D1275D00EB7BD6 /* Frameworks */ = { isa = PBXGroup; children = ( - A163B25F2193D67700C48278 /* renderer_opengl2.dylib */, + A115087325BA520A000CF482 /* libSDL2-2.0.0.dylib */, + A1203448257C937600CA384C /* renderer_opengl2.dylib */, A163B25B2193AF1E00C48278 /* renderer_opengl1.dylib */, A1665973219341DF0086B74B /* libopus.dylib */, A1665967219105430086B74B /* libSDL2-2.0.0.dylib */, @@ -619,7 +584,7 @@ 273531F614D1275D00EB7BD6 /* Supporting Files */ = { isa = PBXGroup; children = ( - 2758BB41179070C3007F6582 /* quake3_flat.iconset */, + A1403E57256F15E700DFAD74 /* Images.xcassets */, 273531F714D1275D00EB7BD6 /* ioquake3-Info.plist */, 273531FD14D1275D00EB7BD6 /* ioquake3-Prefix.pch */, ); @@ -814,10 +779,9 @@ buildPhases = ( 273531E714D1275D00EB7BD6 /* Sources */, 273531E814D1275D00EB7BD6 /* Frameworks */, - 274FAC8C178FB4C500B17C7A /* Run Script - Bump Version Number */, 2758BB35179061C1007F6582 /* Run Script - Copy Renderer & Game Dynamic Libraries, Symlink Architecture */, 273531E914D1275D00EB7BD6 /* Resources */, - A166596F219105E00086B74B /* Embed Libraries */, + A115087225BA51E4000CF482 /* CopyFiles */, ); buildRules = ( ); @@ -835,7 +799,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = io; - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1220; ORGANIZATIONNAME = ioquake; }; buildConfigurationList = 273531E514D1275D00EB7BD6 /* Build configuration list for PBXProject "ioquake3" */; @@ -852,8 +816,6 @@ projectRoot = ""; targets = ( 273531EA14D1275D00EB7BD6 /* ioquake3 */, - 2772B8021790EBE0004CCF57 /* all ioquake3 */, - 2772B8081790EC7F004CCF57 /* all game */, ); }; /* End PBXProject section */ @@ -863,27 +825,13 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2758BB42179070C3007F6582 /* quake3_flat.iconset in Resources */, + A1403E58256F15E700DFAD74 /* Images.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 274FAC8C178FB4C500B17C7A /* Run Script - Bump Version Number */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script - Bump Version Number"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "#\n# update the version from q_shared.h\n#\nPRODUCT_VERSION_FILE=\"${SRCROOT}/../../code/qcommon/q_shared.h\"\nPRODUCT_VERSION=`cat \"${PRODUCT_VERSION_FILE}\" | grep \"#define PRODUCT_VERSION\" | awk '{print $3}' | sed 's/\\\"//;s/\\\"$//'`\nGIT_VERSION=\"\"\n\nif [ \"${PRODUCT_VERSION}\" != \"\" ]; then\n /usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $PRODUCT_VERSION\" \"${INFOPLIST_FILE}\"\nfi\n\n#\n# update the git version\n#\nif [ -e \"${SRCROOT}/../../.git\" ]; then\n GIT_VERSION=`git show -s --pretty=format:%h-%ad --date=short`\n\n if [ \"${GIT_VERSION}\" != \"\" ]; then\n /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $GIT_VERSION\" \"${INFOPLIST_FILE}\"\n fi\nfi\n"; - }; 2758BB35179061C1007F6582 /* Run Script - Copy Renderer & Game Dynamic Libraries, Symlink Architecture */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -896,7 +844,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "#\n# copy the renderer & game dynamic libraries to their appropriate locations within the application bundle\n# symlink appropriate architecture names for universal (fat) binary support\n# TODO: missionpack support\n#\nBUILD=\"${BUILT_PRODUCTS_DIR}\"\nMACOS=\"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}\"\nCGAME=\"cgame\"\nGAME=\"game\"\nQ3UI=\"q3_ui\"\nUI=\"ui\"\nBASEQ3=\"baseq3\"\nMISSIONPACK=\"missionpack\"\nRENDERER_OPENGL1=\"renderer_opengl1\"\nRENDERER_OPENGL2=\"renderer_opengl2\"\n\nfunction symlinkArch()\n{\n EXT=\"dylib\"\n SEP=\"${3}\"\n SRCFILE=\"${1}\"\n DSTFILE=\"${2}${SEP}\"\n DSTPATH=\"${4}\"\n\n if [ ! -e \"${DSTPATH}/${SRCFILE}.${EXT}\" ]; then\n echo \"**** ERROR: missing ${SRCFILE}.${EXT} from ${MACOS}\"\n exit 1\n fi\n\n if [ ! -d \"${DSTPATH}\" ]; then\n echo \"**** ERROR: path not found ${DSTPATH}\"\n exit 1\n fi\n\n pushd \"${DSTPATH}\" > /dev/null\n\n IS32=`file \"${SRCFILE}.${EXT}\" | grep \"i386\" | awk '{print $NF}'`\n IS64=`file \"${SRCFILE}.${EXT}\" | grep \"x86_64\" | awk '{print $NF}'`\n\n if [ \"${IS32}\" == \"i386\" ]; then\n if [ ! -L \"${DSTFILE}x86.${EXT}\" ]; then\n ln -s \"${SRCFILE}.${EXT}\" \"${DSTFILE}x86.${EXT}\"\n fi\n elif [ -L \"${DSTFILE}x86.${EXT}\" ]; then\n rm \"${DSTFILE}x86.${EXT}\"\n fi\n\n if [ \"${IS64}\" == \"x86_64\" ]; then\n if [ ! -L \"${DSTFILE}x86_64.${EXT}\" ]; then\n ln -s \"${SRCFILE}.${EXT}\" \"${DSTFILE}x86_64.${EXT}\"\n fi\n elif [ -L \"${DSTFILE}x86_64.${EXT}\" ]; then\n rm \"${DSTFILE}x86_64.${EXT}\"\n fi\n\n popd > /dev/null\n}\n\nfunction checkBuildFile()\n{\n if [ ! -e \"${BUILD}/${1}\" ]; then\n echo \"**** ERROR: file not found '${BUILD}/${1}'\"\n exit 1\n fi\n}\n\nfunction checkMacOS()\n{\n if [ ! -d \"${MACOS}\" ]; then\n echo \"**** ERROR: missing executable folder path '${EXECUTABLE_FOLDER_PATH}'\"\n exit 1\n fi\n}\n\nfunction safeCopyBuildFileToFolder\n{\n if [ ! -e \"${BUILD}/${1}\" ]; then\n echo \"**** ERROR: file not found '${1}' in build folder '${BUILD}'\"\n exit 1\n fi\n\n if [ ! -d \"${2}\" ]; then\n echo \"**** ERROR: destination folder not found '${2}'\"\n exit 1\n fi\n\n cp -pr \"${BUILD}/${1}\" \"${2}\"\n}\n\nfunction copyToMacOS()\n{\n checkBuildFile \"${1}\"\n checkMacOS\n\n safeCopyBuildFileToFolder \"${1}\" \"${MACOS}\"\n}\n\nfunction copyToBaseQ3()\n{\n checkBuildFile \"${1}\"\n checkMacOS\n\n if [ ! -d \"${MACOS}/${BASEQ3}\" ]; then\n mkdir \"${MACOS}/${BASEQ3}\"\n fi\n\n safeCopyBuildFileToFolder \"${1}\" \"${MACOS}/${BASEQ3}\"\n}\n\nfunction copyToMissionPack()\n{\n checkBuildFile \"${1}\"\n checkMacOS\n\n if [ ! -d \"${MACOS}/${MISSIONPACK}\" ]; then\n mkdir \"${MACOS}/${MISSIONPACK}\"\n fi\n\n safeCopyBuildFileToFolder \"${1}\" \"${MACOS}/${MISSIONPACK}\"\n}\n\ncopyToMacOS \"${RENDERER_OPENGL1}.dylib\"\ncopyToMacOS \"${RENDERER_OPENGL2}.dylib\"\n\nsymlinkArch \"${RENDERER_OPENGL1}\" \"${RENDERER_OPENGL1}\" \"_\" \"${MACOS}\"\nsymlinkArch \"${RENDERER_OPENGL2}\" \"${RENDERER_OPENGL2}\" \"_\" \"${MACOS}\" \n\ncopyToBaseQ3 \"${CGAME}.dylib\"\nsymlinkArch \"${CGAME}\" \"${CGAME}\" \"\" \"${MACOS}/${BASEQ3}\"\n\ncopyToBaseQ3 \"${GAME}.dylib\"\nsymlinkArch \"${GAME}\" \"${GAME}\" \"\" \"${MACOS}/${BASEQ3}\"\n\ncopyToBaseQ3 \"${Q3UI}.dylib\"\nsymlinkArch \"${Q3UI}\" \"${UI}\" \"\" \"${MACOS}/${BASEQ3}\"\n"; + shellScript = "#\n# copy the renderer & game dynamic libraries to their appropriate locations within the application bundle\n# symlink appropriate architecture names for universal (fat) binary support\n #\nBUILD=\"${BUILT_PRODUCTS_DIR}\"\nMACOS=\"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}\"\nCGAME=\"cgame\"\nGAME=\"game\"\nQAGAME=\"qagame\"\nQ3UI=\"q3_ui\"\nUI=\"ui\"\nBASEQ3=\"baseq3\"\nMISSIONPACK=\"missionpack\"\nRENDERER_OPENGL1=\"renderer_opengl1\"\nRENDERER_OPENGL2=\"renderer_opengl2\"\n\nfunction symlinkArch()\n{\n EXT=\"dylib\"\n SEP=\"${3}\"\n SRCFILE=\"${1}\"\n DSTFILE=\"${2}${SEP}\"\n DSTPATH=\"${4}\"\n\n if [ ! -e \"${DSTPATH}/${SRCFILE}.${EXT}\" ]; then\n echo \"**** ERROR: missing ${SRCFILE}.${EXT} from ${MACOS}\"\n exit 1\n fi\n\n if [ ! -d \"${DSTPATH}\" ]; then\n echo \"**** ERROR: path not found ${DSTPATH}\"\n exit 1\n fi\n\n pushd \"${DSTPATH}\" > /dev/null\n\n IS32=`file \"${SRCFILE}.${EXT}\" | grep \"i386\" | awk '{print $NF}'`\n IS64=`file \"${SRCFILE}.${EXT}\" | grep \"x86_64\" | awk '{print $NF}'`\n\n if [ \"${IS32}\" == \"i386\" ]; then\n if [ ! -L \"${DSTFILE}x86.${EXT}\" ]; then\n ln -s \"${SRCFILE}.${EXT}\" \"${DSTFILE}x86.${EXT}\"\n fi\n elif [ -L \"${DSTFILE}x86.${EXT}\" ]; then\n rm \"${DSTFILE}x86.${EXT}\"\n fi\n\n if [ \"${IS64}\" == \"x86_64\" ]; then\n if [ ! -L \"${DSTFILE}x86_64.${EXT}\" ]; then\n ln -s \"${SRCFILE}.${EXT}\" \"${DSTFILE}x86_64.${EXT}\"\n fi\n elif [ -L \"${DSTFILE}x86_64.${EXT}\" ]; then\n rm \"${DSTFILE}x86_64.${EXT}\"\n fi\n\n popd > /dev/null\n}\n\nfunction checkBuildFile()\n{\n if [ ! -e \"${BUILD}/${1}\" ]; then\n echo \"**** ERROR: file not found '${BUILD}/${1}'\"\n exit 1\n fi\n}\n\nfunction checkMacOS()\n{\n if [ ! -d \"${MACOS}\" ]; then\n echo \"**** ERROR: missing executable folder path '${EXECUTABLE_FOLDER_PATH}'\"\n exit 1\n fi\n}\n\nfunction safeCopyBuildFileToFolder\n{\n if [ ! -e \"${BUILD}/${1}\" ]; then\n echo \"**** ERROR: file not found '${1}' in build folder '${BUILD}'\"\n exit 1\n fi\n\n if [ ! -d \"${2}\" ]; then\n echo \"**** ERROR: destination folder not found '${2}'\"\n exit 1\n fi\n\n cp -pr \"${BUILD}/${1}\" \"${2}\"\n}\n\nfunction copyToMacOS()\n{\n checkBuildFile \"${1}\"\n checkMacOS\n\n safeCopyBuildFileToFolder \"${1}\" \"${MACOS}\"\n}\n\nfunction copyToBaseQ3()\n{\n checkBuildFile \"${1}\"\n checkMacOS\n\n if [ ! -d \"${MACOS}/${BASEQ3}\" ]; then\n mkdir \"${MACOS}/${BASEQ3}\"\n fi\n\n safeCopyBuildFileToFolder \"${1}\" \"${MACOS}/${BASEQ3}\"\n}\n\nfunction copyToMissionPack()\n{\n checkBuildFile \"${1}\"\n checkMacOS\n\n if [ ! -d \"${MACOS}/${MISSIONPACK}\" ]; then\n mkdir \"${MACOS}/${MISSIONPACK}\"\n fi\n\n safeCopyBuildFileToFolder \"${1}\" \"${MACOS}/${MISSIONPACK}\"\n}\n\ncopyToMacOS \"${RENDERER_OPENGL1}.dylib\"\ncopyToMacOS \"${RENDERER_OPENGL2}.dylib\"\n\nsymlinkArch \"${RENDERER_OPENGL1}\" \"${RENDERER_OPENGL1}\" \"_\" \"${MACOS}\"\nsymlinkArch \"${RENDERER_OPENGL2}\" \"${RENDERER_OPENGL2}\" \"_\" \"${MACOS}\" \n\ncopyToBaseQ3 \"${BASEQ3}/${CGAME}.dylib\"\nsymlinkArch \"${CGAME}\" \"${CGAME}\" \"\" \"${MACOS}/${BASEQ3}\"\n\ncopyToBaseQ3 \"${BASEQ3}/${QAGAME}.dylib\"\nsymlinkArch \"${QAGAME}\" \"${QAGAME}\" \"\" \"${MACOS}/${BASEQ3}\"\n\ncopyToBaseQ3 \"${BASEQ3}/${UI}.dylib\"\nsymlinkArch \"${UI}\" \"${UI}\" \"\" \"${MACOS}/${BASEQ3}\"\n\ncopyToMissionPack \"${MISSIONPACK}/${CGAME}.dylib\"\nsymlinkArch \"${CGAME}\" \"${CGAME}\" \"\" \"${MACOS}/${MISSIONPACK}\"\n\ncopyToMissionPack \"${MISSIONPACK}/${QAGAME}.dylib\"\nsymlinkArch \"${QAGAME}\" \"${QAGAME}\" \"\" \"${MACOS}/${MISSIONPACK}\"\n\ncopyToMissionPack \"${MISSIONPACK}/${UI}.dylib\"\nsymlinkArch \"${UI}\" \"${UI}\" \"\" \"${MACOS}/${MISSIONPACK}\"\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -980,14 +928,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 2772B80D1790ECAB004CCF57 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 273531EA14D1275D00EB7BD6 /* ioquake3 */; - targetProxy = 2772B80C1790ECAB004CCF57 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 2735320714D1275D00EB7BD6 /* Debug */ = { isa = XCBuildConfiguration; @@ -1006,6 +946,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1050,7 +991,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -1073,6 +1014,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1103,7 +1045,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; }; name = Release; @@ -1111,6 +1053,7 @@ 2735320A14D1275D00EB7BD6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; @@ -1128,7 +1071,7 @@ "\"$(BUILT_PRODUCTS_DIR)\"", "\"$(SRCROOT)/../../code/libs/macosx\"", ); - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.ioquake3.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = ioquake3; WRAPPER_EXTENSION = app; @@ -1138,6 +1081,7 @@ 2735320B14D1275D00EB7BD6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; @@ -1155,45 +1099,13 @@ "\"$(BUILT_PRODUCTS_DIR)\"", "\"$(SRCROOT)/../../code/libs/macosx\"", ); - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.ioquake3.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = ioquake3; WRAPPER_EXTENSION = app; }; name = Release; }; - 2772B8041790EBE0004CCF57 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 2772B8051790EBE0004CCF57 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 2772B80A1790EC7F004CCF57 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 2772B80B1790EC7F004CCF57 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1215,24 +1127,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2772B8031790EBE0004CCF57 /* Build configuration list for PBXAggregateTarget "all ioquake3" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2772B8041790EBE0004CCF57 /* Debug */, - 2772B8051790EBE0004CCF57 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 2772B8091790EC7F004CCF57 /* Build configuration list for PBXAggregateTarget "all game" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2772B80A1790EC7F004CCF57 /* Debug */, - 2772B80B1790EC7F004CCF57 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 273531E214D1275D00EB7BD6 /* Project object */; diff --git a/misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata b/misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata index 1613b4ce..1f087000 100644 --- a/misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata +++ b/misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata @@ -1,34 +1,43 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/misc/xcode/ioquake3.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/misc/xcode/ioquake3.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index 0c67376e..f9b0d7c5 100644 --- a/misc/xcode/ioquake3.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ b/misc/xcode/ioquake3.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -1,5 +1,8 @@ - + + PreviewsEnabled + + diff --git a/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all game.xcscheme b/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all game.xcscheme index 26d71dfd..cdbb4306 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 @@ + + + + @@ -29,8 +43,8 @@ @@ -42,10 +56,10 @@ buildForAnalyzing = "YES"> + BlueprintIdentifier = "A137C98D258DCD55009AC639" + BuildableName = "qagame.dylib" + BlueprintName = "game - missionpack" + ReferencedContainer = "container:game.xcodeproj"> + + + + @@ -87,7 +115,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "2735319414D125FD00EB7BD6" BuildableName = "cgame.dylib" - BlueprintName = "cgame" + BlueprintName = "cgame - baseq3" ReferencedContainer = "container:cgame.xcodeproj"> @@ -98,6 +126,15 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES"> + + + + diff --git a/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all ioquake3.xcscheme b/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all ioquake3.xcscheme index 18282e12..a721bf13 100644 --- a/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all ioquake3.xcscheme +++ b/misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all ioquake3.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -29,8 +43,8 @@ @@ -42,10 +56,24 @@ buildForAnalyzing = "YES"> + BlueprintIdentifier = "A137C98D258DCD55009AC639" + BuildableName = "qagame.dylib" + BlueprintName = "game - missionpack" + ReferencedContainer = "container:game.xcodeproj"> + + + + @@ -126,10 +154,10 @@ buildForAnalyzing = "YES"> + BlueprintIdentifier = "A1665093218BF75B0086B74B" + BuildableName = "libopus.dylib" + BlueprintName = "opus" + ReferencedContainer = "container:opus.xcodeproj"> @@ -182,6 +210,15 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES"> + + + + diff --git a/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/Contents.json b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..64dc11ee --- /dev/null +++ b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "filename" : "icon_16x16.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" + }, + { + "filename" : "icon_16x16@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" + }, + { + "filename" : "icon_32x32.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" + }, + { + "filename" : "icon_32x32@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" + }, + { + "filename" : "icon_128x128.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" + }, + { + "filename" : "icon_128x128@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "filename" : "icon_256x256.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "filename" : "icon_256x256@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "filename" : "icon_512x512.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "filename" : "icon_512x512@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_128x128.png b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_128x128.png new file mode 100644 index 00000000..489e90c0 Binary files /dev/null and b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_128x128.png differ diff --git a/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png new file mode 100644 index 00000000..0b08d4f6 Binary files /dev/null and b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png differ diff --git a/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_16x16.png b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_16x16.png new file mode 100644 index 00000000..b973931f Binary files /dev/null and b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_16x16.png differ diff --git a/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png new file mode 100644 index 00000000..a9db9514 Binary files /dev/null and b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png differ diff --git a/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_256x256.png b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_256x256.png new file mode 100644 index 00000000..0b08d4f6 Binary files /dev/null and b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_256x256.png differ diff --git a/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png new file mode 100644 index 00000000..e5097e32 Binary files /dev/null and b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png differ diff --git a/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_32x32.png b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_32x32.png new file mode 100644 index 00000000..a9db9514 Binary files /dev/null and b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_32x32.png differ diff --git a/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png new file mode 100644 index 00000000..cfc44d9b Binary files /dev/null and b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png differ diff --git a/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_512x512.png b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_512x512.png new file mode 100644 index 00000000..e5097e32 Binary files /dev/null and b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_512x512.png differ diff --git a/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png new file mode 100644 index 00000000..545fc088 Binary files /dev/null and b/misc/xcode/ioquake3/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png differ diff --git a/misc/xcode/jpeg8.xcodeproj/project.pbxproj b/misc/xcode/jpeg8.xcodeproj/project.pbxproj index 9f7f99c8..246753ce 100644 --- a/misc/xcode/jpeg8.xcodeproj/project.pbxproj +++ b/misc/xcode/jpeg8.xcodeproj/project.pbxproj @@ -238,7 +238,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = io; - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1220; ORGANIZATIONNAME = ioquake; }; buildConfigurationList = 2737EBDC14D13F2300675E9F /* Build configuration list for PBXProject "jpeg8" */; @@ -333,6 +333,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -360,7 +361,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = $SRCROOT/../macosx; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -383,6 +384,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -403,7 +405,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = $SRCROOT/../macosx; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; }; name = Release; diff --git a/misc/xcode/opus.xcodeproj/project.pbxproj b/misc/xcode/opus.xcodeproj/project.pbxproj index 9ce1aae5..b807606a 100644 --- a/misc/xcode/opus.xcodeproj/project.pbxproj +++ b/misc/xcode/opus.xcodeproj/project.pbxproj @@ -1134,7 +1134,7 @@ A166508C218BF75B0086B74B /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1220; ORGANIZATIONNAME = "Tom Kidd"; TargetAttributes = { A1665093218BF75B0086B74B = { @@ -1369,6 +1369,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1395,7 +1396,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -1429,6 +1430,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1449,7 +1451,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = macosx; diff --git a/misc/xcode/q3_ui.xcodeproj/project.pbxproj b/misc/xcode/q3_ui.xcodeproj/project.pbxproj deleted file mode 100644 index f0bb8125..00000000 --- a/misc/xcode/q3_ui.xcodeproj/project.pbxproj +++ /dev/null @@ -1,493 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 2711BDBC14D13007005EB142 /* ui_syscalls.c in Sources */ = {isa = PBXBuildFile; fileRef = 2711BDBB14D13007005EB142 /* ui_syscalls.c */; }; - 2772B7BB1790E7C6004CCF57 /* ui_addbots.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B78D1790E7C6004CCF57 /* ui_addbots.c */; }; - 2772B7BC1790E7C6004CCF57 /* ui_atoms.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B78E1790E7C6004CCF57 /* ui_atoms.c */; }; - 2772B7BD1790E7C6004CCF57 /* ui_cdkey.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B78F1790E7C6004CCF57 /* ui_cdkey.c */; }; - 2772B7BE1790E7C6004CCF57 /* ui_cinematics.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7901790E7C6004CCF57 /* ui_cinematics.c */; }; - 2772B7BF1790E7C6004CCF57 /* ui_confirm.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7911790E7C6004CCF57 /* ui_confirm.c */; }; - 2772B7C01790E7C6004CCF57 /* ui_connect.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7921790E7C6004CCF57 /* ui_connect.c */; }; - 2772B7C11790E7C6004CCF57 /* ui_controls2.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7931790E7C6004CCF57 /* ui_controls2.c */; }; - 2772B7C21790E7C6004CCF57 /* ui_credits.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7941790E7C6004CCF57 /* ui_credits.c */; }; - 2772B7C31790E7C6004CCF57 /* ui_demo2.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7951790E7C6004CCF57 /* ui_demo2.c */; }; - 2772B7C41790E7C6004CCF57 /* ui_display.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7961790E7C6004CCF57 /* ui_display.c */; }; - 2772B7C51790E7C6004CCF57 /* ui_gameinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7971790E7C6004CCF57 /* ui_gameinfo.c */; }; - 2772B7C61790E7C6004CCF57 /* ui_ingame.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7981790E7C6004CCF57 /* ui_ingame.c */; }; - 2772B7C71790E7C6004CCF57 /* ui_loadconfig.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7991790E7C6004CCF57 /* ui_loadconfig.c */; }; - 2772B7CA1790E7C6004CCF57 /* ui_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B79C1790E7C6004CCF57 /* ui_main.c */; }; - 2772B7CB1790E7C6004CCF57 /* ui_menu.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B79D1790E7C6004CCF57 /* ui_menu.c */; }; - 2772B7CC1790E7C6004CCF57 /* ui_mfield.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B79E1790E7C6004CCF57 /* ui_mfield.c */; }; - 2772B7CD1790E7C6004CCF57 /* ui_mods.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B79F1790E7C6004CCF57 /* ui_mods.c */; }; - 2772B7CE1790E7C6004CCF57 /* ui_network.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A01790E7C6004CCF57 /* ui_network.c */; }; - 2772B7CF1790E7C6004CCF57 /* ui_options.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A11790E7C6004CCF57 /* ui_options.c */; }; - 2772B7D01790E7C6004CCF57 /* ui_playermodel.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A21790E7C6004CCF57 /* ui_playermodel.c */; }; - 2772B7D11790E7C6004CCF57 /* ui_players.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A31790E7C6004CCF57 /* ui_players.c */; }; - 2772B7D21790E7C6004CCF57 /* ui_playersettings.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A41790E7C6004CCF57 /* ui_playersettings.c */; }; - 2772B7D31790E7C6004CCF57 /* ui_preferences.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A51790E7C6004CCF57 /* ui_preferences.c */; }; - 2772B7D41790E7C6004CCF57 /* ui_qmenu.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A61790E7C6004CCF57 /* ui_qmenu.c */; }; - 2772B7D71790E7C6004CCF57 /* ui_removebots.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7A91790E7C6004CCF57 /* ui_removebots.c */; }; - 2772B7D81790E7C6004CCF57 /* ui_saveconfig.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7AA1790E7C6004CCF57 /* ui_saveconfig.c */; }; - 2772B7D91790E7C6004CCF57 /* ui_serverinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7AB1790E7C6004CCF57 /* ui_serverinfo.c */; }; - 2772B7DA1790E7C6004CCF57 /* ui_servers2.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7AC1790E7C6004CCF57 /* ui_servers2.c */; }; - 2772B7DB1790E7C6004CCF57 /* ui_setup.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7AD1790E7C6004CCF57 /* ui_setup.c */; }; - 2772B7DD1790E7C6004CCF57 /* ui_sound.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7AF1790E7C6004CCF57 /* ui_sound.c */; }; - 2772B7DE1790E7C6004CCF57 /* ui_sparena.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B01790E7C6004CCF57 /* ui_sparena.c */; }; - 2772B7E01790E7C6004CCF57 /* ui_specifyserver.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B21790E7C6004CCF57 /* ui_specifyserver.c */; }; - 2772B7E11790E7C6004CCF57 /* ui_splevel.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B31790E7C6004CCF57 /* ui_splevel.c */; }; - 2772B7E21790E7C6004CCF57 /* ui_sppostgame.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B41790E7C6004CCF57 /* ui_sppostgame.c */; }; - 2772B7E31790E7C6004CCF57 /* ui_spreset.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B51790E7C6004CCF57 /* ui_spreset.c */; }; - 2772B7E41790E7C6004CCF57 /* ui_spskill.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B61790E7C6004CCF57 /* ui_spskill.c */; }; - 2772B7E51790E7C6004CCF57 /* ui_startserver.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B71790E7C6004CCF57 /* ui_startserver.c */; }; - 2772B7E61790E7C6004CCF57 /* ui_team.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B81790E7C6004CCF57 /* ui_team.c */; }; - 2772B7E71790E7C6004CCF57 /* ui_teamorders.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7B91790E7C6004CCF57 /* ui_teamorders.c */; }; - 2772B7E81790E7C6004CCF57 /* ui_video.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7BA1790E7C6004CCF57 /* ui_video.c */; }; - 2772B7EC1790E800004CCF57 /* bg_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7E91790E800004CCF57 /* bg_lib.c */; }; - 2772B7EE1790E800004CCF57 /* bg_misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7EB1790E800004CCF57 /* bg_misc.c */; }; - 2772B7F31790E835004CCF57 /* q_math.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7F01790E835004CCF57 /* q_math.c */; }; - 2772B7F41790E835004CCF57 /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B7F11790E835004CCF57 /* q_shared.c */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 2711BDBB14D13007005EB142 /* ui_syscalls.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_syscalls.c; sourceTree = ""; }; - 273531C714D1270700EB7BD6 /* q3_ui.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = q3_ui.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; - 2772B78D1790E7C6004CCF57 /* ui_addbots.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_addbots.c; sourceTree = ""; }; - 2772B78E1790E7C6004CCF57 /* ui_atoms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_atoms.c; sourceTree = ""; }; - 2772B78F1790E7C6004CCF57 /* ui_cdkey.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_cdkey.c; sourceTree = ""; }; - 2772B7901790E7C6004CCF57 /* ui_cinematics.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_cinematics.c; sourceTree = ""; }; - 2772B7911790E7C6004CCF57 /* ui_confirm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_confirm.c; sourceTree = ""; }; - 2772B7921790E7C6004CCF57 /* ui_connect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_connect.c; sourceTree = ""; }; - 2772B7931790E7C6004CCF57 /* ui_controls2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_controls2.c; sourceTree = ""; }; - 2772B7941790E7C6004CCF57 /* ui_credits.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_credits.c; sourceTree = ""; }; - 2772B7951790E7C6004CCF57 /* ui_demo2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_demo2.c; sourceTree = ""; }; - 2772B7961790E7C6004CCF57 /* ui_display.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_display.c; sourceTree = ""; }; - 2772B7971790E7C6004CCF57 /* ui_gameinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_gameinfo.c; sourceTree = ""; }; - 2772B7981790E7C6004CCF57 /* ui_ingame.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_ingame.c; sourceTree = ""; }; - 2772B7991790E7C6004CCF57 /* ui_loadconfig.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_loadconfig.c; sourceTree = ""; }; - 2772B79A1790E7C6004CCF57 /* ui_local.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_local.h; sourceTree = ""; }; - 2772B79B1790E7C6004CCF57 /* ui_login.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_login.c; sourceTree = ""; }; - 2772B79C1790E7C6004CCF57 /* ui_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_main.c; sourceTree = ""; }; - 2772B79D1790E7C6004CCF57 /* ui_menu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_menu.c; sourceTree = ""; }; - 2772B79E1790E7C6004CCF57 /* ui_mfield.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_mfield.c; sourceTree = ""; }; - 2772B79F1790E7C6004CCF57 /* ui_mods.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_mods.c; sourceTree = ""; }; - 2772B7A01790E7C6004CCF57 /* ui_network.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_network.c; sourceTree = ""; }; - 2772B7A11790E7C6004CCF57 /* ui_options.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_options.c; sourceTree = ""; }; - 2772B7A21790E7C6004CCF57 /* ui_playermodel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_playermodel.c; sourceTree = ""; }; - 2772B7A31790E7C6004CCF57 /* ui_players.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_players.c; sourceTree = ""; }; - 2772B7A41790E7C6004CCF57 /* ui_playersettings.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_playersettings.c; sourceTree = ""; }; - 2772B7A51790E7C6004CCF57 /* ui_preferences.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_preferences.c; sourceTree = ""; }; - 2772B7A61790E7C6004CCF57 /* ui_qmenu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_qmenu.c; sourceTree = ""; }; - 2772B7A71790E7C6004CCF57 /* ui_rankings.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_rankings.c; sourceTree = ""; }; - 2772B7A81790E7C6004CCF57 /* ui_rankstatus.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_rankstatus.c; sourceTree = ""; }; - 2772B7A91790E7C6004CCF57 /* ui_removebots.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_removebots.c; sourceTree = ""; }; - 2772B7AA1790E7C6004CCF57 /* ui_saveconfig.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_saveconfig.c; sourceTree = ""; }; - 2772B7AB1790E7C6004CCF57 /* ui_serverinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_serverinfo.c; sourceTree = ""; }; - 2772B7AC1790E7C6004CCF57 /* ui_servers2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_servers2.c; sourceTree = ""; }; - 2772B7AD1790E7C6004CCF57 /* ui_setup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_setup.c; sourceTree = ""; }; - 2772B7AE1790E7C6004CCF57 /* ui_signup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_signup.c; sourceTree = ""; }; - 2772B7AF1790E7C6004CCF57 /* ui_sound.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_sound.c; sourceTree = ""; }; - 2772B7B01790E7C6004CCF57 /* ui_sparena.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_sparena.c; sourceTree = ""; }; - 2772B7B11790E7C6004CCF57 /* ui_specifyleague.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_specifyleague.c; sourceTree = ""; }; - 2772B7B21790E7C6004CCF57 /* ui_specifyserver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_specifyserver.c; sourceTree = ""; }; - 2772B7B31790E7C6004CCF57 /* ui_splevel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_splevel.c; sourceTree = ""; }; - 2772B7B41790E7C6004CCF57 /* ui_sppostgame.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_sppostgame.c; sourceTree = ""; }; - 2772B7B51790E7C6004CCF57 /* ui_spreset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_spreset.c; sourceTree = ""; }; - 2772B7B61790E7C6004CCF57 /* ui_spskill.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_spskill.c; sourceTree = ""; }; - 2772B7B71790E7C6004CCF57 /* ui_startserver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_startserver.c; sourceTree = ""; }; - 2772B7B81790E7C6004CCF57 /* ui_team.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_team.c; sourceTree = ""; }; - 2772B7B91790E7C6004CCF57 /* ui_teamorders.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_teamorders.c; sourceTree = ""; }; - 2772B7BA1790E7C6004CCF57 /* ui_video.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_video.c; sourceTree = ""; }; - 2772B7E91790E800004CCF57 /* bg_lib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bg_lib.c; sourceTree = ""; }; - 2772B7EA1790E800004CCF57 /* bg_lib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bg_lib.h; sourceTree = ""; }; - 2772B7EB1790E800004CCF57 /* bg_misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bg_misc.c; sourceTree = ""; }; - 2772B7F01790E835004CCF57 /* q_math.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_math.c; sourceTree = ""; }; - 2772B7F11790E835004CCF57 /* q_shared.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = q_shared.c; sourceTree = ""; }; - 2772B7F21790E835004CCF57 /* q_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = q_shared.h; sourceTree = ""; }; - 2772B7F71790E865004CCF57 /* keycodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keycodes.h; sourceTree = ""; }; - 2772B7F91790E904004CCF57 /* bg_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bg_public.h; sourceTree = ""; }; - 2772B7FC1790E9B6004CCF57 /* tr_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_types.h; sourceTree = ""; }; - 2772B7FE1790E9C5004CCF57 /* ui_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_public.h; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 273531C414D1270700EB7BD6 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 2711BDB614D12FCF005EB142 /* code */ = { - isa = PBXGroup; - children = ( - 2772B7F61790E851004CCF57 /* client */, - 2711BDB914D12FE9005EB142 /* game */, - 2711BDB814D12FE3005EB142 /* q3_ui */, - 2772B7EF1790E819004CCF57 /* qcommon */, - 2772B7FB1790E994004CCF57 /* renderercommon */, - 2711BDB714D12FDD005EB142 /* ui */, - ); - name = code; - path = ../../code; - sourceTree = SOURCE_ROOT; - }; - 2711BDB714D12FDD005EB142 /* ui */ = { - isa = PBXGroup; - children = ( - 2772B7FE1790E9C5004CCF57 /* ui_public.h */, - 2711BDBB14D13007005EB142 /* ui_syscalls.c */, - ); - path = ui; - sourceTree = ""; - }; - 2711BDB814D12FE3005EB142 /* q3_ui */ = { - isa = PBXGroup; - children = ( - 2772B78D1790E7C6004CCF57 /* ui_addbots.c */, - 2772B78E1790E7C6004CCF57 /* ui_atoms.c */, - 2772B78F1790E7C6004CCF57 /* ui_cdkey.c */, - 2772B7901790E7C6004CCF57 /* ui_cinematics.c */, - 2772B7911790E7C6004CCF57 /* ui_confirm.c */, - 2772B7921790E7C6004CCF57 /* ui_connect.c */, - 2772B7931790E7C6004CCF57 /* ui_controls2.c */, - 2772B7941790E7C6004CCF57 /* ui_credits.c */, - 2772B7951790E7C6004CCF57 /* ui_demo2.c */, - 2772B7961790E7C6004CCF57 /* ui_display.c */, - 2772B7971790E7C6004CCF57 /* ui_gameinfo.c */, - 2772B7981790E7C6004CCF57 /* ui_ingame.c */, - 2772B7991790E7C6004CCF57 /* ui_loadconfig.c */, - 2772B79A1790E7C6004CCF57 /* ui_local.h */, - 2772B79B1790E7C6004CCF57 /* ui_login.c */, - 2772B79C1790E7C6004CCF57 /* ui_main.c */, - 2772B79D1790E7C6004CCF57 /* ui_menu.c */, - 2772B79E1790E7C6004CCF57 /* ui_mfield.c */, - 2772B79F1790E7C6004CCF57 /* ui_mods.c */, - 2772B7A01790E7C6004CCF57 /* ui_network.c */, - 2772B7A11790E7C6004CCF57 /* ui_options.c */, - 2772B7A21790E7C6004CCF57 /* ui_playermodel.c */, - 2772B7A31790E7C6004CCF57 /* ui_players.c */, - 2772B7A41790E7C6004CCF57 /* ui_playersettings.c */, - 2772B7A51790E7C6004CCF57 /* ui_preferences.c */, - 2772B7A61790E7C6004CCF57 /* ui_qmenu.c */, - 2772B7A71790E7C6004CCF57 /* ui_rankings.c */, - 2772B7A81790E7C6004CCF57 /* ui_rankstatus.c */, - 2772B7A91790E7C6004CCF57 /* ui_removebots.c */, - 2772B7AA1790E7C6004CCF57 /* ui_saveconfig.c */, - 2772B7AB1790E7C6004CCF57 /* ui_serverinfo.c */, - 2772B7AC1790E7C6004CCF57 /* ui_servers2.c */, - 2772B7AD1790E7C6004CCF57 /* ui_setup.c */, - 2772B7AE1790E7C6004CCF57 /* ui_signup.c */, - 2772B7AF1790E7C6004CCF57 /* ui_sound.c */, - 2772B7B01790E7C6004CCF57 /* ui_sparena.c */, - 2772B7B11790E7C6004CCF57 /* ui_specifyleague.c */, - 2772B7B21790E7C6004CCF57 /* ui_specifyserver.c */, - 2772B7B31790E7C6004CCF57 /* ui_splevel.c */, - 2772B7B41790E7C6004CCF57 /* ui_sppostgame.c */, - 2772B7B51790E7C6004CCF57 /* ui_spreset.c */, - 2772B7B61790E7C6004CCF57 /* ui_spskill.c */, - 2772B7B71790E7C6004CCF57 /* ui_startserver.c */, - 2772B7B81790E7C6004CCF57 /* ui_team.c */, - 2772B7B91790E7C6004CCF57 /* ui_teamorders.c */, - 2772B7BA1790E7C6004CCF57 /* ui_video.c */, - ); - path = q3_ui; - sourceTree = ""; - }; - 2711BDB914D12FE9005EB142 /* game */ = { - isa = PBXGroup; - children = ( - 2772B7E91790E800004CCF57 /* bg_lib.c */, - 2772B7EA1790E800004CCF57 /* bg_lib.h */, - 2772B7EB1790E800004CCF57 /* bg_misc.c */, - 2772B7F91790E904004CCF57 /* bg_public.h */, - ); - path = game; - sourceTree = ""; - }; - 273531BC14D1270700EB7BD6 = { - isa = PBXGroup; - children = ( - 2711BDB614D12FCF005EB142 /* code */, - 273531C814D1270700EB7BD6 /* Products */, - ); - sourceTree = ""; - }; - 273531C814D1270700EB7BD6 /* Products */ = { - isa = PBXGroup; - children = ( - 273531C714D1270700EB7BD6 /* q3_ui.dylib */, - ); - name = Products; - sourceTree = ""; - }; - 2772B7EF1790E819004CCF57 /* qcommon */ = { - isa = PBXGroup; - children = ( - 2772B7F01790E835004CCF57 /* q_math.c */, - 2772B7F11790E835004CCF57 /* q_shared.c */, - 2772B7F21790E835004CCF57 /* q_shared.h */, - ); - path = qcommon; - sourceTree = ""; - }; - 2772B7F61790E851004CCF57 /* client */ = { - isa = PBXGroup; - children = ( - 2772B7F71790E865004CCF57 /* keycodes.h */, - ); - path = client; - sourceTree = ""; - }; - 2772B7FB1790E994004CCF57 /* renderercommon */ = { - isa = PBXGroup; - children = ( - 2772B7FC1790E9B6004CCF57 /* tr_types.h */, - ); - path = renderercommon; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 273531C614D1270700EB7BD6 /* q3_ui */ = { - isa = PBXNativeTarget; - buildConfigurationList = 273531CB14D1270700EB7BD6 /* Build configuration list for PBXNativeTarget "q3_ui" */; - buildPhases = ( - 273531C314D1270700EB7BD6 /* Sources */, - 273531C414D1270700EB7BD6 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = q3_ui; - productName = q3_ui; - productReference = 273531C714D1270700EB7BD6 /* q3_ui.dylib */; - productType = "com.apple.product-type.library.dynamic"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 273531BE14D1270700EB7BD6 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1110; - }; - buildConfigurationList = 273531C114D1270700EB7BD6 /* Build configuration list for PBXProject "q3_ui" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 273531BC14D1270700EB7BD6; - productRefGroup = 273531C814D1270700EB7BD6 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 273531C614D1270700EB7BD6 /* q3_ui */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - 273531C314D1270700EB7BD6 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 2711BDBC14D13007005EB142 /* ui_syscalls.c in Sources */, - 2772B7BB1790E7C6004CCF57 /* ui_addbots.c in Sources */, - 2772B7BC1790E7C6004CCF57 /* ui_atoms.c in Sources */, - 2772B7BD1790E7C6004CCF57 /* ui_cdkey.c in Sources */, - 2772B7BE1790E7C6004CCF57 /* ui_cinematics.c in Sources */, - 2772B7BF1790E7C6004CCF57 /* ui_confirm.c in Sources */, - 2772B7C01790E7C6004CCF57 /* ui_connect.c in Sources */, - 2772B7C11790E7C6004CCF57 /* ui_controls2.c in Sources */, - 2772B7C21790E7C6004CCF57 /* ui_credits.c in Sources */, - 2772B7C31790E7C6004CCF57 /* ui_demo2.c in Sources */, - 2772B7C41790E7C6004CCF57 /* ui_display.c in Sources */, - 2772B7C51790E7C6004CCF57 /* ui_gameinfo.c in Sources */, - 2772B7C61790E7C6004CCF57 /* ui_ingame.c in Sources */, - 2772B7C71790E7C6004CCF57 /* ui_loadconfig.c in Sources */, - 2772B7CA1790E7C6004CCF57 /* ui_main.c in Sources */, - 2772B7CB1790E7C6004CCF57 /* ui_menu.c in Sources */, - 2772B7CC1790E7C6004CCF57 /* ui_mfield.c in Sources */, - 2772B7CD1790E7C6004CCF57 /* ui_mods.c in Sources */, - 2772B7CE1790E7C6004CCF57 /* ui_network.c in Sources */, - 2772B7CF1790E7C6004CCF57 /* ui_options.c in Sources */, - 2772B7D01790E7C6004CCF57 /* ui_playermodel.c in Sources */, - 2772B7D11790E7C6004CCF57 /* ui_players.c in Sources */, - 2772B7D21790E7C6004CCF57 /* ui_playersettings.c in Sources */, - 2772B7D31790E7C6004CCF57 /* ui_preferences.c in Sources */, - 2772B7D41790E7C6004CCF57 /* ui_qmenu.c in Sources */, - 2772B7D71790E7C6004CCF57 /* ui_removebots.c in Sources */, - 2772B7D81790E7C6004CCF57 /* ui_saveconfig.c in Sources */, - 2772B7D91790E7C6004CCF57 /* ui_serverinfo.c in Sources */, - 2772B7DA1790E7C6004CCF57 /* ui_servers2.c in Sources */, - 2772B7DB1790E7C6004CCF57 /* ui_setup.c in Sources */, - 2772B7DD1790E7C6004CCF57 /* ui_sound.c in Sources */, - 2772B7DE1790E7C6004CCF57 /* ui_sparena.c in Sources */, - 2772B7E01790E7C6004CCF57 /* ui_specifyserver.c in Sources */, - 2772B7E11790E7C6004CCF57 /* ui_splevel.c in Sources */, - 2772B7E21790E7C6004CCF57 /* ui_sppostgame.c in Sources */, - 2772B7E31790E7C6004CCF57 /* ui_spreset.c in Sources */, - 2772B7E41790E7C6004CCF57 /* ui_spskill.c in Sources */, - 2772B7E51790E7C6004CCF57 /* ui_startserver.c in Sources */, - 2772B7E61790E7C6004CCF57 /* ui_team.c in Sources */, - 2772B7E71790E7C6004CCF57 /* ui_teamorders.c in Sources */, - 2772B7E81790E7C6004CCF57 /* ui_video.c in Sources */, - 2772B7EC1790E800004CCF57 /* bg_lib.c in Sources */, - 2772B7EE1790E800004CCF57 /* bg_misc.c in Sources */, - 2772B7F31790E835004CCF57 /* q_math.c in Sources */, - 2772B7F41790E835004CCF57 /* q_shared.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 273531C914D1270700EB7BD6 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - 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", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; - 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.6; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - 273531CA14D1270700EB7BD6 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - 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 = 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.6; - SDKROOT = macosx; - }; - name = Release; - }; - 273531CC14D1270700EB7BD6 /* 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; - }; - 273531CD14D1270700EB7BD6 /* 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; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 273531C114D1270700EB7BD6 /* Build configuration list for PBXProject "q3_ui" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 273531C914D1270700EB7BD6 /* Debug */, - 273531CA14D1270700EB7BD6 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 273531CB14D1270700EB7BD6 /* Build configuration list for PBXNativeTarget "q3_ui" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 273531CC14D1270700EB7BD6 /* Debug */, - 273531CD14D1270700EB7BD6 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 273531BE14D1270700EB7BD6 /* Project object */; -} diff --git a/misc/xcode/renderer_opengl1.xcodeproj/project.pbxproj b/misc/xcode/renderer_opengl1.xcodeproj/project.pbxproj index e7921a87..463f0851 100644 --- a/misc/xcode/renderer_opengl1.xcodeproj/project.pbxproj +++ b/misc/xcode/renderer_opengl1.xcodeproj/project.pbxproj @@ -44,7 +44,7 @@ 274FAC83178FB1C800B17C7A /* tr_image_tga.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC77178FB1C800B17C7A /* tr_image_tga.c */; }; 274FAC84178FB1C800B17C7A /* tr_noise.c in Sources */ = {isa = PBXBuildFile; fileRef = 274FAC78178FB1C800B17C7A /* tr_noise.c */; }; 274FAC88178FB1D600B17C7A /* libjpeg8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 274FAC87178FB1D600B17C7A /* libjpeg8.a */; }; - A163B25E2193D5F800C48278 /* libSDL2-2.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A163B25D2193D5F800C48278 /* libSDL2-2.0.0.dylib */; }; + A115085B25B9CD34000CF482 /* libSDL2-2.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A163B25D2193D5F800C48278 /* libSDL2-2.0.0.dylib */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -96,6 +96,8 @@ 274FAC79178FB1C800B17C7A /* tr_public.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_public.h; sourceTree = ""; }; 274FAC7A178FB1C800B17C7A /* tr_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_types.h; sourceTree = ""; }; 274FAC87178FB1D600B17C7A /* libjpeg8.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libjpeg8.a; sourceTree = BUILT_PRODUCTS_DIR; }; + A11507F825B52132000CF482 /* libSDL2-2.0.14.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2-2.0.14.dylib"; path = "../../code/libs/macosx/libSDL2-2.0.14.dylib"; sourceTree = ""; }; + A115082725B533E3000CF482 /* libSDL2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libSDL2.dylib; path = ../../code/libs/macosx/libSDL2.dylib; sourceTree = ""; }; A163B25D2193D5F800C48278 /* 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 = ""; }; /* End PBXFileReference section */ @@ -104,7 +106,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A163B25E2193D5F800C48278 /* libSDL2-2.0.0.dylib in Frameworks */, + A115085B25B9CD34000CF482 /* libSDL2-2.0.0.dylib in Frameworks */, 274FAC88178FB1D600B17C7A /* libjpeg8.a in Frameworks */, 274FAC6B178FB17E00B17C7A /* OpenGL.framework in Frameworks */, ); @@ -199,6 +201,8 @@ 274FAC68178FB15500B17C7A /* Frameworks */ = { isa = PBXGroup; children = ( + A115082725B533E3000CF482 /* libSDL2.dylib */, + A11507F825B52132000CF482 /* libSDL2-2.0.14.dylib */, A163B25D2193D5F800C48278 /* libSDL2-2.0.0.dylib */, 274FAC6A178FB17E00B17C7A /* OpenGL.framework */, ); @@ -259,7 +263,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = io; - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1230; ORGANIZATIONNAME = ioquake; }; buildConfigurationList = 274FAC08178FAEFC00B17C7A /* Build configuration list for PBXProject "renderer_opengl1" */; @@ -345,6 +349,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -372,9 +377,10 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGL; }; name = Debug; }; @@ -397,6 +403,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -417,8 +424,9 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; + VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGL; }; name = Release; }; @@ -426,12 +434,19 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "USE_LOCAL_HEADERS=1", + "DEBUG=1", + "$(inherited)", + "GL_SILENCE_DEPRECATION=1", + ); HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../code/jpeg-8c\"", "\"$(SRCROOT)/../../code/SDL2/include\"", ); LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../code/libs/macosx\""; PRODUCT_NAME = "$(TARGET_NAME)"; + VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGL; }; name = Debug; }; @@ -439,12 +454,17 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "USE_LOCAL_HEADERS=1", + "GL_SILENCE_DEPRECATION=1", + ); HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../code/jpeg-8c\"", "\"$(SRCROOT)/../../code/SDL2/include\"", ); LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../code/libs/macosx\""; PRODUCT_NAME = "$(TARGET_NAME)"; + VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGL; }; name = Release; }; diff --git a/misc/xcode/renderer_opengl2.xcodeproj/project.pbxproj b/misc/xcode/renderer_opengl2.xcodeproj/project.pbxproj index 2305791f..cacc7cff 100644 --- a/misc/xcode/renderer_opengl2.xcodeproj/project.pbxproj +++ b/misc/xcode/renderer_opengl2.xcodeproj/project.pbxproj @@ -50,7 +50,7 @@ 2758B9C6178FBBAC007F6582 /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2758B9C0178FBBAC007F6582 /* q_shared.c */; }; 2758B9CC178FBC8B007F6582 /* libjpeg8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2758B9CB178FBC8B007F6582 /* libjpeg8.a */; }; 2758B9CE178FBCBC007F6582 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2758B9CD178FBCBC007F6582 /* OpenGL.framework */; }; - A163B2622193D8FC00C48278 /* libSDL2-2.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A163B2612193D8FC00C48278 /* libSDL2-2.0.0.dylib */; }; + A115085E25B9CD6F000CF482 /* libSDL2-2.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A163B2612193D8FC00C48278 /* libSDL2-2.0.0.dylib */; }; A163B2662193DF8300C48278 /* tr_image_dds.c in Sources */ = {isa = PBXBuildFile; fileRef = A163B2642193DF8200C48278 /* tr_image_dds.c */; }; A163B2672193DF8300C48278 /* tr_dsa.c in Sources */ = {isa = PBXBuildFile; fileRef = A163B2652193DF8300C48278 /* tr_dsa.c */; }; A1F1105D23F21AF10030D586 /* shadowfill_fp.c in Sources */ = {isa = PBXBuildFile; fileRef = A1F1104123F21AF00030D586 /* shadowfill_fp.c */; }; @@ -171,6 +171,8 @@ 2758BA27178FCFC0007F6582 /* texturecolor_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = texturecolor_vp.glsl; sourceTree = ""; }; 2758BA29178FCFC0007F6582 /* tonemap_fp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tonemap_fp.glsl; sourceTree = ""; }; 2758BA2B178FCFC0007F6582 /* tonemap_vp.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tonemap_vp.glsl; sourceTree = ""; }; + A11507FA25B52155000CF482 /* libSDL2-2.0.14.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2-2.0.14.dylib"; path = "../../code/libs/macosx/libSDL2-2.0.14.dylib"; sourceTree = ""; }; + A115082B25B533FB000CF482 /* libSDL2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libSDL2.dylib; path = ../../code/libs/macosx/libSDL2.dylib; sourceTree = ""; }; A163B2612193D8FC00C48278 /* 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 = ""; }; A163B2632193DF8200C48278 /* tr_dsa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_dsa.h; sourceTree = ""; }; A163B2642193DF8200C48278 /* tr_image_dds.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tr_image_dds.c; sourceTree = ""; }; @@ -210,7 +212,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A163B2622193D8FC00C48278 /* libSDL2-2.0.0.dylib in Frameworks */, + A115085E25B9CD6F000CF482 /* libSDL2-2.0.0.dylib in Frameworks */, 2758B9CC178FBC8B007F6582 /* libjpeg8.a in Frameworks */, 2758B9CE178FBCBC007F6582 /* OpenGL.framework in Frameworks */, ); @@ -338,6 +340,8 @@ 2758B9C9178FBC6F007F6582 /* Frameworks */ = { isa = PBXGroup; children = ( + A115082B25B533FB000CF482 /* libSDL2.dylib */, + A11507FA25B52155000CF482 /* libSDL2-2.0.14.dylib */, A163B2612193D8FC00C48278 /* libSDL2-2.0.0.dylib */, 2758B9CD178FBCBC007F6582 /* OpenGL.framework */, ); @@ -444,7 +448,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = io; - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1220; ORGANIZATIONNAME = ioquake; }; buildConfigurationList = 274FAC18178FAF0C00B17C7A /* Build configuration list for PBXProject "renderer_opengl2" */; @@ -583,6 +587,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -609,9 +614,10 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGL; }; name = Debug; }; @@ -634,6 +640,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -653,8 +660,9 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; + VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGL; }; name = Release; }; @@ -662,15 +670,18 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "USE_LOCAL_HEADERS=1", + "DEBUG=1", + "$(inherited)", + "GL_SILENCE_DEPRECATION=1", + ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../code/jpeg-8c\"", "\"$(SRCROOT)/../../code/SDL2/include\"", ); - LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/../../code/libs/macosx\"", - "\"$(SRCROOT)/../../../../../../Library/Developer/Xcode/DerivedData/ioquake3-dqrqeayrbnbwitdwenoviousqwyc/Build/Products/Debug\"", - ); + LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../code/libs/macosx\""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -679,15 +690,16 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "USE_LOCAL_HEADERS=1", + "GL_SILENCE_DEPRECATION=1", + ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../code/jpeg-8c\"", "\"$(SRCROOT)/../../code/SDL2/include\"", ); - LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/../../code/libs/macosx\"", - "\"$(SRCROOT)/../../../../../../Library/Developer/Xcode/DerivedData/ioquake3-dqrqeayrbnbwitdwenoviousqwyc/Build/Products/Debug\"", - ); + LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../code/libs/macosx\""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/misc/xcode/ui.xcodeproj/project.pbxproj b/misc/xcode/ui.xcodeproj/project.pbxproj index 60576a02..9393a03a 100644 --- a/misc/xcode/ui.xcodeproj/project.pbxproj +++ b/misc/xcode/ui.xcodeproj/project.pbxproj @@ -17,10 +17,55 @@ 2772B8331790EE22004CCF57 /* q_math.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8301790EE22004CCF57 /* q_math.c */; }; 2772B8341790EE22004CCF57 /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8311790EE22004CCF57 /* q_shared.c */; }; 2772B8391790EE51004CCF57 /* ui_syscalls.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8381790EE51004CCF57 /* ui_syscalls.c */; }; + A137C922258DC8DF009AC639 /* bg_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8281790EE01004CCF57 /* bg_lib.c */; }; + A137C923258DC8DF009AC639 /* bg_misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B82A1790EE01004CCF57 /* bg_misc.c */; }; + A137C924258DC8DF009AC639 /* q_math.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8301790EE22004CCF57 /* q_math.c */; }; + A137C925258DC8DF009AC639 /* q_shared.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8311790EE22004CCF57 /* q_shared.c */; }; + A137C93A258DC988009AC639 /* ui_ingame.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8F6258DC8D1009AC639 /* ui_ingame.c */; }; + A137C93C258DC988009AC639 /* ui_spreset.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C90D258DC8D1009AC639 /* ui_spreset.c */; }; + A137C93D258DC988009AC639 /* ui_video.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C903258DC8D1009AC639 /* ui_video.c */; }; + A137C93E258DC988009AC639 /* ui_addbots.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C908258DC8D1009AC639 /* ui_addbots.c */; }; + A137C93F258DC988009AC639 /* ui_playersettings.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C90E258DC8D1009AC639 /* ui_playersettings.c */; }; + A137C940258DC988009AC639 /* ui_saveconfig.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8F0258DC8D1009AC639 /* ui_saveconfig.c */; }; + A137C941258DC988009AC639 /* ui_cinematics.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8FA258DC8D1009AC639 /* ui_cinematics.c */; }; + A137C942258DC988009AC639 /* ui_qmenu.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8FC258DC8D1009AC639 /* ui_qmenu.c */; }; + A137C943258DC988009AC639 /* ui_playermodel.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C90F258DC8D1009AC639 /* ui_playermodel.c */; }; + A137C944258DC988009AC639 /* ui_mfield.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C914258DC8D1009AC639 /* ui_mfield.c */; }; + A137C945258DC988009AC639 /* ui_sppostgame.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C916258DC8D1009AC639 /* ui_sppostgame.c */; }; + A137C947258DC988009AC639 /* ui_removebots.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C907258DC8D1009AC639 /* ui_removebots.c */; }; + A137C948258DC988009AC639 /* ui_team.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C911258DC8D1009AC639 /* ui_team.c */; }; + A137C949258DC988009AC639 /* ui_preferences.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C919258DC8D1009AC639 /* ui_preferences.c */; }; + A137C94A258DC988009AC639 /* ui_sound.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8F1258DC8D1009AC639 /* ui_sound.c */; }; + A137C94B258DC988009AC639 /* ui_splevel.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C906258DC8D1009AC639 /* ui_splevel.c */; }; + A137C94C258DC988009AC639 /* ui_mods.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8FE258DC8D1009AC639 /* ui_mods.c */; }; + A137C94D258DC988009AC639 /* ui_setup.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8EE258DC8D1009AC639 /* ui_setup.c */; }; + A137C94E258DC988009AC639 /* ui_credits.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C909258DC8D1009AC639 /* ui_credits.c */; }; + A137C94F258DC988009AC639 /* ui_sparena.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C90C258DC8D1009AC639 /* ui_sparena.c */; }; + A137C950258DC988009AC639 /* ui_cdkey.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C901258DC8D1009AC639 /* ui_cdkey.c */; }; + A137C951258DC988009AC639 /* ui_options.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8EF258DC8D1009AC639 /* ui_options.c */; }; + A137C953258DC988009AC639 /* ui_specifyserver.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8F9258DC8D1009AC639 /* ui_specifyserver.c */; }; + A137C954258DC988009AC639 /* ui_gameinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C90A258DC8D1009AC639 /* ui_gameinfo.c */; }; + A137C955258DC988009AC639 /* ui_controls2.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C917258DC8D1009AC639 /* ui_controls2.c */; }; + A137C957258DC988009AC639 /* ui_network.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C918258DC8D1009AC639 /* ui_network.c */; }; + A137C958258DC988009AC639 /* ui_display.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C913258DC8D1009AC639 /* ui_display.c */; }; + A137C959258DC988009AC639 /* ui_atoms.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C902258DC8D1009AC639 /* ui_atoms.c */; }; + A137C95A258DC988009AC639 /* ui_connect.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8F5258DC8D1009AC639 /* ui_connect.c */; }; + A137C95B258DC988009AC639 /* ui_players.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C904258DC8D1009AC639 /* ui_players.c */; }; + A137C95C258DC988009AC639 /* ui_startserver.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C915258DC8D1009AC639 /* ui_startserver.c */; }; + A137C95D258DC988009AC639 /* ui_spskill.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8F4258DC8D1009AC639 /* ui_spskill.c */; }; + A137C95E258DC988009AC639 /* ui_serverinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C91A258DC8D1009AC639 /* ui_serverinfo.c */; }; + A137C95F258DC988009AC639 /* ui_loadconfig.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C90B258DC8D1009AC639 /* ui_loadconfig.c */; }; + A137C960258DC988009AC639 /* ui_servers2.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8F3258DC8D1009AC639 /* ui_servers2.c */; }; + A137C961258DC988009AC639 /* ui_demo2.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C910258DC8D1009AC639 /* ui_demo2.c */; }; + A137C962258DC988009AC639 /* ui_main.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8F2258DC8D1009AC639 /* ui_main.c */; }; + A137C963258DC988009AC639 /* ui_teamorders.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8F7258DC8D1009AC639 /* ui_teamorders.c */; }; + A137C964258DC988009AC639 /* ui_menu.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8FD258DC8D1009AC639 /* ui_menu.c */; }; + A137C965258DC988009AC639 /* ui_confirm.c in Sources */ = {isa = PBXBuildFile; fileRef = A137C8ED258DC8D1009AC639 /* ui_confirm.c */; }; + A137C980258DCBF4009AC639 /* ui_syscalls.c in Sources */ = {isa = PBXBuildFile; fileRef = 2772B8381790EE51004CCF57 /* ui_syscalls.c */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 273531D914D1272300EB7BD6 /* ui.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = ui.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 273531D914D1272300EB7BD6 /* missionpack/ui.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = missionpack/ui.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 2772B8121790EDA0004CCF57 /* ui_atoms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_atoms.c; sourceTree = ""; }; 2772B8131790EDA0004CCF57 /* ui_gameinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_gameinfo.c; sourceTree = ""; }; 2772B8141790EDA0004CCF57 /* ui_local.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_local.h; sourceTree = ""; }; @@ -39,6 +84,53 @@ 2772B8321790EE22004CCF57 /* q_shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = q_shared.h; sourceTree = ""; }; 2772B8361790EE2F004CCF57 /* tr_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tr_types.h; sourceTree = ""; }; 2772B8381790EE51004CCF57 /* ui_syscalls.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui_syscalls.c; sourceTree = ""; }; + A137C8ED258DC8D1009AC639 /* ui_confirm.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_confirm.c; sourceTree = ""; }; + A137C8EE258DC8D1009AC639 /* ui_setup.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_setup.c; sourceTree = ""; }; + A137C8EF258DC8D1009AC639 /* ui_options.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_options.c; sourceTree = ""; }; + A137C8F0258DC8D1009AC639 /* ui_saveconfig.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_saveconfig.c; sourceTree = ""; }; + A137C8F1258DC8D1009AC639 /* ui_sound.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_sound.c; sourceTree = ""; }; + A137C8F2258DC8D1009AC639 /* ui_main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_main.c; sourceTree = ""; }; + A137C8F3258DC8D1009AC639 /* ui_servers2.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_servers2.c; sourceTree = ""; }; + A137C8F4258DC8D1009AC639 /* ui_spskill.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_spskill.c; sourceTree = ""; }; + A137C8F5258DC8D1009AC639 /* ui_connect.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_connect.c; sourceTree = ""; }; + A137C8F6258DC8D1009AC639 /* ui_ingame.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_ingame.c; sourceTree = ""; }; + A137C8F7258DC8D1009AC639 /* ui_teamorders.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_teamorders.c; sourceTree = ""; }; + A137C8F8258DC8D1009AC639 /* ui_local.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ui_local.h; sourceTree = ""; }; + A137C8F9258DC8D1009AC639 /* ui_specifyserver.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_specifyserver.c; sourceTree = ""; }; + A137C8FA258DC8D1009AC639 /* ui_cinematics.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_cinematics.c; sourceTree = ""; }; + A137C8FB258DC8D1009AC639 /* ui_rankstatus.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_rankstatus.c; sourceTree = ""; }; + A137C8FC258DC8D1009AC639 /* ui_qmenu.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_qmenu.c; sourceTree = ""; }; + A137C8FD258DC8D1009AC639 /* ui_menu.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_menu.c; sourceTree = ""; }; + A137C8FE258DC8D1009AC639 /* ui_mods.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_mods.c; sourceTree = ""; }; + A137C8FF258DC8D1009AC639 /* ui_signup.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_signup.c; sourceTree = ""; }; + A137C900258DC8D1009AC639 /* ui_rankings.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_rankings.c; sourceTree = ""; }; + A137C901258DC8D1009AC639 /* ui_cdkey.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_cdkey.c; sourceTree = ""; }; + A137C902258DC8D1009AC639 /* ui_atoms.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_atoms.c; sourceTree = ""; }; + A137C903258DC8D1009AC639 /* ui_video.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_video.c; sourceTree = ""; }; + A137C904258DC8D1009AC639 /* ui_players.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_players.c; sourceTree = ""; }; + A137C905258DC8D1009AC639 /* ui_specifyleague.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_specifyleague.c; sourceTree = ""; }; + A137C906258DC8D1009AC639 /* ui_splevel.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_splevel.c; sourceTree = ""; }; + A137C907258DC8D1009AC639 /* ui_removebots.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_removebots.c; sourceTree = ""; }; + A137C908258DC8D1009AC639 /* ui_addbots.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_addbots.c; sourceTree = ""; }; + A137C909258DC8D1009AC639 /* ui_credits.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_credits.c; sourceTree = ""; }; + A137C90A258DC8D1009AC639 /* ui_gameinfo.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_gameinfo.c; sourceTree = ""; }; + A137C90B258DC8D1009AC639 /* ui_loadconfig.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_loadconfig.c; sourceTree = ""; }; + A137C90C258DC8D1009AC639 /* ui_sparena.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_sparena.c; sourceTree = ""; }; + A137C90D258DC8D1009AC639 /* ui_spreset.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_spreset.c; sourceTree = ""; }; + A137C90E258DC8D1009AC639 /* ui_playersettings.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_playersettings.c; sourceTree = ""; }; + A137C90F258DC8D1009AC639 /* ui_playermodel.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_playermodel.c; sourceTree = ""; }; + A137C910258DC8D1009AC639 /* ui_demo2.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_demo2.c; sourceTree = ""; }; + A137C911258DC8D1009AC639 /* ui_team.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_team.c; sourceTree = ""; }; + A137C912258DC8D1009AC639 /* ui_login.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_login.c; sourceTree = ""; }; + A137C913258DC8D1009AC639 /* ui_display.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_display.c; sourceTree = ""; }; + A137C914258DC8D1009AC639 /* ui_mfield.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_mfield.c; sourceTree = ""; }; + A137C915258DC8D1009AC639 /* ui_startserver.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_startserver.c; sourceTree = ""; }; + A137C916258DC8D1009AC639 /* ui_sppostgame.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_sppostgame.c; sourceTree = ""; }; + A137C917258DC8D1009AC639 /* ui_controls2.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_controls2.c; sourceTree = ""; }; + A137C918258DC8D1009AC639 /* ui_network.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_network.c; sourceTree = ""; }; + A137C919258DC8D1009AC639 /* ui_preferences.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_preferences.c; sourceTree = ""; }; + A137C91A258DC8D1009AC639 /* ui_serverinfo.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_serverinfo.c; sourceTree = ""; }; + A137C92B258DC8DF009AC639 /* baseq3/ui.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = baseq3/ui.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -49,6 +141,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + A137C927258DC8DF009AC639 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -63,7 +162,8 @@ 273531DA14D1272300EB7BD6 /* Products */ = { isa = PBXGroup; children = ( - 273531D914D1272300EB7BD6 /* ui.dylib */, + 273531D914D1272300EB7BD6 /* missionpack/ui.dylib */, + A137C92B258DC8DF009AC639 /* baseq3/ui.dylib */, ); name = Products; sourceTree = ""; @@ -73,6 +173,7 @@ children = ( 2772B8251790EDCC004CCF57 /* client */, 2772B8241790EDC6004CCF57 /* game */, + A137C8EC258DC8D1009AC639 /* q3_ui */, 2772B8231790EDC1004CCF57 /* qcommon */, 2772B8221790EDA7004CCF57 /* renderercommon */, 2772B8111790ED78004CCF57 /* ui */, @@ -134,12 +235,65 @@ path = client; sourceTree = ""; }; + A137C8EC258DC8D1009AC639 /* q3_ui */ = { + isa = PBXGroup; + children = ( + A137C908258DC8D1009AC639 /* ui_addbots.c */, + A137C902258DC8D1009AC639 /* ui_atoms.c */, + A137C901258DC8D1009AC639 /* ui_cdkey.c */, + A137C8FA258DC8D1009AC639 /* ui_cinematics.c */, + A137C8ED258DC8D1009AC639 /* ui_confirm.c */, + A137C8F5258DC8D1009AC639 /* ui_connect.c */, + A137C917258DC8D1009AC639 /* ui_controls2.c */, + A137C909258DC8D1009AC639 /* ui_credits.c */, + A137C910258DC8D1009AC639 /* ui_demo2.c */, + A137C913258DC8D1009AC639 /* ui_display.c */, + A137C90A258DC8D1009AC639 /* ui_gameinfo.c */, + A137C8F6258DC8D1009AC639 /* ui_ingame.c */, + A137C90B258DC8D1009AC639 /* ui_loadconfig.c */, + A137C8F8258DC8D1009AC639 /* ui_local.h */, + A137C912258DC8D1009AC639 /* ui_login.c */, + A137C8F2258DC8D1009AC639 /* ui_main.c */, + A137C8FD258DC8D1009AC639 /* ui_menu.c */, + A137C914258DC8D1009AC639 /* ui_mfield.c */, + A137C8FE258DC8D1009AC639 /* ui_mods.c */, + A137C918258DC8D1009AC639 /* ui_network.c */, + A137C8EF258DC8D1009AC639 /* ui_options.c */, + A137C90F258DC8D1009AC639 /* ui_playermodel.c */, + A137C904258DC8D1009AC639 /* ui_players.c */, + A137C90E258DC8D1009AC639 /* ui_playersettings.c */, + A137C919258DC8D1009AC639 /* ui_preferences.c */, + A137C8FC258DC8D1009AC639 /* ui_qmenu.c */, + A137C900258DC8D1009AC639 /* ui_rankings.c */, + A137C8FB258DC8D1009AC639 /* ui_rankstatus.c */, + A137C907258DC8D1009AC639 /* ui_removebots.c */, + A137C8F0258DC8D1009AC639 /* ui_saveconfig.c */, + A137C91A258DC8D1009AC639 /* ui_serverinfo.c */, + A137C8F3258DC8D1009AC639 /* ui_servers2.c */, + A137C8EE258DC8D1009AC639 /* ui_setup.c */, + A137C8FF258DC8D1009AC639 /* ui_signup.c */, + A137C8F1258DC8D1009AC639 /* ui_sound.c */, + A137C90C258DC8D1009AC639 /* ui_sparena.c */, + A137C905258DC8D1009AC639 /* ui_specifyleague.c */, + A137C8F9258DC8D1009AC639 /* ui_specifyserver.c */, + A137C906258DC8D1009AC639 /* ui_splevel.c */, + A137C916258DC8D1009AC639 /* ui_sppostgame.c */, + A137C90D258DC8D1009AC639 /* ui_spreset.c */, + A137C8F4258DC8D1009AC639 /* ui_spskill.c */, + A137C915258DC8D1009AC639 /* ui_startserver.c */, + A137C911258DC8D1009AC639 /* ui_team.c */, + A137C8F7258DC8D1009AC639 /* ui_teamorders.c */, + A137C903258DC8D1009AC639 /* ui_video.c */, + ); + path = q3_ui; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 273531D814D1272300EB7BD6 /* ui */ = { + 273531D814D1272300EB7BD6 /* ui - missionpack */ = { isa = PBXNativeTarget; - buildConfigurationList = 273531DD14D1272300EB7BD6 /* Build configuration list for PBXNativeTarget "ui" */; + buildConfigurationList = 273531DD14D1272300EB7BD6 /* Build configuration list for PBXNativeTarget "ui - missionpack" */; buildPhases = ( 273531D514D1272300EB7BD6 /* Sources */, 273531D614D1272300EB7BD6 /* Frameworks */, @@ -148,9 +302,25 @@ ); dependencies = ( ); - name = ui; + name = "ui - missionpack"; productName = ui; - productReference = 273531D914D1272300EB7BD6 /* ui.dylib */; + productReference = 273531D914D1272300EB7BD6 /* missionpack/ui.dylib */; + productType = "com.apple.product-type.library.dynamic"; + }; + A137C91B258DC8DF009AC639 /* ui - baseq3 */ = { + isa = PBXNativeTarget; + buildConfigurationList = A137C928258DC8DF009AC639 /* Build configuration list for PBXNativeTarget "ui - baseq3" */; + buildPhases = ( + A137C91C258DC8DF009AC639 /* Sources */, + A137C927258DC8DF009AC639 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "ui - baseq3"; + productName = ui; + productReference = A137C92B258DC8DF009AC639 /* baseq3/ui.dylib */; productType = "com.apple.product-type.library.dynamic"; }; /* End PBXNativeTarget section */ @@ -159,7 +329,7 @@ 273531D014D1272300EB7BD6 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1220; }; buildConfigurationList = 273531D314D1272300EB7BD6 /* Build configuration list for PBXProject "ui" */; compatibilityVersion = "Xcode 3.2"; @@ -174,7 +344,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 273531D814D1272300EB7BD6 /* ui */, + A137C91B258DC8DF009AC639 /* ui - baseq3 */, + 273531D814D1272300EB7BD6 /* ui - missionpack */, ); }; /* End PBXProject section */ @@ -197,6 +368,58 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + A137C91C258DC8DF009AC639 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A137C95A258DC988009AC639 /* ui_connect.c in Sources */, + A137C94F258DC988009AC639 /* ui_sparena.c in Sources */, + A137C943258DC988009AC639 /* ui_playermodel.c in Sources */, + A137C94D258DC988009AC639 /* ui_setup.c in Sources */, + A137C93A258DC988009AC639 /* ui_ingame.c in Sources */, + A137C949258DC988009AC639 /* ui_preferences.c in Sources */, + A137C94B258DC988009AC639 /* ui_splevel.c in Sources */, + A137C94E258DC988009AC639 /* ui_credits.c in Sources */, + A137C953258DC988009AC639 /* ui_specifyserver.c in Sources */, + A137C950258DC988009AC639 /* ui_cdkey.c in Sources */, + A137C95E258DC988009AC639 /* ui_serverinfo.c in Sources */, + A137C959258DC988009AC639 /* ui_atoms.c in Sources */, + A137C94A258DC988009AC639 /* ui_sound.c in Sources */, + A137C948258DC988009AC639 /* ui_team.c in Sources */, + A137C95C258DC988009AC639 /* ui_startserver.c in Sources */, + A137C94C258DC988009AC639 /* ui_mods.c in Sources */, + A137C964258DC988009AC639 /* ui_menu.c in Sources */, + A137C93C258DC988009AC639 /* ui_spreset.c in Sources */, + A137C95F258DC988009AC639 /* ui_loadconfig.c in Sources */, + A137C941258DC988009AC639 /* ui_cinematics.c in Sources */, + A137C947258DC988009AC639 /* ui_removebots.c in Sources */, + A137C95D258DC988009AC639 /* ui_spskill.c in Sources */, + A137C922258DC8DF009AC639 /* bg_lib.c in Sources */, + A137C93D258DC988009AC639 /* ui_video.c in Sources */, + A137C940258DC988009AC639 /* ui_saveconfig.c in Sources */, + A137C923258DC8DF009AC639 /* bg_misc.c in Sources */, + A137C93E258DC988009AC639 /* ui_addbots.c in Sources */, + A137C960258DC988009AC639 /* ui_servers2.c in Sources */, + A137C963258DC988009AC639 /* ui_teamorders.c in Sources */, + A137C955258DC988009AC639 /* ui_controls2.c in Sources */, + A137C961258DC988009AC639 /* ui_demo2.c in Sources */, + A137C95B258DC988009AC639 /* ui_players.c in Sources */, + A137C942258DC988009AC639 /* ui_qmenu.c in Sources */, + A137C954258DC988009AC639 /* ui_gameinfo.c in Sources */, + A137C951258DC988009AC639 /* ui_options.c in Sources */, + A137C924258DC8DF009AC639 /* q_math.c in Sources */, + A137C965258DC988009AC639 /* ui_confirm.c in Sources */, + A137C962258DC988009AC639 /* ui_main.c in Sources */, + A137C980258DCBF4009AC639 /* ui_syscalls.c in Sources */, + A137C944258DC988009AC639 /* ui_mfield.c in Sources */, + A137C925258DC8DF009AC639 /* q_shared.c in Sources */, + A137C957258DC988009AC639 /* ui_network.c in Sources */, + A137C945258DC988009AC639 /* ui_sppostgame.c in Sources */, + A137C958258DC988009AC639 /* ui_display.c in Sources */, + A137C93F258DC988009AC639 /* ui_playersettings.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -217,6 +440,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -231,7 +455,6 @@ GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - MISSIONPACK, "DEBUG=1", "$(inherited)", ); @@ -243,7 +466,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -266,6 +489,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -277,7 +501,7 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = MISSIONPACK; + GCC_PREPROCESSOR_DEFINITIONS = ""; GCC_VERSION = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -285,7 +509,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; }; name = Release; @@ -297,7 +521,7 @@ COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = missionpack/ui; }; name = Debug; }; @@ -308,7 +532,34 @@ COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = missionpack/ui; + }; + name = Release; + }; + A137C929258DC8DF009AC639 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + COMBINE_HIDPI_IMAGES = YES; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + PRODUCT_NAME = baseq3/ui; + }; + name = Debug; + }; + A137C92A258DC8DF009AC639 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + COMBINE_HIDPI_IMAGES = YES; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; + PRODUCT_NAME = baseq3/ui; }; name = Release; }; @@ -324,7 +575,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 273531DD14D1272300EB7BD6 /* Build configuration list for PBXNativeTarget "ui" */ = { + 273531DD14D1272300EB7BD6 /* Build configuration list for PBXNativeTarget "ui - missionpack" */ = { isa = XCConfigurationList; buildConfigurations = ( 273531DE14D1272300EB7BD6 /* Debug */, @@ -333,6 +584,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + A137C928258DC8DF009AC639 /* Build configuration list for PBXNativeTarget "ui - baseq3" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A137C929258DC8DF009AC639 /* Debug */, + A137C92A258DC8DF009AC639 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 273531D014D1272300EB7BD6 /* Project object */; diff --git a/misc/xcode/xcode-readme.txt b/misc/xcode/xcode-readme.txt index 63fff75c..b8cb85aa 100644 --- a/misc/xcode/xcode-readme.txt +++ b/misc/xcode/xcode-readme.txt @@ -26,7 +26,6 @@ LIBRARIES: TODO: - dedicated support -- missionpack support - curl.xcodeproj - ogg.xcodeproj (ogg vorbis support) - zlib.xcodeproj @@ -47,5 +46,6 @@ TODO: + NO CARRIER