Commit 0a5c049c authored by Sam Lantinga's avatar Sam Lantinga

The scripts to generate header files are no longer necessary.

parent 911522c1
...@@ -7,18 +7,6 @@ ...@@ -7,18 +7,6 @@
objects = { objects = {
/* Begin PBXAggregateTarget section */ /* Begin PBXAggregateTarget section */
0064653F107E3D7400183915 /* Generate Header Files */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 0064655A107E3E0400183915 /* Build configuration list for PBXAggregateTarget "Generate Header Files" */;
buildPhases = (
00646544107E3D8300183915 /* Run Script to Create SDL_config.h */,
00646546107E3DB200183915 /* Run Script to Create SDL_revision.h */,
);
dependencies = (
);
name = "Generate Header Files";
productName = "Generate Header Files";
};
00B4F47112F696830084EC00 /* BuildUniversalSimulatorDevicelibSDL */ = { 00B4F47112F696830084EC00 /* BuildUniversalSimulatorDevicelibSDL */ = {
isa = PBXAggregateTarget; isa = PBXAggregateTarget;
buildConfigurationList = 00B4F47412F696B30084EC00 /* Build configuration list for PBXAggregateTarget "BuildUniversalSimulatorDevicelibSDL" */; buildConfigurationList = 00B4F47412F696B30084EC00 /* Build configuration list for PBXAggregateTarget "BuildUniversalSimulatorDevicelibSDL" */;
...@@ -37,7 +25,6 @@ ...@@ -37,7 +25,6 @@
00B4F48A12F6A69C0084EC00 /* ShellScript */, 00B4F48A12F6A69C0084EC00 /* ShellScript */,
); );
dependencies = ( dependencies = (
00B4F4B112F6A9F00084EC00 /* PBXTargetDependency */,
00B4F49712F6A7B00084EC00 /* PBXTargetDependency */, 00B4F49712F6A7B00084EC00 /* PBXTargetDependency */,
); );
name = PrepareXcodeProjectTemplate; name = PrepareXcodeProjectTemplate;
...@@ -256,13 +243,6 @@ ...@@ -256,13 +243,6 @@
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
00646547107E3DE800183915 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 0064653F107E3D7400183915;
remoteInfo = "Generate Header Files";
};
006E982A11955065001DE610 /* PBXContainerItemProxy */ = { 006E982A11955065001DE610 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
...@@ -277,13 +257,6 @@ ...@@ -277,13 +257,6 @@
remoteGlobalIDString = 00B4F47112F696830084EC00; remoteGlobalIDString = 00B4F47112F696830084EC00;
remoteInfo = BuildUniversalSimulatorDevicelibSDL; remoteInfo = BuildUniversalSimulatorDevicelibSDL;
}; };
00B4F4B012F6A9F00084EC00 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 0064653F107E3D7400183915;
remoteInfo = "Generate Header Files";
};
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */ /* Begin PBXCopyFilesBuildPhase section */
...@@ -1318,7 +1291,6 @@ ...@@ -1318,7 +1291,6 @@
buildRules = ( buildRules = (
); );
dependencies = ( dependencies = (
00646548107E3DE800183915 /* PBXTargetDependency */,
); );
name = libSDL; name = libSDL;
productName = iPhoneSDLStaticLib; productName = iPhoneSDLStaticLib;
...@@ -1345,7 +1317,6 @@ ...@@ -1345,7 +1317,6 @@
projectRoot = ../..; projectRoot = ../..;
targets = ( targets = (
FD6526620DE8FCCB002AD96B /* libSDL */, FD6526620DE8FCCB002AD96B /* libSDL */,
0064653F107E3D7400183915 /* Generate Header Files */,
006E982111955059001DE610 /* testsdl */, 006E982111955059001DE610 /* testsdl */,
00B4F47112F696830084EC00 /* BuildUniversalSimulatorDevicelibSDL */, 00B4F47112F696830084EC00 /* BuildUniversalSimulatorDevicelibSDL */,
00B4F48B12F6A69C0084EC00 /* PrepareXcodeProjectTemplate */, 00B4F48B12F6A69C0084EC00 /* PrepareXcodeProjectTemplate */,
...@@ -1371,39 +1342,6 @@ ...@@ -1371,39 +1342,6 @@
/* End PBXResourcesBuildPhase section */ /* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */
00646544107E3D8300183915 /* Run Script to Create SDL_config.h */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(SRCROOT)/../../include/SDL_config.h.default",
);
name = "Run Script to Create SDL_config.h";
outputPaths = (
"$(SRCROOT)/../../include/SDL_config.h",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Make sure that include/SDL_config.h is a symlink to SDL_config.h.default.\n# If it exists and is not a symlink, it was probably generated by configure and\n# we move it aside.\nif [ ! -L ../../include/SDL_config.h ]; then\n if [ -e ../../include/SDL_config.h ]; then\n mv ../../include/SDL_config.h ../../include/SDL_config.h.generated\n fi\n ln -s SDL_config.h.default ../../include/SDL_config.h\nfi\n";
};
00646546107E3DB200183915 /* Run Script to Create SDL_revision.h */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(SRCROOT)/../../build-scripts/showrev.sh",
"$(SRCROOT)/../../build-scripts/updaterev.sh",
);
name = "Run Script to Create SDL_revision.h";
outputPaths = (
"$(SRCROOT)/../../include/SDL_revision.h",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if test -f ~/.bash_profile; then source ~/.bash_profile; fi\nif test -f ~/.bashrc; then source ~/.bashrc; fi\nsh ../../build-scripts/updaterev.sh";
};
00B4F47012F696830084EC00 /* ShellScript */ = { 00B4F47012F696830084EC00 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
...@@ -1556,11 +1494,6 @@ ...@@ -1556,11 +1494,6 @@
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
00646548107E3DE800183915 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 0064653F107E3D7400183915 /* Generate Header Files */;
targetProxy = 00646547107E3DE800183915 /* PBXContainerItemProxy */;
};
006E982B11955065001DE610 /* PBXTargetDependency */ = { 006E982B11955065001DE610 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = FD6526620DE8FCCB002AD96B /* libSDL */; target = FD6526620DE8FCCB002AD96B /* libSDL */;
...@@ -1571,35 +1504,9 @@ ...@@ -1571,35 +1504,9 @@
target = 00B4F47112F696830084EC00 /* BuildUniversalSimulatorDevicelibSDL */; target = 00B4F47112F696830084EC00 /* BuildUniversalSimulatorDevicelibSDL */;
targetProxy = 00B4F49612F6A7B00084EC00 /* PBXContainerItemProxy */; targetProxy = 00B4F49612F6A7B00084EC00 /* PBXContainerItemProxy */;
}; };
00B4F4B112F6A9F00084EC00 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 0064653F107E3D7400183915 /* Generate Header Files */;
targetProxy = 00B4F4B012F6A9F00084EC00 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */ /* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */ /* Begin XCBuildConfiguration section */
00646540107E3D7500183915 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
PRODUCT_NAME = "Generate Header Files";
};
name = Debug;
};
00646541107E3D7500183915 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
PRODUCT_NAME = "Generate Header Files";
ZERO_LINK = NO;
};
name = Release;
};
006E98251195505B001DE610 /* Debug */ = { 006E98251195505B001DE610 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
...@@ -1753,15 +1660,6 @@ ...@@ -1753,15 +1660,6 @@
/* End XCBuildConfiguration section */ /* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */ /* Begin XCConfigurationList section */
0064655A107E3E0400183915 /* Build configuration list for PBXAggregateTarget "Generate Header Files" */ = {
isa = XCConfigurationList;
buildConfigurations = (
00646540107E3D7500183915 /* Debug */,
00646541107E3D7500183915 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
006E98271195505B001DE610 /* Build configuration list for PBXNativeTarget "testsdl" */ = { 006E98271195505B001DE610 /* Build configuration list for PBXNativeTarget "testsdl" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
......
...@@ -7,18 +7,6 @@ ...@@ -7,18 +7,6 @@
objects = { objects = {
/* Begin PBXAggregateTarget section */ /* Begin PBXAggregateTarget section */
002D2A9E106C18E700BF972E /* Generate Header Files */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 002D2AAA106C198E00BF972E /* Build configuration list for PBXAggregateTarget "Generate Header Files" */;
buildPhases = (
002D2AA5106C190C00BF972E /* Run Script to Create SDL_config.h */,
002D2AA7106C194100BF972E /* Run Script to Create SDL_revision.h */,
);
dependencies = (
);
name = "Generate Header Files";
productName = "Generate Header Files";
};
0083103F1072EA5700A531F1 /* Generate Doxygen DocSet */ = { 0083103F1072EA5700A531F1 /* Generate Doxygen DocSet */ = {
isa = PBXAggregateTarget; isa = PBXAggregateTarget;
buildConfigurationList = 008310471072EAAE00A531F1 /* Build configuration list for PBXAggregateTarget "Generate Doxygen DocSet" */; buildConfigurationList = 008310471072EAAE00A531F1 /* Build configuration list for PBXAggregateTarget "Generate Doxygen DocSet" */;
...@@ -568,20 +556,6 @@ ...@@ -568,20 +556,6 @@
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
002D2AA8106C196E00BF972E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 002D2A9E106C18E700BF972E;
remoteInfo = "Generate Header Files";
};
002D2AAB106C19B200BF972E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 002D2A9E106C18E700BF972E;
remoteInfo = "Generate Header Files";
};
008310451072EA9000A531F1 /* PBXContainerItemProxy */ = { 008310451072EA9000A531F1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
...@@ -2100,7 +2074,6 @@ ...@@ -2100,7 +2074,6 @@
); );
comments = "We recommend installing to /Library/Frameworks\nAn alternative is $(HOME)/Library/Frameworks for per-user if permissions are an issue.\n\nAdd the framework to the Groups & Files panel (under Linked Frameworks is a good place) and enable the check box for the targets that need to link to it. You can also manually add \"-framework SDL\" to your linker flags if you don't like the check box system.\n\nAdd /Library/Frameworks/SDL.framework/Headers to your header search path\nAdd /Library/Frameworks to your library search path\n(Adjust the two above if installed in $(HOME)/Library/Frameworks. You can also list both paths if you want robustness.)\n\nWe used to use an exports file. It was becoming a maintenance issue we kept neglecting, so we have removed it. If you need it back, set the \"Exported Symbols File\" option to:\n../../src/main/macosx/exports/SDL.x\n(You may need to regenerate the exports list. There is a Makefile in that directory that you can run from the command line to rebuild it.)\nLong term, we want to utilize gcc 4.0's new visibility feature (analogous to declspec on Windows). Other platforms would benefit from this change too. The downside is that we still use gcc 3.3 for the PowerPC build here so only our x86 builds will cull the symbols if we go down this route (and don't use the exports file).\n\n"; comments = "We recommend installing to /Library/Frameworks\nAn alternative is $(HOME)/Library/Frameworks for per-user if permissions are an issue.\n\nAdd the framework to the Groups & Files panel (under Linked Frameworks is a good place) and enable the check box for the targets that need to link to it. You can also manually add \"-framework SDL\" to your linker flags if you don't like the check box system.\n\nAdd /Library/Frameworks/SDL.framework/Headers to your header search path\nAdd /Library/Frameworks to your library search path\n(Adjust the two above if installed in $(HOME)/Library/Frameworks. You can also list both paths if you want robustness.)\n\nWe used to use an exports file. It was becoming a maintenance issue we kept neglecting, so we have removed it. If you need it back, set the \"Exported Symbols File\" option to:\n../../src/main/macosx/exports/SDL.x\n(You may need to regenerate the exports list. There is a Makefile in that directory that you can run from the command line to rebuild it.)\nLong term, we want to utilize gcc 4.0's new visibility feature (analogous to declspec on Windows). Other platforms would benefit from this change too. The downside is that we still use gcc 3.3 for the PowerPC build here so only our x86 builds will cull the symbols if we go down this route (and don't use the exports file).\n\n";
dependencies = ( dependencies = (
002D2AA9106C196E00BF972E /* PBXTargetDependency */,
); );
name = Framework; name = Framework;
productInstallPath = "@executable_path/../Frameworks"; productInstallPath = "@executable_path/../Frameworks";
...@@ -2121,7 +2094,6 @@ ...@@ -2121,7 +2094,6 @@
); );
comments = "This produces libsdl.a, which is the static build of SDL. You will have to link to the Cocoa and OpenGL frameworks in your application."; comments = "This produces libsdl.a, which is the static build of SDL. You will have to link to the Cocoa and OpenGL frameworks in your application.";
dependencies = ( dependencies = (
002D2AAC106C19B200BF972E /* PBXTargetDependency */,
); );
name = "Static Library"; name = "Static Library";
productInstallPath = /usr/local/lib; productInstallPath = /usr/local/lib;
...@@ -2187,7 +2159,6 @@ ...@@ -2187,7 +2159,6 @@
BECDF66D0761BA81005FE872 /* Static Library */, BECDF66D0761BA81005FE872 /* Static Library */,
BECDF6BB0761BA81005FE872 /* Standard DMG */, BECDF6BB0761BA81005FE872 /* Standard DMG */,
BECDF6C00761BA81005FE872 /* Developer Extras Package */, BECDF6C00761BA81005FE872 /* Developer Extras Package */,
002D2A9E106C18E700BF972E /* Generate Header Files */,
0083103F1072EA5700A531F1 /* Generate Doxygen DocSet */, 0083103F1072EA5700A531F1 /* Generate Doxygen DocSet */,
00D8D9EE1195090700638393 /* testsdl */, 00D8D9EE1195090700638393 /* testsdl */,
); );
...@@ -2230,39 +2201,6 @@ ...@@ -2230,39 +2201,6 @@
/* End PBXRezBuildPhase section */ /* End PBXRezBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */
002D2AA5106C190C00BF972E /* Run Script to Create SDL_config.h */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(SRCROOT)/../../include/SDL_config.h.default",
);
name = "Run Script to Create SDL_config.h";
outputPaths = (
"$(SRCROOT)/../../include/SDL_config.h",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Make sure that include/SDL_config.h is a symlink to SDL_config.h.default.\n# If it exists and is not a symlink, it was probably generated by configure and\n# we move it aside.\nif [ ! -L ../../include/SDL_config.h ]; then\n if [ -e ../../include/SDL_config.h ]; then\n mv ../../include/SDL_config.h ../../include/SDL_config.h.generated\n fi\n ln -s SDL_config.h.default ../../include/SDL_config.h\nfi\n";
};
002D2AA7106C194100BF972E /* Run Script to Create SDL_revision.h */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(SRCROOT)/../../build-scripts/showrev.sh",
"$(SRCROOT)/../../build-scripts/updaterev.sh",
);
name = "Run Script to Create SDL_revision.h";
outputPaths = (
"$(SRCROOT)/../../include/SDL_revision.h",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# The official HG installer puts the binary in /usr/local/bin, so add that\n# to Xcode's path and see if the hg executable is found. Otherwise, source\n# the user's bash settings file as a last resort.\nPATH=$PATH:/usr/local/bin\nif ! which -s hg ; then\n if test -f ~/.bash_profile; then source ~/.bash_profile; fi\nfi\nsh ../../build-scripts/updaterev.sh\n";
};
0083103E1072EA5700A531F1 /* ShellScript */ = { 0083103E1072EA5700A531F1 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
...@@ -2556,16 +2494,6 @@ ...@@ -2556,16 +2494,6 @@
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
002D2AA9106C196E00BF972E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 002D2A9E106C18E700BF972E /* Generate Header Files */;
targetProxy = 002D2AA8106C196E00BF972E /* PBXContainerItemProxy */;
};
002D2AAC106C19B200BF972E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 002D2A9E106C18E700BF972E /* Generate Header Files */;
targetProxy = 002D2AAB106C19B200BF972E /* PBXContainerItemProxy */;
};
008310461072EA9000A531F1 /* PBXTargetDependency */ = { 008310461072EA9000A531F1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = 0083103F1072EA5700A531F1 /* Generate Doxygen DocSet */; target = 0083103F1072EA5700A531F1 /* Generate Doxygen DocSet */;
...@@ -2584,41 +2512,6 @@ ...@@ -2584,41 +2512,6 @@
/* End PBXTargetDependency section */ /* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */ /* Begin XCBuildConfiguration section */
002D2A9F106C18E700BF972E /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "Generate Header Files";
};
name = Deployment_for_official_releases_using_10.4SDK_and_10.6SDK;
};
002D2AA0106C18E700BF972E /* Development_using_10.4SDK_and_10.6SDK */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "Generate Header Files";
};
name = Development_using_10.4SDK_and_10.6SDK;
};
002D2AA1106C18E700BF972E /* Development_native_only */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "Generate Header Files";
};
name = Development_native_only;
};
002D2AA2106C18E700BF972E /* Deployment_native_only */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "Generate Header Files";
};
name = Deployment_native_only;
};
002D2AA3106C18E700BF972E /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = "Generate Header Files";
};
name = Default;
};
0073177B0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */ = { 0073177B0858DB0500B2BC32 /* Development_using_10.4SDK_and_10.6SDK */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
...@@ -3217,18 +3110,6 @@ ...@@ -3217,18 +3110,6 @@
/* End XCBuildConfiguration section */ /* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */ /* Begin XCConfigurationList section */
002D2AAA106C198E00BF972E /* Build configuration list for PBXAggregateTarget "Generate Header Files" */ = {
isa = XCConfigurationList;
buildConfigurations = (
002D2A9F106C18E700BF972E /* Deployment_for_official_releases_using_10.4SDK_and_10.6SDK */,
002D2AA0106C18E700BF972E /* Development_using_10.4SDK_and_10.6SDK */,
002D2AA1106C18E700BF972E /* Development_native_only */,
002D2AA2106C18E700BF972E /* Deployment_native_only */,
002D2AA3106C18E700BF972E /* Default */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
};
0073177A0858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Framework" */ = { 0073177A0858DB0500B2BC32 /* Build configuration list for PBXNativeTarget "Framework" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment