adapting version numbers for 2.8.3, adding new file, building native arch for debug builds, adding run script for static target as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -97,6 +97,8 @@
|
|||||||
404DB2730ADD429D00687775 /* dcbufcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 404DB2710ADD429D00687775 /* dcbufcmn.cpp */; };
|
404DB2730ADD429D00687775 /* dcbufcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 404DB2710ADD429D00687775 /* dcbufcmn.cpp */; };
|
||||||
4054154E0AB6A0B000450E09 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 405415210AB6A0B000450E09 /* WebKit.framework */; };
|
4054154E0AB6A0B000450E09 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 405415210AB6A0B000450E09 /* WebKit.framework */; };
|
||||||
4054154F0AB6A0B000450E09 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 405415210AB6A0B000450E09 /* WebKit.framework */; };
|
4054154F0AB6A0B000450E09 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 405415210AB6A0B000450E09 /* WebKit.framework */; };
|
||||||
|
4059FD640BA9617F001F6B1C /* socketevtdispatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4059FD620BA9617F001F6B1C /* socketevtdispatch.cpp */; };
|
||||||
|
4059FD660BA9617F001F6B1C /* socketevtdispatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4059FD620BA9617F001F6B1C /* socketevtdispatch.cpp */; };
|
||||||
405DD168063C2BFC00F579EE /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 405DD167063C2BFC00F579EE /* libiconv.dylib */; };
|
405DD168063C2BFC00F579EE /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 405DD167063C2BFC00F579EE /* libiconv.dylib */; };
|
||||||
40607C1607493C3F00DC0420 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40607C1407493C3F00DC0420 /* archive.cpp */; };
|
40607C1607493C3F00DC0420 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40607C1407493C3F00DC0420 /* archive.cpp */; };
|
||||||
40607C1A07493C3F00DC0420 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40607C1407493C3F00DC0420 /* archive.cpp */; };
|
40607C1A07493C3F00DC0420 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40607C1407493C3F00DC0420 /* archive.cpp */; };
|
||||||
@@ -1189,6 +1191,7 @@
|
|||||||
4054137C0AB69C9300450E09 /* datavgen.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = datavgen.cpp; sourceTree = "<group>"; };
|
4054137C0AB69C9300450E09 /* datavgen.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = datavgen.cpp; sourceTree = "<group>"; };
|
||||||
405415210AB6A0B000450E09 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
|
405415210AB6A0B000450E09 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
|
||||||
405415540AB6A0D900450E09 /* datavcmn.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = datavcmn.cpp; sourceTree = "<group>"; };
|
405415540AB6A0D900450E09 /* datavcmn.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = datavcmn.cpp; sourceTree = "<group>"; };
|
||||||
|
4059FD620BA9617F001F6B1C /* socketevtdispatch.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = socketevtdispatch.cpp; sourceTree = "<group>"; };
|
||||||
405DD167063C2BFC00F579EE /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = /usr/lib/libiconv.dylib; sourceTree = "<absolute>"; };
|
405DD167063C2BFC00F579EE /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = /usr/lib/libiconv.dylib; sourceTree = "<absolute>"; };
|
||||||
40607C1407493C3F00DC0420 /* archive.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = archive.cpp; sourceTree = "<group>"; };
|
40607C1407493C3F00DC0420 /* archive.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = archive.cpp; sourceTree = "<group>"; };
|
||||||
40607C740749432A00DC0420 /* gsockosx.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = gsockosx.cpp; path = mac/corefoundation/gsockosx.cpp; sourceTree = SOURCE_ROOT; };
|
40607C740749432A00DC0420 /* gsockosx.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = gsockosx.cpp; path = mac/corefoundation/gsockosx.cpp; sourceTree = SOURCE_ROOT; };
|
||||||
@@ -2879,6 +2882,7 @@
|
|||||||
F5AC2EDE03803A3601000133 /* settcmn.cpp */,
|
F5AC2EDE03803A3601000133 /* settcmn.cpp */,
|
||||||
F5A8604A01FA022C0175ACA7 /* sizer.cpp */,
|
F5A8604A01FA022C0175ACA7 /* sizer.cpp */,
|
||||||
F5A8604B01FA022C0175ACA7 /* socket.cpp */,
|
F5A8604B01FA022C0175ACA7 /* socket.cpp */,
|
||||||
|
4059FD620BA9617F001F6B1C /* socketevtdispatch.cpp */,
|
||||||
408443F00B3274EF00485940 /* srchcmn.cpp */,
|
408443F00B3274EF00485940 /* srchcmn.cpp */,
|
||||||
40670A9407377B1000F7C08C /* sstream.cpp */,
|
40670A9407377B1000F7C08C /* sstream.cpp */,
|
||||||
0A98CB6A07146A06007B4289 /* statbar.cpp */,
|
0A98CB6A07146A06007B4289 /* statbar.cpp */,
|
||||||
@@ -3301,6 +3305,7 @@
|
|||||||
isa = PBXNativeTarget;
|
isa = PBXNativeTarget;
|
||||||
buildConfigurationList = 18B5B98A08564B5D002803C9 /* Build configuration list for PBXNativeTarget "static" */;
|
buildConfigurationList = 18B5B98A08564B5D002803C9 /* Build configuration list for PBXNativeTarget "static" */;
|
||||||
buildPhases = (
|
buildPhases = (
|
||||||
|
4059FD3C0BA95691001F6B1C /* ShellScript */,
|
||||||
4086C744063AB2FF00D4CD53 /* Headers */,
|
4086C744063AB2FF00D4CD53 /* Headers */,
|
||||||
4086C746063AB2FF00D4CD53 /* Sources */,
|
4086C746063AB2FF00D4CD53 /* Sources */,
|
||||||
4086C8C8063AB2FF00D4CD53 /* Frameworks */,
|
4086C8C8063AB2FF00D4CD53 /* Frameworks */,
|
||||||
@@ -3371,6 +3376,19 @@
|
|||||||
/* End PBXRezBuildPhase section */
|
/* End PBXRezBuildPhase section */
|
||||||
|
|
||||||
/* Begin PBXShellScriptBuildPhase section */
|
/* Begin PBXShellScriptBuildPhase section */
|
||||||
|
4059FD3C0BA95691001F6B1C /* ShellScript */ = {
|
||||||
|
isa = PBXShellScriptBuildPhase;
|
||||||
|
buildActionMask = 2147483647;
|
||||||
|
files = (
|
||||||
|
);
|
||||||
|
inputPaths = (
|
||||||
|
);
|
||||||
|
outputPaths = (
|
||||||
|
);
|
||||||
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
|
shellPath = /bin/sh;
|
||||||
|
shellScript = "$SRCROOT/../distrib/mac/pbsetup-sh \"${SRCROOT}\" \"${SYMROOT}\"";
|
||||||
|
};
|
||||||
4086CA56063AB30000D4CD53 /* ShellScript */ = {
|
4086CA56063AB30000D4CD53 /* ShellScript */ = {
|
||||||
isa = PBXShellScriptBuildPhase;
|
isa = PBXShellScriptBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
@@ -3923,6 +3941,7 @@
|
|||||||
61048A650B2756CB009C253D /* srchctrl.cpp in Sources */,
|
61048A650B2756CB009C253D /* srchctrl.cpp in Sources */,
|
||||||
61048BE90B27B7D0009C253D /* srchctlg.cpp in Sources */,
|
61048BE90B27B7D0009C253D /* srchctlg.cpp in Sources */,
|
||||||
408443F20B3274EF00485940 /* srchcmn.cpp in Sources */,
|
408443F20B3274EF00485940 /* srchcmn.cpp in Sources */,
|
||||||
|
4059FD640BA9617F001F6B1C /* socketevtdispatch.cpp in Sources */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
@@ -4466,6 +4485,7 @@
|
|||||||
61048A660B2756CB009C253D /* srchctrl.cpp in Sources */,
|
61048A660B2756CB009C253D /* srchctrl.cpp in Sources */,
|
||||||
61048BEA0B27B7D0009C253D /* srchctlg.cpp in Sources */,
|
61048BEA0B27B7D0009C253D /* srchctlg.cpp in Sources */,
|
||||||
408443F10B3274EF00485940 /* srchcmn.cpp in Sources */,
|
408443F10B3274EF00485940 /* srchcmn.cpp in Sources */,
|
||||||
|
4059FD660BA9617F001F6B1C /* socketevtdispatch.cpp in Sources */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
@@ -4489,8 +4509,8 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
DYLIB_COMPATIBILITY_VERSION = 2.6;
|
DYLIB_COMPATIBILITY_VERSION = 2.8;
|
||||||
DYLIB_CURRENT_VERSION = 2.6.0;
|
DYLIB_CURRENT_VERSION = 2.8.3;
|
||||||
GCC_INPUT_FILETYPE = automatic;
|
GCC_INPUT_FILETYPE = automatic;
|
||||||
GCC_OPTIMIZATION_LEVEL = 0;
|
GCC_OPTIMIZATION_LEVEL = 0;
|
||||||
GCC_PFE_FILE_C_DIALECTS = "c++";
|
GCC_PFE_FILE_C_DIALECTS = "c++";
|
||||||
@@ -4532,8 +4552,8 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
DYLIB_COMPATIBILITY_VERSION = 2.6;
|
DYLIB_COMPATIBILITY_VERSION = 2.8;
|
||||||
DYLIB_CURRENT_VERSION = 2.6.0;
|
DYLIB_CURRENT_VERSION = 2.8.3;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
||||||
GCC_INPUT_FILETYPE = automatic;
|
GCC_INPUT_FILETYPE = automatic;
|
||||||
GCC_PFE_FILE_C_DIALECTS = "c++";
|
GCC_PFE_FILE_C_DIALECTS = "c++";
|
||||||
@@ -4574,10 +4594,9 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
ARCHS = "$(NATIVE_ARCH)";
|
|
||||||
DEBUG_INFORMATION_FORMAT = stabs;
|
DEBUG_INFORMATION_FORMAT = stabs;
|
||||||
DYLIB_COMPATIBILITY_VERSION = 2.6;
|
DYLIB_COMPATIBILITY_VERSION = 2.8;
|
||||||
DYLIB_CURRENT_VERSION = 2.6.0;
|
DYLIB_CURRENT_VERSION = 2.8.3;
|
||||||
EXECUTABLE_PREFIX = lib;
|
EXECUTABLE_PREFIX = lib;
|
||||||
GCC_C_LANGUAGE_STANDARD = "compiler-default";
|
GCC_C_LANGUAGE_STANDARD = "compiler-default";
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
@@ -4629,8 +4648,8 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
DYLIB_COMPATIBILITY_VERSION = 2.6;
|
DYLIB_COMPATIBILITY_VERSION = 2.8;
|
||||||
DYLIB_CURRENT_VERSION = 2.6.0;
|
DYLIB_CURRENT_VERSION = 2.8.3;
|
||||||
EXECUTABLE_PREFIX = lib;
|
EXECUTABLE_PREFIX = lib;
|
||||||
GCC_C_LANGUAGE_STANDARD = "compiler-default";
|
GCC_C_LANGUAGE_STANDARD = "compiler-default";
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
||||||
@@ -4716,10 +4735,6 @@
|
|||||||
18B5B99F08564B5D002803C9 /* Development */ = {
|
18B5B99F08564B5D002803C9 /* Development */ = {
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ARCHS = (
|
|
||||||
ppc,
|
|
||||||
i386,
|
|
||||||
);
|
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_OPTIMIZATION_LEVEL = 1;
|
GCC_OPTIMIZATION_LEVEL = 1;
|
||||||
GCC_PREPROCESSOR_DEFINITIONS = "__WXDEBUG__\n";
|
GCC_PREPROCESSOR_DEFINITIONS = "__WXDEBUG__\n";
|
||||||
|
Reference in New Issue
Block a user