Author: matt
Date: 2011-08-07 00:16:13 -0700 (Sun, 07 Aug 2011)
New Revision: 8925
Log:
Fluid3: Baby steps are steps, too
Modified:
branches/branch-3.0/fltk.flw
branches/branch-3.0/fluid/file_xcode.cxx
branches/branch-3.0/ide/templates/Xcode4.tmpl
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2011-08-07 06:44:38 UTC (rev 8924)
+++ branches/branch-3.0/fltk.flw 2011-08-07 07:16:13 UTC (rev 8925)
@@ -213,6 +213,7 @@
uuid_Xcode4_FluidBuildRule {21280AFA-1D23-477C-9F1C-641693104B3F}
uuid_Xcode4_SourcesBuildPhase {ABBF042C-9682-43C8-A51D-9D39F354B9DB}
uuid_Xcode4_ProductReference {FEB0F8FE-0000-6383-0000-384180570D94}
+ uuid_Xcode4_Target {A57FDE87-0000-1C99-0000-A52BEEDEE68C}
} {
folder Headers {open
} {
Modified: branches/branch-3.0/fluid/file_xcode.cxx
===================================================================
--- branches/branch-3.0/fluid/file_xcode.cxx 2011-08-07 06:44:38 UTC (rev
8924)
+++ branches/branch-3.0/fluid/file_xcode.cxx 2011-08-07 07:16:13 UTC (rev
8925)
@@ -279,6 +279,7 @@
static int writeNativeTarget(FILE *out, Fl_Target_Type *tgt) {
// currently we still have a bunch of fixed UUIDs in here!
+ char Target[32]; strcpy(Target, tgt->get_UUID_Xcode("Xcode4_Target"));
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"));
@@ -286,7 +287,7 @@
char FluidBuildRule[32]; strcpy(FluidBuildRule,
tgt->get_UUID_Xcode("Xcode4_FluidBuildRule"));
char ProductReference[32]; strcpy(ProductReference,
tgt->get_UUID_Xcode("Xcode4_ProductReference"));
- fprintf(out, "\t\tA57FDE871C99A52BEEDEE68C /* %s */ = {\n", tgt->name());
// FIXME: use generated key
+ fprintf(out, "\t\t%s /* %s */ = {\n",Target ,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");
@@ -331,6 +332,12 @@
}
+static int writeProjectTarget(FILE *out, Fl_Target_Type *tgt) {
+ char Target[32]; strcpy(Target, tgt->get_UUID_Xcode("Xcode4_Target"));
+ fprintf(out, "\t\t\t\t%s /* %s */,\n", Target, tgt->name());
+ return 0;
+}
+
int write_fltk_ide_xcode4() {
// for now, we use a template file in FLTK/ide/templates/VisualC2008.tmpl .
// When done, everything will likely be integrated into the executable to
make one compact package.
@@ -469,6 +476,10 @@
Fl_Target_Type *tgt = Fl_Target_Type::find(hash+16, ')');
writeFluidBuildRule(out, tgt);
hash = strchr(hash, ';')+1;
+ } else if (strncmp(hash, "#ProjectTarget(", 15)==0) {
+ Fl_Target_Type *tgt = Fl_Target_Type::find(hash+15, ')');
+ writeProjectTarget(out, tgt);
+ hash = strchr(hash, ';')+1;
} else {
#if 0
fltk.framework starts here: A57FDE871C99A52BEEDEE68C
@@ -486,7 +497,7 @@
FrameworksBuildPhase = D2A1AD2D93B0EED43F624520
Cocoa.framework = C96290C21274D0CF007D3CFE (BuildFile ->
FileReference)
-buildRules (BuildRule) = EFFAAB905A54B0BFE13CB56C (Fluid build
rule, no more references)
- productReference = FEB0F8FE6383384180570D94 (-> FileReference,
is also referenced in "Products")
+ -productReference = FEB0F8FE6383384180570D94 (-> FileReference,
is also referenced in "Products")
Also still missing are dependencies, like this one:
A8AB7DEC3970D5A693D2BC84 and dependency proxies (uuuaaaahh!)
#endif
Modified: branches/branch-3.0/ide/templates/Xcode4.tmpl
===================================================================
--- branches/branch-3.0/ide/templates/Xcode4.tmpl 2011-08-07 06:44:38 UTC
(rev 8924)
+++ branches/branch-3.0/ide/templates/Xcode4.tmpl 2011-08-07 07:16:13 UTC
(rev 8925)
@@ -7896,7 +7896,7 @@
projectRoot = "";
targets = (
AE6BC0AEB24EBBBDBA4071E0 /* Fluid */,
- A57FDE871C99A52BEEDEE68C /* fltk */,
+#ProjectTarget(fltk);
C13484C4A9262C58D8FA7242 /* fltk_gl */,
BB76D328D5B89A1273946784 /* fltk_images */,
A58BB416AAFDCFF08D7C7E41 /* fltk_png */,
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
