diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..f4be8718 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +xcuserdata +*.xcworkspace diff --git a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj index 32e21cfb..60e92108 100644 --- a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj +++ b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj @@ -7,8 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F00EBEB88 /* SDL.framework */; }; - 002F3A0009D0884600EBEB88 /* SDL.framework in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F00EBEB88 /* SDL.framework */; }; 002F3A2E09D0888800EBEB88 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 002F3A2C09D0888800EBEB88 /* SDLMain.m */; }; 002F3C0109D093BD00EBEB88 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F3C0009D093BD00EBEB88 /* OpenGL.framework */; }; 002F3C6109D0951E00EBEB88 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F3C6009D0951E00EBEB88 /* GLUT.framework */; }; @@ -104,6 +102,8 @@ 48E2EC8815FB516600B8D476 /* libvorbis.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 48E2EC7B15FB507A00B8D476 /* libvorbis.dylib */; }; 48E2EC8915FB516600B8D476 /* libvorbisfile.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 48E2EC7C15FB507A00B8D476 /* libvorbisfile.dylib */; }; 48FE585B0D3A82C8006BB491 /* QuakeArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FE585A0D3A82C8006BB491 /* QuakeArguments.m */; }; + 66976167192A890B0071686F /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66976166192A890B0071686F /* SDL2.framework */; }; + 66976168192A89140071686F /* SDL2.framework in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = 66976166192A890B0071686F /* SDL2.framework */; }; 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; B021C20914A5FF7E003F18D6 /* cfgfile.c in Sources */ = {isa = PBXBuildFile; fileRef = B021C20714A5FF7E003F18D6 /* cfgfile.c */; }; @@ -116,7 +116,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 002F3A0009D0884600EBEB88 /* SDL.framework in Copy Frameworks into .app bundle */, + 66976168192A89140071686F /* SDL2.framework in Copy Frameworks into .app bundle */, ); name = "Copy Frameworks into .app bundle"; runOnlyForDeploymentPostprocessing = 0; @@ -303,6 +303,7 @@ 48E2EC7C15FB507A00B8D476 /* libvorbisfile.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisfile.dylib; path = codecs/lib/libvorbisfile.dylib; sourceTree = ""; }; 48FE58590D3A82C8006BB491 /* QuakeArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuakeArguments.h; sourceTree = ""; }; 48FE585A0D3A82C8006BB491 /* QuakeArguments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QuakeArguments.m; sourceTree = ""; }; + 66976166192A890B0071686F /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = ../../../../../Library/Frameworks/SDL2.framework; sourceTree = ""; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8D1107320486CEB800E47090 /* QuakeSpasm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = QuakeSpasm.app; sourceTree = BUILT_PRODUCTS_DIR; }; B021C20714A5FF7E003F18D6 /* cfgfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cfgfile.c; path = ../Quake/cfgfile.c; sourceTree = SOURCE_ROOT; }; @@ -314,6 +315,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 66976167192A890B0071686F /* SDL2.framework in Frameworks */, 482812FD179C3EF4004E1D61 /* libFLAC.dylib in Frameworks */, 4885A84F179740CA000EC703 /* libopus.dylib in Frameworks */, 4885A850179740CA000EC703 /* libopusfile.dylib in Frameworks */, @@ -322,7 +324,6 @@ 48E2EC7F15FB507A00B8D476 /* libvorbis.dylib in Frameworks */, 48E2EC8015FB507A00B8D476 /* libvorbisfile.dylib in Frameworks */, 48E2EC7815FB500400B8D476 /* IOKit.framework in Frameworks */, - 002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */, 002F3C6109D0951E00EBEB88 /* GLUT.framework in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, 002F3C0109D093BD00EBEB88 /* OpenGL.framework in Frameworks */, @@ -394,6 +395,7 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 66976166192A890B0071686F /* SDL2.framework */, 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */, 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */, ); @@ -807,14 +809,12 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ); + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LOCAL_LIBRARY_DIR)/Frameworks", ); FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; GCC_DYNAMIC_NO_PIC = NO; @@ -823,8 +823,9 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( SDL_FRAMEWORK, + USE_SDL2, ); - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( codecs/include, "$(HEADER_SEARCH_PATHS)", @@ -837,7 +838,7 @@ "\"$(SRCROOT)/codecs/lib\"", ); PRODUCT_NAME = QuakeSpasm; - SDKROOT = macosx10.5; + SDKROOT = macosx; WRAPPER_EXTENSION = app; ZERO_LINK = YES; }; @@ -846,14 +847,11 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ppc, - ); + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LOCAL_LIBRARY_DIR)/Frameworks", ); FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -866,7 +864,7 @@ USE_CODEC_OPUS, SDL_FRAMEWORK, ); - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( codecs/include, "$(HEADER_SEARCH_PATHS)", @@ -893,7 +891,7 @@ ppc, ); PRODUCT_NAME = QuakeSpasm; - SDKROOT = macosx10.5; + SDKROOT = macosx; WRAPPER_EXTENSION = app; }; name = Release; @@ -901,10 +899,7 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ); + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; FRAMEWORK_SEARCH_PATHS = ( /Library/Frameworks, "$(FRAMEWORK_SEARCH_PATHS)", @@ -912,8 +907,9 @@ GCC_MODEL_TUNING = G3; GCC_PREPROCESSOR_DEFINITIONS = ( SDL_FRAMEWORK, + USE_SDL2, ); - GCC_VERSION = 4.0; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( @@ -924,10 +920,10 @@ MACOSX_DEPLOYMENT_TARGET = 10.4; "MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.4; "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; - SDKROOT = macosx10.5; - "SDKROOT[arch=i386]" = macosx10.4; + SDKROOT = macosx; + "SDKROOT[arch=i386]" = macosx; "SDKROOT[arch=x86_64]" = macosx10.5; VALID_ARCHS = "i386 x86_64"; }; @@ -936,11 +932,7 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ppc, - ); + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; DEPLOYMENT_POSTPROCESSING = YES; FRAMEWORK_SEARCH_PATHS = ( /Library/Frameworks, @@ -955,7 +947,7 @@ USE_CODEC_OPUS, SDL_FRAMEWORK, ); - GCC_VERSION = 4.0; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( @@ -967,7 +959,7 @@ "MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.4; "MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.4; "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; "OTHER_CFLAGS[arch=ppc]" = ( "-arch", @@ -985,10 +977,10 @@ ppc, ); PREBINDING = NO; - SDKROOT = macosx10.5; - "SDKROOT[arch=i386]" = macosx10.4; - "SDKROOT[arch=ppc]" = macosx10.4; - "SDKROOT[arch=x86_64]" = macosx10.5; + SDKROOT = macosx; + "SDKROOT[arch=i386]" = macosx; + "SDKROOT[arch=ppc]" = macosx; + "SDKROOT[arch=x86_64]" = macosx; VALID_ARCHS = "i386 x86_64 ppc"; }; name = Release; diff --git a/MacOSX/QuakeSpasm.xcodeproj/xcshareddata/xcschemes/QuakeSpasm.xcscheme b/MacOSX/QuakeSpasm.xcodeproj/xcshareddata/xcschemes/QuakeSpasm.xcscheme index 90de0538..696f47ba 100644 --- a/MacOSX/QuakeSpasm.xcodeproj/xcshareddata/xcschemes/QuakeSpasm.xcscheme +++ b/MacOSX/QuakeSpasm.xcodeproj/xcshareddata/xcschemes/QuakeSpasm.xcscheme @@ -21,8 +21,8 @@ @@ -38,8 +38,8 @@