Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove wxOSX/Carbon support.

Browse Source 
Cocoa has been the default toolkit in wxWidgets for a long time. There is really no good reason to use Carbon in 2016 and this removes a lot of unused and unmaintained code.
This commit is contained in:
Tobias Taschner
2016-01-22 15:40:58 +01:00
parent 8d42890df4
commit 5ba67c67e4
144 changed files with 75 additions and 35011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/osx/makeprojects.applescript
View File

@@ -244,10 +244,6 @@ set theProject to {projectName:"", conditions:{}, bklfiles:{¬
{label:"libscintilla", entries:{"$(wxscintilla)"}, targets:{"dynamic", "static", "wxscintilla"}}, ¬
{label:"libexpat", entries:{"$(wxexpat)"}, targets:{"dynamic", "static", "wxexpat"}} ¬
}}
set conditions of theProject to {"PLATFORM_MACOSX=='1'", "TOOLKIT=='OSX_CARBON'", "WXUNIV=='0'", "USE_GUI=='1' and WXUNIV=='0'"}
set projectName of theProject to "wxcarbon"
makeProject(theProject)
set conditions of theProject to {"PLATFORM_MACOSX=='1'", "TOOLKIT=='OSX_COCOA'", "WXUNIV=='0'", "USE_GUI=='1' and WXUNIV=='0'"}
set projectName of theProject to "wxcocoa"

2
build/osx/readme.txt
View File

@@ -17,7 +17,7 @@ reads in the files lists from the files.bkl in the build/bakefiles directory, ev
conditions in these definitions and then adds the correct files to the newly created Xcode
projects
if you only need a specific target and not all three of them (carbon, cocoa, iphone) then you can
if you only need a specific target and not all of them (cocoa, iphone) then you can
comment the unneeded makeProject calls.
Prerequisites

15
build/osx/wxcarbon.xcconfig
View File

@@ -1,15 +0,0 @@
WXTOOLKIT = carbon
WXTOOLKITUPPER = CARBON
#include "wx.xcconfig"
MACOSX_DEPLOYMENT_TARGET = 10.5
SDKROOT = macosx10.6
GCC_VERSION[arch=ppc] = 4.0
ARCHS = ppc i386
VALID_ARCHS = ppc i386
OTHER_LDFLAGS = -framework WebKit -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework AGL -framework OpenGL -framework QuickTime

5694
build/osx/wxcarbon.xcodeproj/project.pbxproj
View File

File diff suppressed because it is too large Load Diff

287
build/osx/wxcarbon_in.xcodeproj/project.pbxproj
View File

@@ -1,287 +0,0 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 45;
objects = {
/* Begin PBXFileReference section */
404BEE6110EC83280080E2B8 /* libwx_osx_carbon_static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwx_osx_carbon_static.a; sourceTree = BUILT_PRODUCTS_DIR; };
409C323613B27E1D0009CB3C /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxdebug.xcconfig; sourceTree = "<group>"; };
409C323713B27E1D0009CB3C /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = "<group>"; };
40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxcarbon.xcconfig; sourceTree = "<group>"; };
D2AAC0C705546C1D00DB518D /* libwx_osx_carbon.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwx_osx_carbon.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
404BEE5F10EC83280080E2B8 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
D2AAC0C505546C1D00DB518D /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
034768DFFF38A50411DB9C8B /* Products */ = {
isa = PBXGroup;
children = (
D2AAC0C705546C1D00DB518D /* libwx_osx_carbon.dylib */,
404BEE6110EC83280080E2B8 /* libwx_osx_carbon_static.a */,
);
name = Products;
sourceTree = "<group>";
};
0867D691FE84028FC02AAC07 /* wxcocoa */ = {
isa = PBXGroup;
children = (
40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */,
409C323613B27E1D0009CB3C /* wxdebug.xcconfig */,
409C323713B27E1D0009CB3C /* wxrelease.xcconfig */,
034768DFFF38A50411DB9C8B /* Products */,
);
name = wxcocoa;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
404BEE5D10EC83280080E2B8 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
D2AAC0C305546C1D00DB518D /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
404BEE6010EC83280080E2B8 /* static */ = {
isa = PBXNativeTarget;
buildConfigurationList = 404BEE6410EC83480080E2B8 /* Build configuration list for PBXNativeTarget "static" */;
buildPhases = (
404B023E10EC882E0080E2B8 /* ShellScript */,
404BEE5D10EC83280080E2B8 /* Headers */,
404BEE5E10EC83280080E2B8 /* Sources */,
404BEE5F10EC83280080E2B8 /* Frameworks */,
);
buildRules = (
);
dependencies = (
);
name = static;
productName = static;
productReference = 404BEE6110EC83280080E2B8 /* libwx_osx_carbon_static.a */;
productType = "com.apple.product-type.library.static";
};
D2AAC0C605546C1D00DB518D /* dynamic */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1DEB917D08733D990010E9CD /* Build configuration list for PBXNativeTarget "dynamic" */;
buildPhases = (
404B023C10EC88180080E2B8 /* ShellScript */,
D2AAC0C305546C1D00DB518D /* Headers */,
D2AAC0C405546C1D00DB518D /* Sources */,
D2AAC0C505546C1D00DB518D /* Frameworks */,
);
buildRules = (
);
dependencies = (
);
name = dynamic;
productName = wxcocoa;
productReference = D2AAC0C705546C1D00DB518D /* libwx_osx_carbon.dylib */;
productType = "com.apple.product-type.library.dynamic";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 1DEB918108733D990010E9CD /* Build configuration list for PBXProject "wxcarbon_in" */;
compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
);
mainGroup = 0867D691FE84028FC02AAC07 /* wxcocoa */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
D2AAC0C605546C1D00DB518D /* dynamic */,
404BEE6010EC83280080E2B8 /* static */,
);
};
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
404B023C10EC88180080E2B8 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${WXROOT}/distrib/mac/pbsetup-sh\" \"${WXROOT}/src\" \"${WXROOT}/build/osx/setup/${WXTOOLKIT}\"";
};
404B023E10EC882E0080E2B8 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${WXROOT}/distrib/mac/pbsetup-sh\" \"${WXROOT}/src\" \"${WXROOT}/build/osx/setup/${WXTOOLKIT}\"";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
404BEE5E10EC83280080E2B8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
D2AAC0C405546C1D00DB518D /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */
1DEB917E08733D990010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */;
buildSettings = {
EXECUTABLE_PREFIX = lib;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
WXMAKINGDLL,
"wxUSE_BASE=1",
);
INSTALL_PATH = "@executable_path/../Frameworks/";
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
};
name = Debug;
};
1DEB917F08733D990010E9CD /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */;
buildSettings = {
EXECUTABLE_PREFIX = lib;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
WXMAKINGDLL,
"wxUSE_BASE=1",
);
INSTALL_PATH = "@executable_path/../Frameworks/";
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
};
name = Release;
};
1DEB918208733D990010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 409C323613B27E1D0009CB3C /* wxdebug.xcconfig */;
buildSettings = {
WXROOT = "$(PROJECT_DIR)/../..";
};
name = Debug;
};
1DEB918308733D990010E9CD /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 409C323713B27E1D0009CB3C /* wxrelease.xcconfig */;
buildSettings = {
WXROOT = "$(PROJECT_DIR)/../..";
};
name = Release;
};
404BEE6210EC832A0080E2B8 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */;
buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
"wxUSE_BASE=1",
);
PRODUCT_NAME = "$(PRODUCT_NAME)_static";
};
name = Debug;
};
404BEE6310EC832A0080E2B8 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */;
buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
"wxUSE_BASE=1",
);
PRODUCT_NAME = "$(PRODUCT_NAME)_static";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
1DEB917D08733D990010E9CD /* Build configuration list for PBXNativeTarget "dynamic" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB917E08733D990010E9CD /* Debug */,
1DEB917F08733D990010E9CD /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
1DEB918108733D990010E9CD /* Build configuration list for PBXProject "wxcarbon_in" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1DEB918208733D990010E9CD /* Debug */,
1DEB918308733D990010E9CD /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
404BEE6410EC83480080E2B8 /* Build configuration list for PBXNativeTarget "static" */ = {
isa = XCConfigurationList;
buildConfigurations = (
404BEE6210EC832A0080E2B8 /* Debug */,
404BEE6310EC832A0080E2B8 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
}