Author: matt
Date: 2011-08-06 15:12:41 -0700 (Sat, 06 Aug 2011)
New Revision: 8922
Log:
Fluid3: removed some obsolte Xcode 4 stuff
Modified:
branches/branch-3.0/fluid/file_xcode.cxx
branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
branches/branch-3.0/ide/templates/Xcode4.tmpl
Modified: branches/branch-3.0/fluid/file_xcode.cxx
===================================================================
--- branches/branch-3.0/fluid/file_xcode.cxx 2011-08-06 22:08:13 UTC (rev
8921)
+++ branches/branch-3.0/fluid/file_xcode.cxx 2011-08-06 22:12:41 UTC (rev
8922)
@@ -97,7 +97,6 @@
fprintf(out, "\t\t%s /* Headers */ = {\n", HeadersBuildPhase);
fprintf(out, "\t\t\tisa = PBXHeadersBuildPhase;\n");
fprintf(out, "\t\t\tbuildActionMask = 2147483647;\n");
- fprintf(out, "\t\t\tcomments = \"Copy just any file here so that the Headers
link will be generated correctly.\";\n");
fprintf(out, "\t\t\tfiles = (\n");
Fl_File_Type *f;
for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
@@ -239,8 +238,8 @@
fprintf(out, "\t\t\tbuildPhases = (\n");
fprintf(out, "\t\t\t\t%s /* Resources */,\n", ResourcesBuildPhase);
fprintf(out, "\t\t\t\t%s /* Headers */,\n", HeadersBuildPhase);
- fprintf(out, "\t\t\t\tC9EDD42D1274B84100ADB21C /* CopyFiles */,\n");
// FIXME: this build phase is nonsense (this includes outdated FLTK1 headers)
- fprintf(out, "\t\t\t\tC9EDD4DD1274BB4100ADB21C /* CopyFiles */,\n");
// FIXME: this build phase is nonsense (this includes jpg and png headers)
+ //fprintf(out, "\t\t\t\tC9EDD42D1274B84100ADB21C /* CopyFiles */,\n");
// FIXME: this build phase is nonsense (this includes outdated FLTK1 headers)
+ //fprintf(out, "\t\t\t\tC9EDD4DD1274BB4100ADB21C /* CopyFiles */,\n");
// FIXME: this build phase is nonsense (this includes jpg and png headers)
fprintf(out, "\t\t\t\t4DA82C38AA0403E56A1E3545 /* Sources */,\n");
// FIXME: use generated key
fprintf(out, "\t\t\t\tD2A1AD2D93B0EED43F624520 /* Frameworks */,\n");
// FIXME: use generated key
fprintf(out, "\t\t\t);\n");
Modified: branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
===================================================================
--- branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
2011-08-06 22:08:13 UTC (rev 8921)
+++ branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
2011-08-06 22:12:41 UTC (rev 8922)
@@ -3829,40 +3829,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- C9EDD42D1274B84100ADB21C /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- comments = "Copy all FLTK headers into a custom
position within the Framework. FLTK requires a slightly different syntax
compared to regular Apple frameworks.\n\nApple (this does not work!):\n
#include <fltk/fltk.h>\n\nFLTK:\n #include <FL/Fl.H>\n\nFor the second format
to work, the following path must be added to the project:\n
/Library/Framework/fltk.framework/Headers/\n\n";
- dstPath = ../Headers/FL;
- dstSubfolderSpec = 7;
- files = (
- C9EDD4ED1274BBCD00ADB21C /* forms.H in
CopyFiles */,
- C9EDD4C91274B95700ADB21C /* Fl_BMP_Image.H in
CopyFiles */,
- C9EDD4CA1274B95700ADB21C /* Fl_GIF_Image.H in
CopyFiles */,
- C9EDD4CB1274B95700ADB21C /* Fl_Help_Dialog.H in
CopyFiles */,
- C9EDD4CC1274B95700ADB21C /* Fl_Help_View.H in
CopyFiles */,
- C9EDD4CD1274B95700ADB21C /* Fl_JPEG_Image.H in
CopyFiles */,
- C9EDD4CE1274B95700ADB21C /* Fl_PNG_Image.H in
CopyFiles */,
- C9EDD4CF1274B95700ADB21C /* Fl_PNM_Image.H in
CopyFiles */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- C9EDD4DD1274BB4100ADB21C /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- comments = "Copy some selected image headers. FLTK
requires a slightly different syntax compared to regular Apple
frameworks.\n\nApple (this does not work!):\n #include
<fltk/fltk.h>\n\nFLTK:\n #include <FL/Fl.H>\n\nFor the second format to work,
the following path must be added to the project:\n
/Library/Framework/fltk.framework/Headers/\n\n";
- dstPath = ../Headers/FL/images;
- dstSubfolderSpec = 7;
- files = (
- C9EDD4E91274BBC000ADB21C /* jconfig.h in
CopyFiles */,
- C9EDD4EA1274BBC000ADB21C /* jerror.h in
CopyFiles */,
- C9EDD4EB1274BBC000ADB21C /* jmorecfg.h in
CopyFiles */,
- C9EDD4EC1274BBC000ADB21C /* jpeglib.h in
CopyFiles */,
- C9EDD4E01274BB7000ADB21C /* png.h in CopyFiles
*/,
- C9EDD4E11274BB7000ADB21C /* pngconf.h in
CopyFiles */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
CAC749CC825FEBDDCDF3BB42 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -7199,7 +7165,6 @@
0A872A2EDF7E71BE35FEFE8E /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
- comments = "Copy just any file here so that the Headers
link will be generated correctly.";
files = (
19D0A8A7C902AE26BBC3770F /* Adjuster.h in
Sources */,
AEDF2A15FF939900A44DB5B5 /* ask.h in Sources */,
@@ -8372,8 +8337,6 @@
buildConfigurationList = F8A317C2491750F8DEF118E2 /*
Build configuration list for PBXNativeTarget "fltk" */;
buildPhases = (
1DAA0C25D4F3735866428D29 /* Resources */,
0A872A2EDF7E71BE35FEFE8E /* Headers */,
- C9EDD42D1274B84100ADB21C /* CopyFiles */,
- C9EDD4DD1274BB4100ADB21C /* CopyFiles */,
4DA82C38AA0403E56A1E3545 /* Sources */,
D2A1AD2D93B0EED43F624520 /* Frameworks */,
);
Modified: branches/branch-3.0/ide/templates/Xcode4.tmpl
===================================================================
--- branches/branch-3.0/ide/templates/Xcode4.tmpl 2011-08-06 22:08:13 UTC
(rev 8921)
+++ branches/branch-3.0/ide/templates/Xcode4.tmpl 2011-08-06 22:12:41 UTC
(rev 8922)
@@ -3501,40 +3501,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- C9EDD42D1274B84100ADB21C /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- comments = "Copy all FLTK headers into a custom
position within the Framework. FLTK requires a slightly different syntax
compared to regular Apple frameworks.\n\nApple (this does not work!):\n
##include <fltk/fltk.h>\n\nFLTK:\n ##include <FL/Fl.H>\n\nFor the second
format to work, the following path must be added to the project:\n
/Library/Framework/fltk.framework/Headers/\n\n";
- dstPath = ../Headers/FL;
- dstSubfolderSpec = 7;
- files = (
- C9EDD4ED1274BBCD00ADB21C /* forms.H in
CopyFiles */,
- C9EDD4C91274B95700ADB21C /* Fl_BMP_Image.H in
CopyFiles */,
- C9EDD4CA1274B95700ADB21C /* Fl_GIF_Image.H in
CopyFiles */,
- C9EDD4CB1274B95700ADB21C /* Fl_Help_Dialog.H in
CopyFiles */,
- C9EDD4CC1274B95700ADB21C /* Fl_Help_View.H in
CopyFiles */,
- C9EDD4CD1274B95700ADB21C /* Fl_JPEG_Image.H in
CopyFiles */,
- C9EDD4CE1274B95700ADB21C /* Fl_PNG_Image.H in
CopyFiles */,
- C9EDD4CF1274B95700ADB21C /* Fl_PNM_Image.H in
CopyFiles */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- C9EDD4DD1274BB4100ADB21C /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- comments = "Copy some selected image headers. FLTK
requires a slightly different syntax compared to regular Apple
frameworks.\n\nApple (this does not work!):\n ##include
<fltk/fltk.h>\n\nFLTK:\n ##include <FL/Fl.H>\n\nFor the second format to work,
the following path must be added to the project:\n
/Library/Framework/fltk.framework/Headers/\n\n";
- dstPath = ../Headers/FL/images;
- dstSubfolderSpec = 7;
- files = (
- C9EDD4E91274BBC000ADB21C /* jconfig.h in
CopyFiles */,
- C9EDD4EA1274BBC000ADB21C /* jerror.h in
CopyFiles */,
- C9EDD4EB1274BBC000ADB21C /* jmorecfg.h in
CopyFiles */,
- C9EDD4EC1274BBC000ADB21C /* jpeglib.h in
CopyFiles */,
- C9EDD4E01274BB7000ADB21C /* png.h in CopyFiles
*/,
- C9EDD4E11274BB7000ADB21C /* pngconf.h in
CopyFiles */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
CAC749CC825FEBDDCDF3BB42 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
