summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2006-05-26 19:13:08 (GMT)
committerdas <das>2006-05-26 19:13:08 (GMT)
commit55499b3781b3e60087544ae1ba490a37ded1b1b8 (patch)
tree5c9a9745a2f38dbd9fadcfa8fe0307dc67a50e47
parent5c66a5850373f56f3df3950dc5007ed4c21dd4a6 (diff)
downloadtk-55499b3781b3e60087544ae1ba490a37ded1b1b8.zip
tk-55499b3781b3e60087544ae1ba490a37ded1b1b8.tar.gz
tk-55499b3781b3e60087544ae1ba490a37ded1b1b8.tar.bz2
updates for Xcode 2.3
-rw-r--r--macosx/Wish.xcodeproj/default.pbxuser1
-rw-r--r--macosx/Wish.xcodeproj/project.pbxproj31
2 files changed, 4 insertions, 28 deletions
diff --git a/macosx/Wish.xcodeproj/default.pbxuser b/macosx/Wish.xcodeproj/default.pbxuser
index b2ef545..3625a77 100644
--- a/macosx/Wish.xcodeproj/default.pbxuser
+++ b/macosx/Wish.xcodeproj/default.pbxuser
@@ -2,7 +2,6 @@
{
08FB7793FE84155DC02AAC07 /* Project object */ = {
activeBuildConfigurationName = Debug;
- activeBuildStyle = 014CEA520018CE5811CA2923 /* Development */;
activeExecutable = F9E61D1C090A4282002B3151 /* Wish */;
activeTarget = F9E61D16090A3E94002B3151 /* Tk */;
codeSenseManager = F944EB9D08F798180049FDD4 /* Code sense */;
diff --git a/macosx/Wish.xcodeproj/project.pbxproj b/macosx/Wish.xcodeproj/project.pbxproj
index 39e7dde..1cf376e 100644
--- a/macosx/Wish.xcodeproj/project.pbxproj
+++ b/macosx/Wish.xcodeproj/project.pbxproj
@@ -283,21 +283,6 @@
F9EA4AF408FA3BDB00B1F5F0 /* tkAboutDlg.r in Rez */ = {isa = PBXBuildFile; fileRef = F966BBC108F27A3B005CB29B /* tkAboutDlg.r */; };
/* End PBXBuildFile section */
-/* Begin PBXBuildStyle section */
- 014CEA520018CE5811CA2923 /* Development */ = {
- isa = PBXBuildStyle;
- buildSettings = {
- };
- name = Development;
- };
- 014CEA530018CE5811CA2923 /* Deployment */ = {
- isa = PBXBuildStyle;
- buildSettings = {
- };
- name = Deployment;
- };
-/* End PBXBuildStyle section */
-
/* Begin PBXFileReference section */
8DD76FB20486AB0100D96B5E /* tktest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tktest; sourceTree = BUILT_PRODUCTS_DIR; };
F93E5EFD09CF8711008FA367 /* tkMacOSXFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tkMacOSXFont.h; sourceTree = "<group>"; };
@@ -3272,8 +3257,6 @@
buildConfigurationList = F95CC8AB09158F3100EA5ACE /* Build configuration list for PBXLegacyTarget "Tk" */;
buildPhases = (
);
- buildSettings = {
- };
buildToolPath = /bin/bash;
buildWorkingDirectory = "${SRCROOT}";
dependencies = (
@@ -3298,8 +3281,6 @@
);
buildRules = (
);
- buildSettings = {
- };
dependencies = (
);
name = tktest;
@@ -3314,12 +3295,6 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = F95CC8B509158F3100EA5ACE /* Build configuration list for PBXProject "Wish" */;
- buildSettings = {
- };
- buildStyles = (
- 014CEA520018CE5811CA2923 /* Development */,
- 014CEA530018CE5811CA2923 /* Deployment */,
- );
hasScannedForEncodings = 1;
mainGroup = 08FB7794FE84155DC02AAC07 /* Wish */;
projectDirPath = "";
@@ -3356,11 +3331,11 @@
"${REZ_COLLECTOR_DIR}/${PRODUCT_NAME}.rsrc",
);
outputPaths = (
- "${TEMP_DIR}/stamp",
+ "${TARGET_TEMP_DIR}/stamp",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "touch -t $(date -r $(expr $(date '+%s') + 5) '+%Y%m%d%H%M.%S') \"${TEMP_DIR}/stamp\"\n\n## Xcode bug workaround: Rezzing does not take place for commandline tool targets\n## even when a ResourceManager Resources phase is present, but this script phase's\n## input dependency on the final merged resource file forces the Rezzing.\n\nif [ \"${ZERO_LINK}\" = \"YES\" ]; then\n ## ZeroLinking ignores OTHER_LDFLAGS, so our resource file doesn't get linked into the executable.\n ## workaround: copy resource data into resource fork of zerolink launcher (will only work on HFS+).\n cp -f \"${SCRIPT_INPUT_FILE_1}\" \"${SCRIPT_INPUT_FILE_0}/..namedfork/rsrc\"\nfi\n";
+ shellScript = "touch -t $(date -r $(expr $(date '+%s') + 5) '+%Y%m%d%H%M.%S') \"${TARGET_TEMP_DIR}/stamp\"\n\n## Xcode bug workaround: Rezzing does not take place for commandline tool targets\n## even when a ResourceManager Resources phase is present, but this script phase's\n## input dependency on the final merged resource file forces the Rezzing.\n\nif [ \"${ZERO_LINK}\" = \"YES\" ]; then\n ## ZeroLinking ignores OTHER_LDFLAGS, so our resource file doesn't get linked into the executable.\n ## workaround: copy resource data into resource fork of zerolink launcher (will only work on HFS+).\n cp -f \"${SCRIPT_INPUT_FILE_1}\" \"${SCRIPT_INPUT_FILE_0}/..namedfork/rsrc\"\nfi\n";
};
F9A5C5F508F651A2008AE941 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -3840,6 +3815,7 @@
BINDIR = "${PREFIX}/bin";
CONFIGURE_ARGS = "--enable-threads ${CONFIGURE_ARGS}";
DEAD_CODE_STRIPPING = NO;
+ DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = NO;
GCC_DEBUGGING_SYMBOLS = default;
GCC_DYNAMIC_NO_PIC = YES;
@@ -3978,6 +3954,7 @@
BINDIR = "${PREFIX}/bin";
CONFIGURE_ARGS = "--enable-threads ${CONFIGURE_ARGS}";
DEAD_CODE_STRIPPING = NO;
+ DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = NO;
GCC_DEBUGGING_SYMBOLS = default;
GCC_DYNAMIC_NO_PIC = YES;