From 854ad5ac3d870f3023ac44d6775a88f018e84c06 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 22 Jun 2011 19:41:15 +0000 Subject: [PATCH] new settings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- .../osx/wxcocoa_in.xcodeproj/project.pbxproj | 50 +++++++------------ 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/build/osx/wxcocoa_in.xcodeproj/project.pbxproj b/build/osx/wxcocoa_in.xcodeproj/project.pbxproj index 47b27d1de1..79c5e0452d 100644 --- a/build/osx/wxcocoa_in.xcodeproj/project.pbxproj +++ b/build/osx/wxcocoa_in.xcodeproj/project.pbxproj @@ -9,6 +9,8 @@ /* Begin PBXFileReference section */ 404BEE6110EC83280080E2B8 /* libwx_osx_cocoa_static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwx_osx_cocoa_static.a; sourceTree = BUILT_PRODUCTS_DIR; }; 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxcocoa.xcconfig; sourceTree = ""; }; + 4078700713B25D34008AFE5A /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxdebug.xcconfig; sourceTree = ""; }; + 4078700813B25D34008AFE5A /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = ""; }; D2AAC0C705546C1D00DB518D /* libwx_osx_cocoa.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwx_osx_cocoa.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -43,6 +45,8 @@ isa = PBXGroup; children = ( 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */, + 4078700713B25D34008AFE5A /* wxdebug.xcconfig */, + 4078700813B25D34008AFE5A /* wxrelease.xcconfig */, 034768DFFF38A50411DB9C8B /* Products */, ); name = wxcocoa; @@ -111,7 +115,14 @@ isa = PBXProject; buildConfigurationList = 1DEB918108733D990010E9CD /* Build configuration list for PBXProject "wxcocoa_in" */; compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 0867D691FE84028FC02AAC07 /* wxcocoa */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; @@ -174,14 +185,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; EXECUTABLE_PREFIX = lib; - GCC_DYNAMIC_NO_PIC = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS)", - "__WXDEBUG__=1", + WXUSINGDLL, ); INSTALL_PATH = "@executable_path/../Frameworks/"; OTHER_LDFLAGS = ( @@ -195,9 +202,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */; buildSettings = { - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; EXECUTABLE_PREFIX = lib; - GCC_MODEL_TUNING = G5; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(GCC_PREPROCESSOR_DEFINITIONS)", + WXUSINGDLL, + ); INSTALL_PATH = "@executable_path/../Frameworks/"; OTHER_LDFLAGS = ( "$(OTHER_LDFLAGS)", @@ -208,24 +217,16 @@ }; 1DEB918208733D990010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 4078700713B25D34008AFE5A /* wxdebug.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx10.6; WXROOT = "$(PROJECT_DIR)/../.."; }; name = Debug; }; 1DEB918308733D990010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 4078700813B25D34008AFE5A /* wxrelease.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - SDKROOT = macosx10.6; WXROOT = "$(PROJECT_DIR)/../.."; }; name = Release; @@ -234,16 +235,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(GCC_PREPROCESSOR_DEFINITIONS)", - "__WXDEBUG__=1", - ); - INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = "$(PRODUCT_NAME)_static"; }; name = Debug; @@ -252,12 +243,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = "$(PRODUCT_NAME)_static"; - ZERO_LINK = NO; }; name = Release; }; -- 2.45.2