Author: matt
Date: 2011-08-06 15:08:13 -0700 (Sat, 06 Aug 2011)
New Revision: 8921
Log:
Fluid3: and more Xcode4 support
Modified:
branches/branch-3.0/fltk.flw
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/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2011-08-06 21:49:08 UTC (rev 8920)
+++ branches/branch-3.0/fltk.flw 2011-08-06 22:08:13 UTC (rev 8921)
@@ -207,6 +207,8 @@
uuid_Xcode4_DebugBuildConfiguration {034870F2-FE15-4D23-AD0D-62ED38449392}
uuid_Xcode4_ReleaseBuildConfiguration
{D584B52C-FED3-4E71-A47E-A60BA05375B9}
uuid_Xcode4_ResourcesBuildPhase {1DAA0C25-90AF-445C-A814-DB4C66428D29}
+ uuid_Xcode4_HeadersBuildPhase {0A872A2E-9DB3-42CD-A238-D38635FEFE8E}
+ uuid_Xcode4_FluidBuildRule {21280AFA-1D23-477C-9F1C-641693104B3F}
} {
folder Headers {open
} {
Modified: branches/branch-3.0/fluid/file_xcode.cxx
===================================================================
--- branches/branch-3.0/fluid/file_xcode.cxx 2011-08-06 21:49:08 UTC (rev
8920)
+++ branches/branch-3.0/fluid/file_xcode.cxx 2011-08-06 22:08:13 UTC (rev
8921)
@@ -90,6 +90,32 @@
}
+static int writeHeadersBuildPhase(FILE *out, Fl_Target_Type *tgt) {
+
+ char HeadersBuildPhase[32]; strcpy(HeadersBuildPhase,
tgt->get_UUID_Xcode("Xcode4_HeadersBuildPhase"));
+
+ 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)) {
+ if (f->builds_in(FL_ENV_XC4) && f->is_header()) {
+ char PBXBuildFile[32]; strcpy(PBXBuildFile,
f->get_UUID_Xcode("Xcode4_PBXBuildFile"));
+ fprintf(out, "\t\t\t\t%s /* %s in %s */,\n",
+ PBXBuildFile,
+ f->filename_name(),
+ "Sources");
+ }
+ }
+ fprintf(out, "\t\t\t);\n");
+ fprintf(out, "\t\t\trunOnlyForDeploymentPostprocessing = 0;\n");
+ fprintf(out, "\t\t};\n");
+ return 0;
+}
+
+
static int writeBuildConfigurations(FILE *out, const char *debugKey, const
char *releaseKey, const char *productName) {
// Write the Debug Build Configuration
fprintf(out, "\t\t%s /* Debug */ = {\n", debugKey);
@@ -172,6 +198,7 @@
return 0;
}
+
static int writeBuildConfigurationList(FILE *out, const char *listKey, const
char *debugKey, const char *releaseKey, const char *productName) {
fprintf(out, "\t\t%s /* Build configuration list for PBXNativeTarget \"%s\"
*/ = {\n", listKey, productName);
fprintf(out, "\t\t\tisa = XCConfigurationList;\n");
@@ -185,6 +212,7 @@
return 0;
}
+
static int writeResourcesBuildPhase(FILE *out, const char *key, const char
*productName) {
fprintf(out, "\t\t%s /* Resources */ = {\n", key);
fprintf(out, "\t\t\tisa = PBXResourcesBuildPhase;\n");
@@ -202,20 +230,22 @@
char buildConfigurationList[32]; strcpy(buildConfigurationList,
tgt->get_UUID_Xcode("Xcode4_BuildConfigurationList"));
char ResourcesBuildPhase[32]; strcpy(ResourcesBuildPhase,
tgt->get_UUID_Xcode("Xcode4_ResourcesBuildPhase"));
+ char HeadersBuildPhase[32]; strcpy(HeadersBuildPhase,
tgt->get_UUID_Xcode("Xcode4_HeadersBuildPhase"));
+ char FluidBuildRule[32]; strcpy(FluidBuildRule,
tgt->get_UUID_Xcode("Xcode4_FluidBuildRule"));
fprintf(out, "\t\tA57FDE871C99A52BEEDEE68C /* %s */ = {\n", tgt->name());
// FIXME: use generated key
fprintf(out, "\t\t\tisa = PBXNativeTarget;\n");
fprintf(out, "\t\t\tbuildConfigurationList = %s /* Build configuration list
for PBXNativeTarget \"%s\" */;", buildConfigurationList, tgt->name());
fprintf(out, "\t\t\tbuildPhases = (\n");
fprintf(out, "\t\t\t\t%s /* Resources */,\n", ResourcesBuildPhase);
- fprintf(out, "\t\t\t\tC9EDD5C81274C6BA00ADB21C /* Headers */,\n");
// FIXME: use generated key
- fprintf(out, "\t\t\t\tC9EDD42D1274B84100ADB21C /* CopyFiles */,\n");
// FIXME: use generated key
- fprintf(out, "\t\t\t\tC9EDD4DD1274BB4100ADB21C /* CopyFiles */,\n");
// FIXME: use generated key
+ 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\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");
fprintf(out, "\t\tbuildRules = (\n");
- fprintf(out, "\t\t\t\tEFFAAB905A54B0BFE13CB56C /* PBXBuildRule */,\n");
// FIXME: use generated key
+ fprintf(out, "\t\t\t\t%s /* PBXBuildRule */,\n", FluidBuildRule);
fprintf(out, "\t\t\t);\n");
fprintf(out, "\t\t\tdependencies = (\n");
fprintf(out, "\t\t\t);\n");
@@ -225,7 +255,27 @@
fprintf(out, "\t\t\tproductType = \"com.apple.product-type.framework\";\n");
fprintf(out, "\t\t};\n");
+ return 0;
+}
+
+
+static int writeFluidBuildRule(FILE *out, Fl_Target_Type *tgt) {
+ char FluidBuildRule[32]; strcpy(FluidBuildRule,
tgt->get_UUID_Xcode("Xcode4_FluidBuildRule"));
+
+ fprintf(out, "\t\t%s /* PBXBuildRule */ = {\n", FluidBuildRule);
+ fprintf(out, "\t\t\tisa = PBXBuildRule;\n");
+ fprintf(out, "\t\t\tcompilerSpec = com.apple.compilers.proxy.script;\n");
+ fprintf(out, "\t\t\tfilePatterns = \"*.fl\";\n");
+ fprintf(out, "\t\t\tfileType = pattern.proxy;\n");
+ fprintf(out, "\t\t\tisEditable = 1;\n");
+ fprintf(out, "\t\t\toutputFiles = (\n");
+ fprintf(out, "\t\t\t\t\"${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.cxx\",\n");
+ fprintf(out, "\t\t\t\t\"${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.h\",\n");
+ fprintf(out, "\t\t\t);\n");
+ fprintf(out, "\t\t\tscript = \"export
DYLD_FRAMEWORK_PATH=${TARGET_BUILD_DIR} && cd ${INPUT_FILE_DIR} &&
${TARGET_BUILD_DIR}/Fluid.app/Contents/MacOS/Fluid -c ${INPUT_FILE_NAME}\";\n");
+ fprintf(out, "\t\t};\n");
+
return 0;
}
@@ -334,17 +384,8 @@
}
hash = strchr(hash, ';')+1;
} else if (strncmp(hash, "#HeadersBuildPhase(", 19)==0) {
- Fl_Type *tgt = Fl_Target_Type::find(hash+19, ')');
- Fl_File_Type *f;
- for (f = Fl_File_Type::first_file(tgt); f; f = f->next_file(tgt)) {
- if (f->builds_in(FL_ENV_XC4) && f->is_header()) {
- char PBXBuildFile[32]; strcpy(PBXBuildFile,
f->get_UUID_Xcode("Xcode4_PBXBuildFile"));
- fprintf(out, "\t\t\t\t%s /* %s in %s */,\n",
- PBXBuildFile,
- f->filename_name(),
- "Sources");
- }
- }
+ Fl_Target_Type *tgt = Fl_Target_Type::find(hash+19, ')');
+ writeHeadersBuildPhase(out, tgt);
hash = strchr(hash, ';')+1;
} else if (strncmp(hash, "#SourcesBuildPhase(", 19)==0) {
Fl_Type *tgt = Fl_Target_Type::find(hash+19, ')');
@@ -381,6 +422,10 @@
Fl_Target_Type *tgt = Fl_Target_Type::find(hash+14, ')');
writeNativeTarget(out, tgt);
hash = strchr(hash, ';')+1;
+ } else if (strncmp(hash, "#FluidBuildRule(", 16)==0) {
+ Fl_Target_Type *tgt = Fl_Target_Type::find(hash+16, ')');
+ writeFluidBuildRule(out, tgt);
+ hash = strchr(hash, ';')+1;
} else {
#if 0
fltk.framework starts here: A57FDE871C99A52BEEDEE68C
Modified: branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
===================================================================
--- branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
2011-08-06 21:49:08 UTC (rev 8920)
+++ branches/branch-3.0/ide/Xcode4/FLTK.xcodeproj/project.pbxproj
2011-08-06 22:08:13 UTC (rev 8921)
@@ -1802,7 +1802,7 @@
);
script = "export
DYLD_FRAMEWORK_PATH=${TARGET_BUILD_DIR} && cd ${INPUT_FILE_DIR} &&
${TARGET_BUILD_DIR}/Fluid.app/Contents/MacOS/Fluid -c ${INPUT_FILE_NAME}";
};
- EFFAAB905A54B0BFE13CB56C /* PBXBuildRule */ = {
+ 21280AFA5A5FFB0A93104B3F /* PBXBuildRule */ = {
isa = PBXBuildRule;
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.fl";
@@ -7196,7 +7196,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- C9EDD5C81274C6BA00ADB21C /* Headers */ = {
+ 0A872A2EDF7E71BE35FEFE8E /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
comments = "Copy just any file here so that the Headers
link will be generated correctly.";
@@ -7345,133 +7345,6 @@
8AF480EABBE7FF5A8600CB70 /* XBMImage.h in
Sources */,
DAEEEDE3D6ACA97F2BB29021 /* XPMImage.h in
Sources */,
A0588617922660404DBCBAA2 /* Xutf8.h in Sources
*/,
- C915E2DA1382D8ED00C5FD27 /* Enumerations.H in
Headers */,
- C915E2DB1382D8ED00C5FD27 /* Fl.H in Headers */,
- C915E2DC1382D8ED00C5FD27 /* Fl_Adjuster.H in
Headers */,
- C915E2DD1382D8ED00C5FD27 /* Fl_Bitmap.H in
Headers */,
- C915E2DE1382D8ED00C5FD27 /* Fl_Box.H in Headers
*/,
- C915E2DF1382D8ED00C5FD27 /* Fl_Browser.H in
Headers */,
- C915E2E01382D8ED00C5FD27 /* Fl_Browser_.H in
Headers */,
- C915E2E11382D8ED00C5FD27 /* Fl_Button.H in
Headers */,
- C915E2E21382D8ED00C5FD27 /* Fl_Cairo.H in
Headers */,
- C915E2E31382D8ED00C5FD27 /* Fl_Cairo_Window.H
in Headers */,
- C915E2E41382D8ED00C5FD27 /* Fl_Chart.H in
Headers */,
- C915E2E51382D8ED00C5FD27 /* Fl_Check_Browser.H
in Headers */,
- C915E2E61382D8ED00C5FD27 /* Fl_Check_Button.H
in Headers */,
- C915E2E71382D8ED00C5FD27 /* Fl_Choice.H in
Headers */,
- C915E2E81382D8ED00C5FD27 /* Fl_Clock.H in
Headers */,
- C915E2E91382D8ED00C5FD27 /* Fl_Color_Chooser.H
in Headers */,
- C915E2EA1382D8ED00C5FD27 /* Fl_Counter.H in
Headers */,
- C915E2EB1382D8ED00C5FD27 /* Fl_Device.H in
Headers */,
- C915E2EC1382D8ED00C5FD27 /* Fl_Dial.H in
Headers */,
- C915E2ED1382D8ED00C5FD27 /* Fl_Double_Window.H
in Headers */,
- C915E2EE1382D8ED00C5FD27 /* Fl_Export.H in
Headers */,
- C915E2EF1382D8ED00C5FD27 /* Fl_File_Browser.H
in Headers */,
- C915E2F01382D8ED00C5FD27 /* Fl_File_Chooser.H
in Headers */,
- C915E2F11382D8ED00C5FD27 /* Fl_File_Icon.H in
Headers */,
- C915E2F21382D8ED00C5FD27 /* Fl_File_Input.H in
Headers */,
- C915E2F31382D8ED00C5FD27 /* Fl_Fill_Dial.H in
Headers */,
- C915E2F41382D8ED00C5FD27 /* Fl_Fill_Slider.H in
Headers */,
- C915E2F51382D8ED00C5FD27 /* Fl_Float_Input.H in
Headers */,
- C915E2F61382D8ED00C5FD27 /* Fl_FormsBitmap.H in
Headers */,
- C915E2F71382D8ED00C5FD27 /* Fl_FormsPixmap.H in
Headers */,
- C915E2F81382D8ED00C5FD27 /* Fl_Free.H in
Headers */,
- C915E2F91382D8ED00C5FD27 /* Fl_Group.H in
Headers */,
- C915E2FA1382D8ED00C5FD27 /* Fl_Hold_Browser.H
in Headers */,
- C915E2FB1382D8ED00C5FD27 /*
Fl_Hor_Fill_Slider.H in Headers */,
- C915E2FC1382D8ED00C5FD27 /*
Fl_Hor_Nice_Slider.H in Headers */,
- C915E2FD1382D8ED00C5FD27 /* Fl_Hor_Slider.H in
Headers */,
- C915E2FE1382D8ED00C5FD27 /*
Fl_Hor_Value_Slider.H in Headers */,
- C915E2FF1382D8ED00C5FD27 /* Fl_Image.H in
Headers */,
- C915E3001382D8ED00C5FD27 /* Fl_Input.H in
Headers */,
- C915E3011382D8ED00C5FD27 /* Fl_Input_.H in
Headers */,
- C915E3021382D8ED00C5FD27 /* Fl_Input_Choice.H
in Headers */,
- C915E3031382D8ED00C5FD27 /* Fl_Int_Input.H in
Headers */,
- C915E3041382D8ED00C5FD27 /* Fl_Light_Button.H
in Headers */,
- C915E3051382D8ED00C5FD27 /* Fl_Line_Dial.H in
Headers */,
- C915E3061382D8ED00C5FD27 /* Fl_Menu.H in
Headers */,
- C915E3071382D8ED00C5FD27 /* Fl_Menu_.H in
Headers */,
- C915E3081382D8ED00C5FD27 /* Fl_Menu_Bar.H in
Headers */,
- C915E3091382D8ED00C5FD27 /* Fl_Menu_Button.H in
Headers */,
- C915E30A1382D8ED00C5FD27 /* Fl_Menu_Item.H in
Headers */,
- C915E30B1382D8ED00C5FD27 /* Fl_Menu_Window.H in
Headers */,
- C915E30C1382D8ED00C5FD27 /* Fl_Multi_Browser.H
in Headers */,
- C915E30D1382D8ED00C5FD27 /* Fl_Multi_Label.H in
Headers */,
- C915E30E1382D8ED00C5FD27 /*
Fl_Multiline_Input.H in Headers */,
- C915E30F1382D8ED00C5FD27 /*
Fl_Multiline_Output.H in Headers */,
- C915E3101382D8ED00C5FD27 /*
Fl_Native_File_Chooser.H in Headers */,
- C915E3111382D8ED00C5FD27 /* Fl_Nice_Slider.H in
Headers */,
- C915E3121382D8ED00C5FD27 /* Fl_Object.H in
Headers */,
- C915E3131382D8ED00C5FD27 /* Fl_Output.H in
Headers */,
- C915E3141382D8ED00C5FD27 /* Fl_Overlay_Window.H
in Headers */,
- C915E3151382D8ED00C5FD27 /* Fl_Pack.H in
Headers */,
- C915E3161382D8ED00C5FD27 /* Fl_Pixmap.H in
Headers */,
- C915E3171382D8ED00C5FD27 /* Fl_Plugin.H in
Headers */,
- C915E3181382D8ED00C5FD27 /* Fl_Positioner.H in
Headers */,
- C915E3191382D8ED00C5FD27 /* Fl_PostScript.H in
Headers */,
- C915E31A1382D8ED00C5FD27 /* Fl_Preferences.H in
Headers */,
- C915E31B1382D8ED00C5FD27 /* Fl_Printer.H in
Headers */,
- C915E31C1382D8ED00C5FD27 /* Fl_Progress.H in
Headers */,
- C915E31D1382D8ED00C5FD27 /* Fl_RGB_Image.H in
Headers */,
- C915E31E1382D8ED00C5FD27 /* Fl_Radio_Button.H
in Headers */,
- C915E31F1382D8ED00C5FD27 /*
Fl_Radio_Light_Button.H in Headers */,
- C915E3201382D8ED00C5FD27 /*
Fl_Radio_Round_Button.H in Headers */,
- C915E3211382D8ED00C5FD27 /* Fl_Repeat_Button.H
in Headers */,
- C915E3221382D8ED00C5FD27 /* Fl_Return_Button.H
in Headers */,
- C915E3231382D8ED00C5FD27 /* Fl_Roller.H in
Headers */,
- C915E3241382D8ED00C5FD27 /* Fl_Round_Button.H
in Headers */,
- C915E3251382D8ED00C5FD27 /* Fl_Round_Clock.H in
Headers */,
- C915E3261382D8ED00C5FD27 /* Fl_Scroll.H in
Headers */,
- C915E3271382D8ED00C5FD27 /* Fl_Scrollbar.H in
Headers */,
- C915E3281382D8ED00C5FD27 /* Fl_Secret_Input.H
in Headers */,
- C915E3291382D8ED00C5FD27 /* Fl_Select_Browser.H
in Headers */,
- C915E32A1382D8ED00C5FD27 /* Fl_Shared_Image.H
in Headers */,
- C915E32B1382D8ED00C5FD27 /* Fl_Simple_Counter.H
in Headers */,
- C915E32C1382D8ED00C5FD27 /* Fl_Single_Window.H
in Headers */,
- C915E32D1382D8ED00C5FD27 /* Fl_Slider.H in
Headers */,
- C915E32E1382D8ED00C5FD27 /* Fl_Spinner.H in
Headers */,
- C915E32F1382D8ED00C5FD27 /* Fl_Sys_Menu_Bar.H
in Headers */,
- C915E3301382D8ED00C5FD27 /* Fl_Table.H in
Headers */,
- C915E3311382D8ED00C5FD27 /* Fl_Table_Row.H in
Headers */,
- C915E3321382D8ED00C5FD27 /* Fl_Tabs.H in
Headers */,
- C915E3331382D8ED00C5FD27 /* Fl_Text_Buffer.H in
Headers */,
- C915E3341382D8ED00C5FD27 /* Fl_Text_Display.H
in Headers */,
- C915E3351382D8ED00C5FD27 /* Fl_Text_Editor.H in
Headers */,
- C915E3361382D8ED00C5FD27 /* Fl_Tile.H in
Headers */,
- C915E3371382D8ED00C5FD27 /* Fl_Tiled_Image.H in
Headers */,
- C915E3381382D8ED00C5FD27 /* Fl_Timer.H in
Headers */,
- C915E3391382D8ED00C5FD27 /* Fl_Toggle_Button.H
in Headers */,
- C915E33A1382D8ED00C5FD27 /*
Fl_Toggle_Light_Button.H in Headers */,
- C915E33B1382D8ED00C5FD27 /*
Fl_Toggle_Round_Button.H in Headers */,
- C915E33C1382D8ED00C5FD27 /* Fl_Tooltip.H in
Headers */,
- C915E33D1382D8ED00C5FD27 /* Fl_Tree.H in
Headers */,
- C915E33E1382D8ED00C5FD27 /* Fl_Tree_Item.H in
Headers */,
- C915E33F1382D8ED00C5FD27 /*
Fl_Tree_Item_Array.H in Headers */,
- C915E3401382D8ED00C5FD27 /* Fl_Tree_Prefs.H in
Headers */,
- C915E3411382D8ED00C5FD27 /* Fl_Valuator.H in
Headers */,
- C915E3421382D8ED00C5FD27 /* Fl_Value_Input.H in
Headers */,
- C915E3431382D8ED00C5FD27 /* Fl_Value_Output.H
in Headers */,
- C915E3441382D8ED00C5FD27 /* Fl_Value_Slider.H
in Headers */,
- C915E3451382D8ED00C5FD27 /* Fl_Widget.H in
Headers */,
- C915E3461382D8ED00C5FD27 /* Fl_Window.H in
Headers */,
- C915E3471382D8ED00C5FD27 /* Fl_Wizard.H in
Headers */,
- C915E3481382D8ED00C5FD27 /* Fl_XBM_Image.H in
Headers */,
- C915E3491382D8ED00C5FD27 /* Fl_XPM_Image.H in
Headers */,
- C915E34C1382D8ED00C5FD27 /* filename.H in
Headers */,
- C915E34D1382D8ED00C5FD27 /* fl_ask.H in Headers
*/,
- C915E34E1382D8ED00C5FD27 /* fl_draw.H in
Headers */,
- C915E34F1382D8ED00C5FD27 /* fl_message.H in
Headers */,
- C915E3501382D8ED00C5FD27 /* fl_show_colormap.H
in Headers */,
- C915E3511382D8ED00C5FD27 /* fl_show_input.H in
Headers */,
- C915E3521382D8ED00C5FD27 /* fl_types.h in
Headers */,
- C915E3531382D8ED00C5FD27 /* fl_utf8.h in
Headers */,
- C915E3541382D8ED00C5FD27 /* mac.H in Headers */,
- C915E3571382D8ED00C5FD27 /* win32.H in Headers
*/,
- C915E3581382D8ED00C5FD27 /* x.H in Headers */,
- C915E3591382D8ED00C5FD27 /* Fl_Paged_Device.H
in Headers */,
- C910D53113904487003643F5 /* Fl_Gl_Window.H in
Headers */,
- C910D53213904487003643F5 /* gl_draw.H in
Headers */,
- C910D53613904487003643F5 /* glut.H in Headers
*/,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -8498,14 +8371,14 @@
isa = PBXNativeTarget;
buildConfigurationList = F8A317C2491750F8DEF118E2 /*
Build configuration list for PBXNativeTarget "fltk" */;
buildPhases = (
1DAA0C25D4F3735866428D29 /* Resources */,
- C9EDD5C81274C6BA00ADB21C /* Headers */,
+ 0A872A2EDF7E71BE35FEFE8E /* Headers */,
C9EDD42D1274B84100ADB21C /* CopyFiles */,
C9EDD4DD1274BB4100ADB21C /* CopyFiles */,
4DA82C38AA0403E56A1E3545 /* Sources */,
D2A1AD2D93B0EED43F624520 /* Frameworks */,
);
buildRules = (
- EFFAAB905A54B0BFE13CB56C /* PBXBuildRule */,
+ 21280AFA5A5FFB0A93104B3F /* PBXBuildRule */,
);
dependencies = (
);
Modified: branches/branch-3.0/ide/templates/Xcode4.tmpl
===================================================================
--- branches/branch-3.0/ide/templates/Xcode4.tmpl 2011-08-06 21:49:08 UTC
(rev 8920)
+++ branches/branch-3.0/ide/templates/Xcode4.tmpl 2011-08-06 22:08:13 UTC
(rev 8921)
@@ -1485,18 +1485,7 @@
);
script = "export
DYLD_FRAMEWORK_PATH=${TARGET_BUILD_DIR} && cd ${INPUT_FILE_DIR} &&
${TARGET_BUILD_DIR}/Fluid.app/Contents/MacOS/Fluid -c ${INPUT_FILE_NAME}";
};
- EFFAAB905A54B0BFE13CB56C /* PBXBuildRule */ = {
- isa = PBXBuildRule;
- compilerSpec = com.apple.compilers.proxy.script;
- filePatterns = "*.fl";
- fileType = pattern.proxy;
- isEditable = 1;
- outputFiles = (
- "${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.cxx",
- "${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.h",
- );
- script = "export
DYLD_FRAMEWORK_PATH=${TARGET_BUILD_DIR} && cd ${INPUT_FILE_DIR} &&
${TARGET_BUILD_DIR}/Fluid.app/Contents/MacOS/Fluid -c ${INPUT_FILE_NAME}";
- };
+#FluidBuildRule(fltk);
F01E4C121774DE7867D5702A /* PBXBuildRule */ = {
isa = PBXBuildRule;
compilerSpec = com.apple.compilers.proxy.script;
@@ -6219,142 +6208,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- C9EDD5C81274C6BA00ADB21C /* Headers */ = {
- isa = PBXHeadersBuildPhase;
- buildActionMask = 2147483647;
- comments = "Copy just any file here so that the Headers
link will be generated correctly.";
- files = (
#HeadersBuildPhase(fltk);
- C915E2DA1382D8ED00C5FD27 /* Enumerations.H in
Headers */,
- C915E2DB1382D8ED00C5FD27 /* Fl.H in Headers */,
- C915E2DC1382D8ED00C5FD27 /* Fl_Adjuster.H in
Headers */,
- C915E2DD1382D8ED00C5FD27 /* Fl_Bitmap.H in
Headers */,
- C915E2DE1382D8ED00C5FD27 /* Fl_Box.H in Headers
*/,
- C915E2DF1382D8ED00C5FD27 /* Fl_Browser.H in
Headers */,
- C915E2E01382D8ED00C5FD27 /* Fl_Browser_.H in
Headers */,
- C915E2E11382D8ED00C5FD27 /* Fl_Button.H in
Headers */,
- C915E2E21382D8ED00C5FD27 /* Fl_Cairo.H in
Headers */,
- C915E2E31382D8ED00C5FD27 /* Fl_Cairo_Window.H
in Headers */,
- C915E2E41382D8ED00C5FD27 /* Fl_Chart.H in
Headers */,
- C915E2E51382D8ED00C5FD27 /* Fl_Check_Browser.H
in Headers */,
- C915E2E61382D8ED00C5FD27 /* Fl_Check_Button.H
in Headers */,
- C915E2E71382D8ED00C5FD27 /* Fl_Choice.H in
Headers */,
- C915E2E81382D8ED00C5FD27 /* Fl_Clock.H in
Headers */,
- C915E2E91382D8ED00C5FD27 /* Fl_Color_Chooser.H
in Headers */,
- C915E2EA1382D8ED00C5FD27 /* Fl_Counter.H in
Headers */,
- C915E2EB1382D8ED00C5FD27 /* Fl_Device.H in
Headers */,
- C915E2EC1382D8ED00C5FD27 /* Fl_Dial.H in
Headers */,
- C915E2ED1382D8ED00C5FD27 /* Fl_Double_Window.H
in Headers */,
- C915E2EE1382D8ED00C5FD27 /* Fl_Export.H in
Headers */,
- C915E2EF1382D8ED00C5FD27 /* Fl_File_Browser.H
in Headers */,
- C915E2F01382D8ED00C5FD27 /* Fl_File_Chooser.H
in Headers */,
- C915E2F11382D8ED00C5FD27 /* Fl_File_Icon.H in
Headers */,
- C915E2F21382D8ED00C5FD27 /* Fl_File_Input.H in
Headers */,
- C915E2F31382D8ED00C5FD27 /* Fl_Fill_Dial.H in
Headers */,
- C915E2F41382D8ED00C5FD27 /* Fl_Fill_Slider.H in
Headers */,
- C915E2F51382D8ED00C5FD27 /* Fl_Float_Input.H in
Headers */,
- C915E2F61382D8ED00C5FD27 /* Fl_FormsBitmap.H in
Headers */,
- C915E2F71382D8ED00C5FD27 /* Fl_FormsPixmap.H in
Headers */,
- C915E2F81382D8ED00C5FD27 /* Fl_Free.H in
Headers */,
- C915E2F91382D8ED00C5FD27 /* Fl_Group.H in
Headers */,
- C915E2FA1382D8ED00C5FD27 /* Fl_Hold_Browser.H
in Headers */,
- C915E2FB1382D8ED00C5FD27 /*
Fl_Hor_Fill_Slider.H in Headers */,
- C915E2FC1382D8ED00C5FD27 /*
Fl_Hor_Nice_Slider.H in Headers */,
- C915E2FD1382D8ED00C5FD27 /* Fl_Hor_Slider.H in
Headers */,
- C915E2FE1382D8ED00C5FD27 /*
Fl_Hor_Value_Slider.H in Headers */,
- C915E2FF1382D8ED00C5FD27 /* Fl_Image.H in
Headers */,
- C915E3001382D8ED00C5FD27 /* Fl_Input.H in
Headers */,
- C915E3011382D8ED00C5FD27 /* Fl_Input_.H in
Headers */,
- C915E3021382D8ED00C5FD27 /* Fl_Input_Choice.H
in Headers */,
- C915E3031382D8ED00C5FD27 /* Fl_Int_Input.H in
Headers */,
- C915E3041382D8ED00C5FD27 /* Fl_Light_Button.H
in Headers */,
- C915E3051382D8ED00C5FD27 /* Fl_Line_Dial.H in
Headers */,
- C915E3061382D8ED00C5FD27 /* Fl_Menu.H in
Headers */,
- C915E3071382D8ED00C5FD27 /* Fl_Menu_.H in
Headers */,
- C915E3081382D8ED00C5FD27 /* Fl_Menu_Bar.H in
Headers */,
- C915E3091382D8ED00C5FD27 /* Fl_Menu_Button.H in
Headers */,
- C915E30A1382D8ED00C5FD27 /* Fl_Menu_Item.H in
Headers */,
- C915E30B1382D8ED00C5FD27 /* Fl_Menu_Window.H in
Headers */,
- C915E30C1382D8ED00C5FD27 /* Fl_Multi_Browser.H
in Headers */,
- C915E30D1382D8ED00C5FD27 /* Fl_Multi_Label.H in
Headers */,
- C915E30E1382D8ED00C5FD27 /*
Fl_Multiline_Input.H in Headers */,
- C915E30F1382D8ED00C5FD27 /*
Fl_Multiline_Output.H in Headers */,
- C915E3101382D8ED00C5FD27 /*
Fl_Native_File_Chooser.H in Headers */,
- C915E3111382D8ED00C5FD27 /* Fl_Nice_Slider.H in
Headers */,
- C915E3121382D8ED00C5FD27 /* Fl_Object.H in
Headers */,
- C915E3131382D8ED00C5FD27 /* Fl_Output.H in
Headers */,
- C915E3141382D8ED00C5FD27 /* Fl_Overlay_Window.H
in Headers */,
- C915E3151382D8ED00C5FD27 /* Fl_Pack.H in
Headers */,
- C915E3161382D8ED00C5FD27 /* Fl_Pixmap.H in
Headers */,
- C915E3171382D8ED00C5FD27 /* Fl_Plugin.H in
Headers */,
- C915E3181382D8ED00C5FD27 /* Fl_Positioner.H in
Headers */,
- C915E3191382D8ED00C5FD27 /* Fl_PostScript.H in
Headers */,
- C915E31A1382D8ED00C5FD27 /* Fl_Preferences.H in
Headers */,
- C915E31B1382D8ED00C5FD27 /* Fl_Printer.H in
Headers */,
- C915E31C1382D8ED00C5FD27 /* Fl_Progress.H in
Headers */,
- C915E31D1382D8ED00C5FD27 /* Fl_RGB_Image.H in
Headers */,
- C915E31E1382D8ED00C5FD27 /* Fl_Radio_Button.H
in Headers */,
- C915E31F1382D8ED00C5FD27 /*
Fl_Radio_Light_Button.H in Headers */,
- C915E3201382D8ED00C5FD27 /*
Fl_Radio_Round_Button.H in Headers */,
- C915E3211382D8ED00C5FD27 /* Fl_Repeat_Button.H
in Headers */,
- C915E3221382D8ED00C5FD27 /* Fl_Return_Button.H
in Headers */,
- C915E3231382D8ED00C5FD27 /* Fl_Roller.H in
Headers */,
- C915E3241382D8ED00C5FD27 /* Fl_Round_Button.H
in Headers */,
- C915E3251382D8ED00C5FD27 /* Fl_Round_Clock.H in
Headers */,
- C915E3261382D8ED00C5FD27 /* Fl_Scroll.H in
Headers */,
- C915E3271382D8ED00C5FD27 /* Fl_Scrollbar.H in
Headers */,
- C915E3281382D8ED00C5FD27 /* Fl_Secret_Input.H
in Headers */,
- C915E3291382D8ED00C5FD27 /* Fl_Select_Browser.H
in Headers */,
- C915E32A1382D8ED00C5FD27 /* Fl_Shared_Image.H
in Headers */,
- C915E32B1382D8ED00C5FD27 /* Fl_Simple_Counter.H
in Headers */,
- C915E32C1382D8ED00C5FD27 /* Fl_Single_Window.H
in Headers */,
- C915E32D1382D8ED00C5FD27 /* Fl_Slider.H in
Headers */,
- C915E32E1382D8ED00C5FD27 /* Fl_Spinner.H in
Headers */,
- C915E32F1382D8ED00C5FD27 /* Fl_Sys_Menu_Bar.H
in Headers */,
- C915E3301382D8ED00C5FD27 /* Fl_Table.H in
Headers */,
- C915E3311382D8ED00C5FD27 /* Fl_Table_Row.H in
Headers */,
- C915E3321382D8ED00C5FD27 /* Fl_Tabs.H in
Headers */,
- C915E3331382D8ED00C5FD27 /* Fl_Text_Buffer.H in
Headers */,
- C915E3341382D8ED00C5FD27 /* Fl_Text_Display.H
in Headers */,
- C915E3351382D8ED00C5FD27 /* Fl_Text_Editor.H in
Headers */,
- C915E3361382D8ED00C5FD27 /* Fl_Tile.H in
Headers */,
- C915E3371382D8ED00C5FD27 /* Fl_Tiled_Image.H in
Headers */,
- C915E3381382D8ED00C5FD27 /* Fl_Timer.H in
Headers */,
- C915E3391382D8ED00C5FD27 /* Fl_Toggle_Button.H
in Headers */,
- C915E33A1382D8ED00C5FD27 /*
Fl_Toggle_Light_Button.H in Headers */,
- C915E33B1382D8ED00C5FD27 /*
Fl_Toggle_Round_Button.H in Headers */,
- C915E33C1382D8ED00C5FD27 /* Fl_Tooltip.H in
Headers */,
- C915E33D1382D8ED00C5FD27 /* Fl_Tree.H in
Headers */,
- C915E33E1382D8ED00C5FD27 /* Fl_Tree_Item.H in
Headers */,
- C915E33F1382D8ED00C5FD27 /*
Fl_Tree_Item_Array.H in Headers */,
- C915E3401382D8ED00C5FD27 /* Fl_Tree_Prefs.H in
Headers */,
- C915E3411382D8ED00C5FD27 /* Fl_Valuator.H in
Headers */,
- C915E3421382D8ED00C5FD27 /* Fl_Value_Input.H in
Headers */,
- C915E3431382D8ED00C5FD27 /* Fl_Value_Output.H
in Headers */,
- C915E3441382D8ED00C5FD27 /* Fl_Value_Slider.H
in Headers */,
- C915E3451382D8ED00C5FD27 /* Fl_Widget.H in
Headers */,
- C915E3461382D8ED00C5FD27 /* Fl_Window.H in
Headers */,
- C915E3471382D8ED00C5FD27 /* Fl_Wizard.H in
Headers */,
- C915E3481382D8ED00C5FD27 /* Fl_XBM_Image.H in
Headers */,
- C915E3491382D8ED00C5FD27 /* Fl_XPM_Image.H in
Headers */,
- C915E34C1382D8ED00C5FD27 /* filename.H in
Headers */,
- C915E34D1382D8ED00C5FD27 /* fl_ask.H in Headers
*/,
- C915E34E1382D8ED00C5FD27 /* fl_draw.H in
Headers */,
- C915E34F1382D8ED00C5FD27 /* fl_message.H in
Headers */,
- C915E3501382D8ED00C5FD27 /* fl_show_colormap.H
in Headers */,
- C915E3511382D8ED00C5FD27 /* fl_show_input.H in
Headers */,
- C915E3521382D8ED00C5FD27 /* fl_types.h in
Headers */,
- C915E3531382D8ED00C5FD27 /* fl_utf8.h in
Headers */,
- C915E3541382D8ED00C5FD27 /* mac.H in Headers */,
- C915E3571382D8ED00C5FD27 /* win32.H in Headers
*/,
- C915E3581382D8ED00C5FD27 /* x.H in Headers */,
- C915E3591382D8ED00C5FD27 /* Fl_Paged_Device.H
in Headers */,
- C910D53113904487003643F5 /* Fl_Gl_Window.H in
Headers */,
- C910D53213904487003643F5 /* gl_draw.H in
Headers */,
- C910D53613904487003643F5 /* glut.H in Headers
*/,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
