X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e059f83fa60faaa40f2e51377d55b5cd51ad7fac..b70362998b8f562923f6ed6708f06537ac056cd4:/samples/minimal/minimal.xcodeproj/project.pbxproj diff --git a/samples/minimal/minimal.xcodeproj/project.pbxproj b/samples/minimal/minimal.xcodeproj/project.pbxproj index be3b0aaa4b..a36f068875 100644 --- a/samples/minimal/minimal.xcodeproj/project.pbxproj +++ b/samples/minimal/minimal.xcodeproj/project.pbxproj @@ -31,8 +31,7 @@ 1842CB01085664390032BCF7 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF9085664390032BCF7 /* OpenGL.framework */; }; 1842CB02085664390032BCF7 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAFA085664390032BCF7 /* WebKit.framework */; }; 403608C909953BFD00700A19 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F591E05701FCC5DE01000133 /* minimal.cpp */; }; - 403BFCA80A1F893400D89D00 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 403BFCA70A1F893400D89D00 /* AppKit.framework */; }; - 403BFCA90A1F893400D89D00 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 403BFCA70A1F893400D89D00 /* AppKit.framework */; }; + 407C6AC00A899DD50056252A /* libwx_mac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F017230A3067FE00AC9076 /* libwx_mac.dylib */; }; 4086D0E5063BBC5B00D4CD53 /* wxmac.icns in Resources */ = {isa = PBXBuildFile; fileRef = F5F5A69A02CDB0E101000133 /* wxmac.icns */; }; 4086D0E9063BBC5B00D4CD53 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; }; 4086D0EC063BBC5B00D4CD53 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA60173504D423C000000080 /* System.framework */; }; @@ -41,6 +40,8 @@ 4086D109063BBC5C00D4CD53 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; }; 4086D10B063BBC5C00D4CD53 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA60173504D423C000000080 /* System.framework */; }; 409F03A10977B97B00D1030F /* libwx_mac_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 409F039A0977B96200D1030F /* libwx_mac_static.a */; }; + 40F017470A306CAD00AC9076 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F017460A306CAD00AC9076 /* AppKit.framework */; }; + 40F017480A306CAD00AC9076 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F017460A306CAD00AC9076 /* AppKit.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -58,19 +59,19 @@ remoteGlobalIDString = 4086D102063BBC5C00D4CD53; remoteInfo = DynamicDebug; }; - 407AA07109D30FFB003E4CF8 /* PBXContainerItemProxy */ = { + 409F03990977B96200D1030F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 409F03930977B96200D1030F /* wxWindows.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 4086CBE1063AB30000D4CD53; - remoteInfo = dynamic; + remoteGlobalIDString = 4086C8CB063AB30000D4CD53; + remoteInfo = static; }; - 409F03990977B96200D1030F /* PBXContainerItemProxy */ = { + 40F017220A3067FE00AC9076 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 409F03930977B96200D1030F /* wxWindows.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 4086C8CB063AB30000D4CD53; - remoteInfo = static; + remoteGlobalIDString = 4086CBE1063AB30000D4CD53; + remoteInfo = dynamic; }; /* End PBXContainerItemProxy section */ @@ -94,9 +95,9 @@ 1864B4F208566CAB00E32E9B /* minimalDynamic.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimalDynamic.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1864B4F408566CAB00E32E9B /* minimal.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal.app; sourceTree = BUILT_PRODUCTS_DIR; }; 20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; - 403BFCA70A1F893400D89D00 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 4086D0EF063BBC5B00D4CD53 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; 409F03930977B96200D1030F /* wxWindows.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxWindows.xcodeproj; path = ../../src/wxWindows.xcodeproj; sourceTree = SOURCE_ROOT; }; + 40F017460A306CAD00AC9076 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; CA60173504D423C000000080 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; sourceTree = ""; }; F591E05701FCC5DE01000133 /* minimal.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = minimal.cpp; sourceTree = SOURCE_ROOT; }; F5F5A69A02CDB0E101000133 /* wxmac.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = wxmac.icns; path = ../../src/mac/wxmac.icns; sourceTree = SOURCE_ROOT; }; @@ -114,7 +115,7 @@ 1842CAFC085664390032BCF7 /* IOKit.framework in Frameworks */, 1842CAFD085664390032BCF7 /* OpenGL.framework in Frameworks */, 1842CAFE085664390032BCF7 /* WebKit.framework in Frameworks */, - 403BFCA90A1F893400D89D00 /* AppKit.framework in Frameworks */, + 40F017470A306CAD00AC9076 /* AppKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -122,13 +123,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 407C6AC00A899DD50056252A /* libwx_mac.dylib in Frameworks */, 4086D109063BBC5C00D4CD53 /* Carbon.framework in Frameworks */, 4086D10B063BBC5C00D4CD53 /* System.framework in Frameworks */, 1842CAFF085664390032BCF7 /* AGL.framework in Frameworks */, 1842CB00085664390032BCF7 /* IOKit.framework in Frameworks */, 1842CB01085664390032BCF7 /* OpenGL.framework in Frameworks */, 1842CB02085664390032BCF7 /* WebKit.framework in Frameworks */, - 403BFCA80A1F893400D89D00 /* AppKit.framework in Frameworks */, + 40F017480A306CAD00AC9076 /* AppKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -176,7 +178,7 @@ 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( - 403BFCA70A1F893400D89D00 /* AppKit.framework */, + 40F017460A306CAD00AC9076 /* AppKit.framework */, 20286C33FDCF999611CA2CEA /* Carbon.framework */, CA60173504D423C000000080 /* System.framework */, 1842CAF7085664390032BCF7 /* AGL.framework */, @@ -191,7 +193,7 @@ isa = PBXGroup; children = ( 409F039A0977B96200D1030F /* libwx_mac_static.a */, - 407AA07209D30FFB003E4CF8 /* libwx_mac.dylib */, + 40F017230A3067FE00AC9076 /* libwx_mac.dylib */, ); name = Products; sourceTree = ""; @@ -283,13 +285,6 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 407AA07209D30FFB003E4CF8 /* libwx_mac.dylib */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.dylib"; - path = libwx_mac.dylib; - remoteRef = 407AA07109D30FFB003E4CF8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 409F039A0977B96200D1030F /* libwx_mac_static.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -297,6 +292,13 @@ remoteRef = 409F03990977B96200D1030F /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 40F017230A3067FE00AC9076 /* libwx_mac.dylib */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.dylib"; + path = libwx_mac.dylib; + remoteRef = 40F017220A3067FE00AC9076 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -439,6 +441,8 @@ "WX_PRECOMP=1", MACOS_CLASSIC, ); + GCC_VERSION_i386 = 4.0; + GCC_VERSION_ppc = 3.3; INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../src/build/Deployment"; MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; @@ -462,6 +466,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(NATIVE_ARCH)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ../../include/wx/wxprec.h; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -488,7 +493,6 @@ OTHER_LDFLAGS = ( "-liconv", "-lz", - "-lwx_mac", ); PRODUCT_NAME = "$(PRODUCT_NAME)Dynamic"; USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../../include ../../src/build/include ."; @@ -499,6 +503,7 @@ "-Wno-unknown-pragmas", ); ZERO_LINK = NO; + wxDylib = ../../src/build/Development/libwx_macd.dylib; }; name = Development; }; @@ -531,7 +536,6 @@ OTHER_LDFLAGS = ( "-liconv", "-lz", - "-lwx_mac", ); PRODUCT_NAME = "$(PRODUCT_NAME)Dynamic"; USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../../include ../../src/build/include ."; @@ -542,6 +546,7 @@ "-Wno-unknown-pragmas", ); ZERO_LINK = NO; + wxDylib = ../../src/build/Deployment/libwx_mac.dylib; }; name = Deployment; };