adaption to new configurations

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-06-23 16:05:08 +00:00
parent 5d4c2acaca
commit 175b0dbe82
3 changed files with 54 additions and 135 deletions

View File

@@ -7,9 +7,9 @@
objects = {
/* Begin PBXBuildFile section */
405B1AC310EF253300676938 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 405B1A9810EF228C00676938 /* minimal.cpp */; };
405B1AE010EF25D200676938 /* libwx_osx_cocoa_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 405B1A8C10EF202100676938 /* libwx_osx_cocoa_static.a */; };
406D458213617812000DEF25 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 405B1A9810EF228C00676938 /* minimal.cpp */; };
407A75B413B0FE67006BC2D5 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 407A75B313B0FE67006BC2D5 /* minimal.cpp */; };
407A75B513B0FE67006BC2D5 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 407A75B313B0FE67006BC2D5 /* minimal.cpp */; };
40AC73361325727300982A5C /* libwx_osx_cocoa.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 405B1A8A10EF202100676938 /* libwx_osx_cocoa.dylib */; };
40AC73371325728400982A5C /* libwx_osx_cocoa.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 405B1A8A10EF202100676938 /* libwx_osx_cocoa.dylib */; };
/* End PBXBuildFile section */
@@ -59,11 +59,13 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
405B1A7D10EF1FB100676938 /* wxcocoa.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxcocoa.xcconfig; path = ../../build/osx/wxcocoa.xcconfig; sourceTree = SOURCE_ROOT; };
405B1A8410EF202100676938 /* wxcocoa.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxcocoa.xcodeproj; path = ../../build/osx/wxcocoa.xcodeproj; sourceTree = SOURCE_ROOT; };
405B1A9810EF228C00676938 /* minimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = minimal.cpp; sourceTree = "<group>"; };
405B1ACB10EF253300676938 /* minimal_cocoa.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_cocoa.app; sourceTree = BUILT_PRODUCTS_DIR; };
40735927137088070077DE1B /* Info_cocoa.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_cocoa.plist; sourceTree = "<group>"; };
407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxcocoa.xcconfig; path = ../../build/osx/wxcocoa.xcconfig; sourceTree = SOURCE_ROOT; };
407A752313B0E1EB006BC2D5 /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxdebug.xcconfig; path = ../../build/osx/wxdebug.xcconfig; sourceTree = SOURCE_ROOT; };
407A752413B0E1EB006BC2D5 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxrelease.xcconfig; path = ../../build/osx/wxrelease.xcconfig; sourceTree = SOURCE_ROOT; };
407A75B313B0FE67006BC2D5 /* minimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = minimal.cpp; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* minimal_cocoa.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_cocoa.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@@ -99,9 +101,11 @@
29B97314FDCFA39411CA2CEA /* minimal_cocoa */ = {
isa = PBXGroup;
children = (
407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */,
407A752313B0E1EB006BC2D5 /* wxdebug.xcconfig */,
407A752413B0E1EB006BC2D5 /* wxrelease.xcconfig */,
40735927137088070077DE1B /* Info_cocoa.plist */,
405B1A8410EF202100676938 /* wxcocoa.xcodeproj */,
405B1A7D10EF1FB100676938 /* wxcocoa.xcconfig */,
405B1A9710EF227D00676938 /* src */,
19C28FACFE9D520D11CA2CBB /* Products */,
);
@@ -120,7 +124,7 @@
405B1A9710EF227D00676938 /* src */ = {
isa = PBXGroup;
children = (
405B1A9810EF228C00676938 /* minimal.cpp */,
407A75B313B0FE67006BC2D5 /* minimal.cpp */,
);
name = src;
sourceTree = "<group>";
@@ -218,7 +222,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
405B1AC310EF253300676938 /* minimal.cpp in Sources */,
407A75B413B0FE67006BC2D5 /* minimal.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -226,7 +230,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
406D458213617812000DEF25 /* minimal.cpp in Sources */,
407A75B513B0FE67006BC2D5 /* minimal.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -248,106 +252,61 @@
/* Begin XCBuildConfiguration section */
405B1AC910EF253300676938 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 405B1A7D10EF1FB100676938 /* wxcocoa.xcconfig */;
baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
"-lz",
);
PRODUCT_NAME = minimal_cocoa;
};
name = Debug;
};
405B1ACA10EF253300676938 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 405B1A7D10EF1FB100676938 /* wxcocoa.xcconfig */;
baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
"-lz",
);
PRODUCT_NAME = minimal_cocoa;
};
name = Release;
};
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 405B1A7D10EF1FB100676938 /* wxcocoa.xcconfig */;
baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_LDFLAGS = (
"-shared-libgcc",
"-framework",
WebKit,
"-framework",
IOKit,
"-framework",
Carbon,
"-framework",
Cocoa,
"-framework",
AudioToolbox,
"-framework",
OpenGL,
"-framework",
QuickTime,
);
PRODUCT_NAME = minimal_cocoa;
STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include $(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include";
};
name = Debug;
};
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 405B1A7D10EF1FB100676938 /* wxcocoa.xcconfig */;
baseConfigurationReference = 407A752213B0E1EB006BC2D5 /* wxcocoa.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = 10.4;
ALWAYS_SEARCH_USER_PATHS = YES;
PRODUCT_NAME = minimal_cocoa;
USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include $(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include";
};
name = Release;
};
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 407A752313B0E1EB006BC2D5 /* wxdebug.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = Info_cocoa.plist;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx10.6;
WXROOT = "$(PROJECT_DIR)/../..";
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 407A752413B0E1EB006BC2D5 /* wxrelease.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = Info_cocoa.plist;
PREBINDING = NO;
SDKROOT = macosx10.6;
WXROOT = "$(PROJECT_DIR)/../..";
};
name = Release;