| |
Author: matt
Date: 2008-09-10 14:55:14 -0700 (Wed, 10 Sep 2008)
New Revision: 6208
Log:
Updated Xcode to 3.1 and fixes a few issues,. including missing fltk.framework files for some of the test programs (I ran out of patience for the rest though).
Added:
branches/branch-1.3-utf8/ide/Xcode3.1/
Removed:
branches/branch-1.3-utf8/ide/Xcode3.0/
Modified:
branches/branch-1.3-utf8/FL/forms.H
branches/branch-1.3-utf8/Makefile
branches/branch-1.3-utf8/configure.in
branches/branch-1.3-utf8/fltk-config.in
branches/branch-1.3-utf8/ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj
branches/branch-1.3-utf8/ide/Xcode3.1/plists/colbrowser-Info.plist
branches/branch-1.3-utf8/ide/Xcode3.1/plists/curve-Info.plist
branches/branch-1.3-utf8/src/Makefile
branches/branch-1.3-utf8/src/fl_utf8.cxx
branches/branch-1.3-utf8/src/xutf8/case.c
branches/branch-1.3-utf8/src/xutf8/is_right2left.c
branches/branch-1.3-utf8/src/xutf8/is_spacing.c
branches/branch-1.3-utf8/src/xutf8/keysym2Ucs.c
branches/branch-1.3-utf8/src/xutf8/utf8Input.c
branches/branch-1.3-utf8/src/xutf8/utf8Utils.c
branches/branch-1.3-utf8/src/xutf8/utf8Wrap.c
branches/branch-1.3-utf8/test/demo.cxx
Modified: branches/branch-1.3-utf8/FL/forms.H
===================================================================
--- branches/branch-1.3-utf8/FL/forms.H 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/FL/forms.H 2008-09-10 21:55:14 UTC (rev 6208)
@@ -211,7 +211,7 @@
/* forms lib font indexes must be byte sized - extract correct byte from style word */
inline void fl_set_object_lstyle(Fl_Widget* o,int a) {
- o->labelfont((Fl_Font)a); o->labeltype((Fl_Labeltype)(a>>8));}
+ o->labelfont((Fl_Font)(a&0xff)); o->labeltype((Fl_Labeltype)(a>>8));}
inline void fl_set_object_lcol(Fl_Widget* o, unsigned a) {o->labelcolor(a);}
#define fl_set_object_lcolor fl_set_object_lcol
inline void fl_set_object_lalign(Fl_Widget* o, Fl_Align a) {o->align(a);}
Modified: branches/branch-1.3-utf8/Makefile
===================================================================
--- branches/branch-1.3-utf8/Makefile 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/Makefile 2008-09-10 21:55:14 UTC (rev 6208)
@@ -27,7 +27,7 @@
include makeinclude
-DIRS = xutf8 $(IMAGEDIRS) src fluid test documentation
+DIRS = $(IMAGEDIRS) src fluid test documentation
all: makeinclude fltk-config
for dir in $(DIRS); do\
Modified: branches/branch-1.3-utf8/configure.in
===================================================================
--- branches/branch-1.3-utf8/configure.in 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/configure.in 2008-09-10 21:55:14 UTC (rev 6208)
@@ -225,7 +225,7 @@
;;
esac
- LINKSHARED="-L../src -L../xutf8 -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
+ LINKSHARED="-L../src -lfltk_images$SHAREDSUFFIX -lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
else
DSOCOMMAND="echo"
DSOLINK=""
@@ -236,7 +236,7 @@
PICFLAG=0
SHAREDSUFFIX=""
FLUID="fluid"
- LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a ../lib/libfltk-xutf8.a"
+ LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
fi
AC_SUBST(DSOCOMMAND)
Modified: branches/branch-1.3-utf8/fltk-config.in
===================================================================
--- branches/branch-1.3-utf8/fltk-config.in 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/fltk-config.in 2008-09-10 21:55:14 UTC (rev 6208)
@@ -219,8 +219,8 @@
fi
# Calculate needed libraries
-LDSTATIC="$libdir/libfltk.a $libdir/libfltk_xutf8.a $LDLIBS"
-LDLIBS="-lfltk$SHAREDSUFFIX -lfltk_xutf8$SHAREDSUFFIX $LDLIBS"
+LDSTATIC="$libdir/libfltk.a $LDLIBS"
+LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
if test x$use_forms = xyes; then
LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
Copied: branches/branch-1.3-utf8/ide/Xcode3.1 (from rev 6206, branches/branch-1.3-utf8/ide/Xcode3.0)
Modified: branches/branch-1.3-utf8/ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj
===================================================================
--- branches/branch-1.3-utf8/ide/Xcode3.0/FLTK.xcodeproj/project.pbxproj 2008-09-10 13:27:52 UTC (rev 6206)
+++ branches/branch-1.3-utf8/ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj 2008-09-10 21:55:14 UTC (rev 6208)
@@ -148,7 +148,6 @@
C969E9A00DDAE446003BCABC /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C97741930DD9D1BD0047C1BF /* cursor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97741920DD9D1BD0047C1BF /* cursor.cxx */; };
C977419A0DD9D1C90047C1BF /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
- C97741E80DD9D2ED0047C1BF /* curve.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97741E70DD9D2ED0047C1BF /* curve.cxx */; };
C97741F00DD9D3240047C1BF /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C977420B0DD9D3570047C1BF /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C97742100DD9D36C0047C1BF /* demo.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C977420E0DD9D36C0047C1BF /* demo.cxx */; };
@@ -162,6 +161,11 @@
C99CF59E0DD8CB370094BD10 /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C99CF59F0DD8CB3C0094BD10 /* fltk_gl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3EC830DD639A200486E4F /* fltk_gl.framework */; };
C99CF5A50DD8CB5E0094BD10 /* CubeViewUI.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C99CF5A40DD8CB5E0094BD10 /* CubeViewUI.cxx */; };
+ C99E1E9B0E78620B00AECCF6 /* case.c in Sources */ = {isa = PBXBuildFile; fileRef = C99E1E980E7861E600AECCF6 /* case.c */; };
+ C99E1E9C0E78620B00AECCF6 /* is_right2left.c in Sources */ = {isa = PBXBuildFile; fileRef = C99E1E990E7861EF00AECCF6 /* is_right2left.c */; };
+ C99E1E9D0E78620B00AECCF6 /* is_spacing.c in Sources */ = {isa = PBXBuildFile; fileRef = C99E1E9A0E7861F400AECCF6 /* is_spacing.c */; };
+ C99E1EBA0E7862A000AECCF6 /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C99E1EBC0E7862DA00AECCF6 /* curve.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97741E70DD9D2ED0047C1BF /* curve.cxx */; };
C9A3E9660DD633F100486E4F /* hello.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3E9650DD633F100486E4F /* hello.cxx */; };
C9A3EB8C0DD634CC00486E4F /* Fl_get_system_colors.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EAD60DD634CC00486E4F /* Fl_get_system_colors.cxx */; };
C9A3EB8F0DD634CC00486E4F /* Fl_get_key.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EAD90DD634CC00486E4F /* Fl_get_key.cxx */; };
@@ -301,7 +305,6 @@
C9A3ECAB0DD63A9E00486E4F /* adjuster.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3ECAA0DD63A9E00486E4F /* adjuster.cxx */; };
C9A3ECB20DD63AE300486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C9A3ED0A0DD63CC900486E4F /* arc.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3ED090DD63CC900486E4F /* arc.cxx */; };
- C9A3ED0C0DD63CE000486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C9A3ED220DD63D4C00486E4F /* ask.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3ED210DD63D4C00486E4F /* ask.cxx */; };
C9A3ED240DD63D5700486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C9A3ED3B0DD63D9E00486E4F /* bitmap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3ED3A0DD63D9E00486E4F /* bitmap.cxx */; };
@@ -310,7 +313,7 @@
C9A3ED570DD63DFA00486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C9A3ED5C0DD63E4C00486E4F /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3ED5B0DD63E4C00486E4F /* CoreAudio.framework */; };
C9A3ED750DD63E9B00486E4F /* boxtype.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3ED740DD63E9B00486E4F /* boxtype.cxx */; };
- C9A3ED770DD63EAB00486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9A3ED770DD63EAB00486E4F /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C9A3ED900DD63EFF00486E4F /* browser.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3ED8F0DD63EFF00486E4F /* browser.cxx */; };
C9A3ED920DD63F0D00486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C9A3EDB70DD6459800486E4F /* button.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EDB60DD6459800486E4F /* button.cxx */; };
@@ -321,8 +324,6 @@
C9A3EDE80DD6462E00486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C9A3EE010DD6469C00486E4F /* clock.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EE000DD6469C00486E4F /* clock.cxx */; };
C9A3EE030DD646B000486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
- C9A3EE190DD646F100486E4F /* colbrowser.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EE180DD646F100486E4F /* colbrowser.cxx */; };
- C9A3EE1B0DD646FA00486E4F /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C9A3EE240DD6481A00486E4F /* forms_bitmap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EB510DD634CC00486E4F /* forms_bitmap.cxx */; };
C9A3EE250DD6481B00486E4F /* forms_compatability.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EB500DD634CC00486E4F /* forms_compatability.cxx */; };
C9A3EE260DD6481C00486E4F /* forms_free.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EB4B0DD634CC00486E4F /* forms_free.cxx */; };
@@ -450,6 +451,37 @@
C9DD58190DD784C700A896B4 /* fltk_jpeg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3EC9A0DD639E600486E4F /* fltk_jpeg.framework */; };
C9DD581A0DD784C700A896B4 /* fltk_png.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3EC8E0DD639CE00486E4F /* fltk_png.framework */; };
C9DD58310DD7885D00A896B4 /* fltk_forms.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3EC6E0DD6397400486E4F /* fltk_forms.framework */; };
+ C9EAC2E80E786767004F64F7 /* colbrowser.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9A3EE180DD646F100486E4F /* colbrowser.cxx */; };
+ C9EAC2ED0E78678D004F64F7 /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC2FB0E7867B6004F64F7 /* fltk_forms.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3EC6E0DD6397400486E4F /* fltk_forms.framework */; };
+ C9EAC4040E7871B1004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC40C0E787220004F64F7 /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC42F0E787418004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC43F0E787520004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4430E787544004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC44E0E7875C4004F64F7 /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4540E7875F2004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4590E78760B004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC45C0E78761C004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4600E787632004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4650E787645004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4730E787661004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4740E787661004F64F7 /* fltk_forms.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC6E0DD6397400486E4F /* fltk_forms.framework */; };
+ C9EAC47A0E787682004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4810E78769C004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4820E78769C004F64F7 /* fltk_gl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC830DD639A200486E4F /* fltk_gl.framework */; };
+ C9EAC4880E7876AE004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4890E7876AE004F64F7 /* fltk_gl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC830DD639A200486E4F /* fltk_gl.framework */; };
+ C9EAC4930E7876CA004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4950E7876E0004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC49A0E787775004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC49E0E7877A3004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4A30E7877EA004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4AF0E787804004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
+ C9EAC4B00E787804004F64F7 /* fltk_png.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC8E0DD639CE00486E4F /* fltk_png.framework */; };
+ C9EAC4B10E787804004F64F7 /* fltk_images.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC790DD6398C00486E4F /* fltk_images.framework */; };
+ C9EAC4B20E787804004F64F7 /* fltk_jpeg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC9A0DD639E600486E4F /* fltk_jpeg.framework */; };
+ C9EAC4BC0E78795E004F64F7 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C9FB9AAE0DE34BD200026BB1 /* fltk_forms.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC6E0DD6397400486E4F /* fltk_forms.framework */; };
C9FB9AB50DE34C4A00026BB1 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3E9510DD6336500486E4F /* fltk.framework */; };
C9FB9AB60DE34C4A00026BB1 /* fltk_forms.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A3EC6E0DD6397400486E4F /* fltk_forms.framework */; };
@@ -627,13 +659,6 @@
remoteGlobalIDString = C9A3E9500DD6336500486E4F;
remoteInfo = fltk;
};
- C918DB980DD9EFED00167E99 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = C9A3ECA20DD63A5200486E4F;
- remoteInfo = adjuster;
- };
C918DBA50DD9F00700167E99 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
@@ -1446,13 +1471,6 @@
remoteGlobalIDString = C9A3E9500DD6336500486E4F;
remoteInfo = fltk;
};
- C97742150DD9D3990047C1BF /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = C9A3E9500DD6336500486E4F;
- remoteInfo = fltk;
- };
C97742180DD9D3BA0047C1BF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
@@ -1572,13 +1590,6 @@
remoteGlobalIDString = C9A3EDF80DD6467E00486E4F;
remoteInfo = clock;
};
- C977423E0DD9D3BA0047C1BF /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = C9A3EE100DD646DA00486E4F;
- remoteInfo = colbrowser;
- };
C97742400DD9D3BA0047C1BF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
@@ -1607,13 +1618,6 @@
remoteGlobalIDString = C97741840DD9D1910047C1BF;
remoteInfo = cursor;
};
- C97742480DD9D3BA0047C1BF /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = C97741DB0DD9D2D80047C1BF;
- remoteInfo = curve;
- };
C97742690DD9D8470047C1BF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
@@ -1649,20 +1653,6 @@
remoteGlobalIDString = C9A3E9500DD6336500486E4F;
remoteInfo = fltk;
};
- C9A3EE670DD64A6300486E4F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = C9A3E9500DD6336500486E4F;
- remoteInfo = fltk;
- };
- C9A3EE690DD64A6A00486E4F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = C9A3EC6D0DD6397400486E4F;
- remoteInfo = fltk_forms;
- };
C9C870D50DD772AA00A9793F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
@@ -1831,6 +1821,34 @@
remoteGlobalIDString = C9A3EC990DD639E600486E4F;
remoteInfo = fltk_jpeg;
};
+ C9EAC2EB0E786785004F64F7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = C9A3E9500DD6336500486E4F /* fltk */;
+ remoteInfo = fltk;
+ };
+ C9EAC2FE0E7867C9004F64F7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = C9A3E9500DD6336500486E4F /* fltk */;
+ remoteInfo = fltk;
+ };
+ C9EAC3000E7867C9004F64F7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = C9A3EC6D0DD6397400486E4F /* fltk_forms */;
+ remoteInfo = fltk_forms;
+ };
+ C9EAC41E0E78730F004F64F7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = C9A3E93C0DD6332D00486E4F /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = C94A76CF0E77F59E00AAA38E /* utf8 */;
+ remoteInfo = utf8;
+ };
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -1854,6 +1872,222 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ C9EAC3FF0E78718C004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4040E7871B1004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC4280E7873ED004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC42F0E787418004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC43D0E7874C3004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC43F0E787520004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC4470E78755C004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4430E787544004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC44D0E7875B5004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9A3ED770DD63EAB00486E4F /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC46B0E78765E004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4540E7875F2004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC46C0E78765E004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4590E78760B004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC46D0E78765E004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC45C0E78761C004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC46E0E78765E004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4600E787632004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC46F0E78765E004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4650E787645004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC4700E78765E004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4730E787661004F64F7 /* fltk.framework in CopyFiles */,
+ C9EAC4740E787661004F64F7 /* fltk_forms.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC47F0E787699004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC47A0E787682004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC4800E787699004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4810E78769C004F64F7 /* fltk.framework in CopyFiles */,
+ C9EAC4820E78769C004F64F7 /* fltk_gl.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC4900E7876C2004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4880E7876AE004F64F7 /* fltk.framework in CopyFiles */,
+ C9EAC4890E7876AE004F64F7 /* fltk_gl.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC4910E7876C2004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4930E7876CA004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC4980E7876FB004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4950E7876E0004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC49C0E787777004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC49A0E787775004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC4A10E7877A7004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC49E0E7877A3004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC4AA0E7877FC004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4A30E7877EA004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC4AB0E7877FC004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4AF0E787804004F64F7 /* fltk.framework in CopyFiles */,
+ C9EAC4B00E787804004F64F7 /* fltk_png.framework in CopyFiles */,
+ C9EAC4B10E787804004F64F7 /* fltk_images.framework in CopyFiles */,
+ C9EAC4B20E787804004F64F7 /* fltk_jpeg.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ C9EAC4B90E787926004F64F7 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ C9EAC4BC0E78795E004F64F7 /* fltk.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
C9FB9A980DE34AB200026BB1 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -2032,7 +2266,6 @@
C97741850DD9D1910047C1BF /* cursor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = cursor.app; sourceTree = BUILT_PRODUCTS_DIR; };
C97741870DD9D1910047C1BF /* cursor-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "cursor-Info.plist"; path = "plists/cursor-Info.plist"; sourceTree = "<group>"; };
C97741920DD9D1BD0047C1BF /* cursor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cursor.cxx; path = ../../test/cursor.cxx; sourceTree = SOURCE_ROOT; };
- C97741DC0DD9D2D80047C1BF /* curve.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = curve.app; sourceTree = BUILT_PRODUCTS_DIR; };
C97741DE0DD9D2D80047C1BF /* curve-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "curve-Info.plist"; path = "plists/curve-Info.plist"; sourceTree = "<group>"; };
C97741E70DD9D2ED0047C1BF /* curve.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = curve.cxx; path = ../../test/curve.cxx; sourceTree = SOURCE_ROOT; };
C97741FF0DD9D33B0047C1BF /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2048,6 +2281,10 @@
C99CF52D0DD78BD50094BD10 /* CubeViewUI.fl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CubeViewUI.fl; path = ../../test/CubeViewUI.fl; sourceTree = SOURCE_ROOT; };
C99CF5430DD78E690094BD10 /* CubeView.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CubeView.cxx; path = ../../test/CubeView.cxx; sourceTree = SOURCE_ROOT; };
C99CF5A40DD8CB5E0094BD10 /* CubeViewUI.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CubeViewUI.cxx; path = ../../test/CubeViewUI.cxx; sourceTree = SOURCE_ROOT; };
+ C99E1E980E7861E600AECCF6 /* case.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = case.c; path = ../../src/xutf8/case.c; sourceTree = SOURCE_ROOT; };
+ C99E1E990E7861EF00AECCF6 /* is_right2left.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = is_right2left.c; path = ../../src/xutf8/is_right2left.c; sourceTree = SOURCE_ROOT; };
+ C99E1E9A0E7861F400AECCF6 /* is_spacing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = is_spacing.c; path = ../../src/xutf8/is_spacing.c; sourceTree = SOURCE_ROOT; };
+ C99E1EAE0E78628600AECCF6 /* curve.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = curve.app; sourceTree = BUILT_PRODUCTS_DIR; };
C9A3E9510DD6336500486E4F /* fltk.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = fltk.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C9A3E9530DD6336500486E4F /* fltk-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "fltk-Info.plist"; path = "plists/fltk-Info.plist"; sourceTree = "<group>"; };
C9A3E95F0DD633C300486E4F /* hello.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = hello.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2279,7 +2516,6 @@
C9A3EDF90DD6467E00486E4F /* clock.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = clock.app; sourceTree = BUILT_PRODUCTS_DIR; };
C9A3EDFB0DD6467E00486E4F /* clock-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "clock-Info.plist"; path = "plists/clock-Info.plist"; sourceTree = "<group>"; };
C9A3EE000DD6469C00486E4F /* clock.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = clock.cxx; path = ../../test/clock.cxx; sourceTree = SOURCE_ROOT; };
- C9A3EE110DD646DA00486E4F /* colbrowser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = colbrowser.app; sourceTree = BUILT_PRODUCTS_DIR; };
C9A3EE130DD646DA00486E4F /* colbrowser-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "colbrowser-Info.plist"; path = "plists/colbrowser-Info.plist"; sourceTree = "<group>"; };
C9A3EE180DD646F100486E4F /* colbrowser.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = colbrowser.cxx; path = ../../test/colbrowser.cxx; sourceTree = SOURCE_ROOT; };
C9A3EE780DD64AE700486E4F /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
@@ -2376,6 +2612,7 @@
C9DD57E70DD7828E00A896B4 /* pngpread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngpread.c; path = ../../png/pngpread.c; sourceTree = SOURCE_ROOT; };
C9DD57E80DD7828E00A896B4 /* pngrtran.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngrtran.c; path = ../../png/pngrtran.c; sourceTree = SOURCE_ROOT; };
C9DD58070DD783F500A896B4 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
+ C9EAC2DC0E786725004F64F7 /* colbrowser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = colbrowser.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -2773,14 +3010,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- C97741DA0DD9D2D80047C1BF /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- C97741F00DD9D3240047C1BF /* fltk.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
C97741FD0DD9D33B0047C1BF /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -2809,6 +3038,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ C99E1EAC0E78628600AECCF6 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ C99E1EBA0E7862A000AECCF6 /* fltk.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
C9A3E94F0DD6336500486E4F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -2880,7 +3117,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- C9A3ED0C0DD63CE000486E4F /* fltk.framework in Frameworks */,
+ C9EAC40C0E787220004F64F7 /* fltk.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2913,7 +3150,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- C9A3ED770DD63EAB00486E4F /* fltk.framework in Frameworks */,
+ C9EAC44E0E7875C4004F64F7 /* fltk.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2957,15 +3194,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- C9A3EE0F0DD646DA00486E4F /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- C9A3EE1B0DD646FA00486E4F /* fltk.framework in Frameworks */,
- C9A3EE300DD6485F00486E4F /* fltk_forms.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
C9C870BC0DD7721700A9793F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -2998,6 +3226,15 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ C9EAC2DA0E786725004F64F7 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ C9EAC2ED0E78678D004F64F7 /* fltk.framework in Frameworks */,
+ C9EAC2FB0E7867B6004F64F7 /* fltk_forms.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@@ -3047,13 +3284,11 @@
C9A3EDC70DD645C200486E4F /* buttons.app */,
C9A3EDDE0DD6460900486E4F /* checkers.app */,
C9A3EDF90DD6467E00486E4F /* clock.app */,
- C9A3EE110DD646DA00486E4F /* colbrowser.app */,
C9C870BE0DD7721700A9793F /* color_chooser.app */,
C9C871E80DD773E700A9793F /* cube.app */,
C9C873740DD7772000A9793F /* Fluid.app */,
C99CF5240DD78B550094BD10 /* CubeView.app */,
C97741850DD9D1910047C1BF /* cursor.app */,
- C97741DC0DD9D2D80047C1BF /* curve.app */,
C97741FF0DD9D33B0047C1BF /* Demo.app */,
C977425D0DD9D8110047C1BF /* doublebuffer.app */,
C918DB370DD9EE4100167E99 /* editor.app */,
@@ -3101,6 +3336,8 @@
C918E1920DDA126E00167E99 /* tiled_image.app */,
C918E1BE0DDA12CF00167E99 /* valuators.app */,
C94A76DA0E77F59F00AAA38E /* utf8.app */,
+ C99E1EAE0E78628600AECCF6 /* curve.app */,
+ C9EAC2DC0E786725004F64F7 /* colbrowser.app */,
);
name = Products;
sourceTree = "<group>";
@@ -3370,6 +3607,9 @@
C9A3EB8B0DD634CC00486E4F /* fl_shadow_box.cxx */,
C94A76390E76CF5B00AAA38E /* fl_utf.c */,
C94A763A0E76CF6200AAA38E /* fl_utf8.cxx */,
+ C99E1E980E7861E600AECCF6 /* case.c */,
+ C99E1E990E7861EF00AECCF6 /* is_right2left.c */,
+ C99E1E9A0E7861F400AECCF6 /* is_spacing.c */,
);
name = "Library Sources";
sourceTree = "<group>";
@@ -3636,6 +3876,7 @@
C918DB330DD9EE4100167E99 /* Resources */,
C918DB340DD9EE4100167E99 /* Sources */,
C918DB350DD9EE4100167E99 /* Frameworks */,
+ C9EAC4A10E7877A7004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -3654,6 +3895,7 @@
C918DB530DD9EEB800167E99 /* Resources */,
C918DB540DD9EEB800167E99 /* Sources */,
C918DB550DD9EEB800167E99 /* Frameworks */,
+ C9EAC4AA0E7877FC004F64F7 /* CopyFiles */,
);
buildRules = (
C918DB780DD9EF6800167E99 /* PBXBuildRule */,
@@ -3674,6 +3916,7 @@
C918DB9A0DD9EFFA00167E99 /* Resources */,
C918DB9B0DD9EFFA00167E99 /* Sources */,
C918DB9C0DD9EFFA00167E99 /* Frameworks */,
+ C9EAC4AB0E7877FC004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -3695,6 +3938,7 @@
C918DBE70DD9F0C100167E99 /* Resources */,
C918DBE80DD9F0C100167E99 /* Sources */,
C918DBE90DD9F0C100167E99 /* Frameworks */,
+ C9EAC4B90E787926004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -4467,6 +4711,7 @@
C97741810DD9D1910047C1BF /* Resources */,
C97741820DD9D1910047C1BF /* Sources */,
C97741830DD9D1910047C1BF /* Frameworks */,
+ C9EAC4910E7876C2004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -4478,28 +4723,11 @@
productReference = C97741850DD9D1910047C1BF /* cursor.app */;
productType = "com.apple.product-type.application";
};
- C97741DB0DD9D2D80047C1BF /* curve */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = C97741E10DD9D2D90047C1BF /* Build configuration list for PBXNativeTarget "curve" */;
- buildPhases = (
- C97741D80DD9D2D80047C1BF /* Resources */,
- C97741D90DD9D2D80047C1BF /* Sources */,
- C97741DA0DD9D2D80047C1BF /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- C97742160DD9D3990047C1BF /* PBXTargetDependency */,
- );
- name = curve;
- productName = curve;
- productReference = C97741DC0DD9D2D80047C1BF /* curve.app */;
- productType = "com.apple.product-type.application";
- };
C97741FE0DD9D33B0047C1BF /* Demo */ = {
isa = PBXNativeTarget;
buildConfigurationList = C97742040DD9D33C0047C1BF /* Build configuration list for PBXNativeTarget "Demo" */;
buildPhases = (
+ C9EAC4140E787298004F64F7 /* Resources */,
C97741FC0DD9D33B0047C1BF /* Sources */,
C97741FD0DD9D33B0047C1BF /* Frameworks */,
C9FB9A980DE34AB200026BB1 /* CopyFiles */,
@@ -4528,12 +4756,10 @@
C97742390DD9D3BA0047C1BF /* PBXTargetDependency */,
C977423B0DD9D3BA0047C1BF /* PBXTargetDependency */,
C977423D0DD9D3BA0047C1BF /* PBXTargetDependency */,
- C977423F0DD9D3BA0047C1BF /* PBXTargetDependency */,
C97742410DD9D3BA0047C1BF /* PBXTargetDependency */,
C97742430DD9D3BA0047C1BF /* PBXTargetDependency */,
C97742450DD9D3BA0047C1BF /* PBXTargetDependency */,
C97742470DD9D3BA0047C1BF /* PBXTargetDependency */,
- C97742490DD9D3BA0047C1BF /* PBXTargetDependency */,
C918E1E80DDA13BC00167E99 /* PBXTargetDependency */,
C918E1EA0DDA13BC00167E99 /* PBXTargetDependency */,
C918E1EC0DDA13BC00167E99 /* PBXTargetDependency */,
@@ -4577,6 +4803,7 @@
C918E2380DDA13BC00167E99 /* PBXTargetDependency */,
C918E23A0DDA13BC00167E99 /* PBXTargetDependency */,
C918E23C0DDA13BC00167E99 /* PBXTargetDependency */,
+ C9EAC41F0E78730F004F64F7 /* PBXTargetDependency */,
C918E23E0DDA13BC00167E99 /* PBXTargetDependency */,
);
name = Demo;
@@ -4591,6 +4818,7 @@
C97742590DD9D8110047C1BF /* Resources */,
C977425A0DD9D8110047C1BF /* Sources */,
C977425B0DD9D8110047C1BF /* Frameworks */,
+ C9EAC49C0E787777004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -4609,6 +4837,7 @@
C99CF5200DD78B550094BD10 /* Resources */,
C99CF5210DD78B550094BD10 /* Sources */,
C99CF5220DD78B550094BD10 /* Frameworks */,
+ C9EAC4900E7876C2004F64F7 /* CopyFiles */,
);
buildRules = (
C99CF5350DD78C640094BD10 /* PBXBuildRule */,
@@ -4623,6 +4852,25 @@
productReference = C99CF5240DD78B550094BD10 /* CubeView.app */;
productType = "com.apple.product-type.application";
};
+ C99E1EAD0E78628600AECCF6 /* curve */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = C99E1EB90E78628800AECCF6 /* Build configuration list for PBXNativeTarget "curve" */;
+ buildPhases = (
+ C99E1EAA0E78628600AECCF6 /* Resources */,
+ C99E1EAB0E78628600AECCF6 /* Sources */,
+ C99E1EAC0E78628600AECCF6 /* Frameworks */,
+ C9EAC4980E7876FB004F64F7 /* CopyFiles */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ C9EAC2EC0E786785004F64F7 /* PBXTargetDependency */,
+ );
+ name = curve;
+ productName = curve;
+ productReference = C99E1EAE0E78628600AECCF6 /* curve.app */;
+ productType = "com.apple.product-type.application";
+ };
C9A3E9500DD6336500486E4F /* fltk */ = {
isa = PBXNativeTarget;
buildConfigurationList = C9A3E9570DD6336500486E4F /* Build configuration list for PBXNativeTarget "fltk" */;
@@ -4780,6 +5028,7 @@
C9A3ECFE0DD63C8B00486E4F /* Resources */,
C9A3ECFF0DD63C8B00486E4F /* Sources */,
C9A3ED000DD63C8B00486E4F /* Frameworks */,
+ C9EAC3FF0E78718C004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -4798,11 +5047,11 @@
C9A3ED160DD63D2800486E4F /* Resources */,
C9A3ED170DD63D2800486E4F /* Sources */,
C9A3ED180DD63D2800486E4F /* Frameworks */,
+ C9EAC4280E7873ED004F64F7 /* CopyFiles */,
);
buildRules = (
);
dependencies = (
- C918DB990DD9EFED00167E99 /* PBXTargetDependency */,
C9C873590DD7769B00A9793F /* PBXTargetDependency */,
);
name = ask;
@@ -4817,6 +5066,7 @@
C9A3ED2F0DD63D8600486E4F /* Resources */,
C9A3ED300DD63D8600486E4F /* Sources */,
C9A3ED310DD63D8600486E4F /* Frameworks */,
+ C9EAC43D0E7874C3004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -4835,6 +5085,7 @@
C9A3ED490DD63DD100486E4F /* Resources */,
C9A3ED4A0DD63DD100486E4F /* Sources */,
C9A3ED4B0DD63DD100486E4F /* Frameworks */,
+ C9EAC4470E78755C004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -4853,6 +5104,7 @@
C9A3ED690DD63E7F00486E4F /* Resources */,
C9A3ED6A0DD63E7F00486E4F /* Sources */,
C9A3ED6B0DD63E7F00486E4F /* Frameworks */,
+ C9EAC44D0E7875B5004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -4871,6 +5123,7 @@
C9A3ED810DD63EDC00486E4F /* Resources */,
C9A3ED820DD63EDC00486E4F /* Sources */,
C9A3ED830DD63EDC00486E4F /* Frameworks */,
+ C9EAC46B0E78765E004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -4889,6 +5142,7 @@
C9A3EDAB0DD6457A00486E4F /* Resources */,
C9A3EDAC0DD6457A00486E4F /* Sources */,
C9A3EDAD0DD6457A00486E4F /* Frameworks */,
+ C9EAC46C0E78765E004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -4907,6 +5161,7 @@
C9A3EDC30DD645C200486E4F /* Resources */,
C9A3EDC40DD645C200486E4F /* Sources */,
C9A3EDC50DD645C200486E4F /* Frameworks */,
+ C9EAC46D0E78765E004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -4925,6 +5180,7 @@
C9A3EDDA0DD6460900486E4F /* Resources */,
C9A3EDDB0DD6460900486E4F /* Sources */,
C9A3EDDC0DD6460900486E4F /* Frameworks */,
+ C9EAC46E0E78765E004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -4943,6 +5199,7 @@
C9A3EDF50DD6467E00486E4F /* Resources */,
C9A3EDF60DD6467E00486E4F /* Sources */,
C9A3EDF70DD6467E00486E4F /* Frameworks */,
+ C9EAC46F0E78765E004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -4954,25 +5211,6 @@
productReference = C9A3EDF90DD6467E00486E4F /* clock.app */;
productType = "com.apple.product-type.application";
};
- C9A3EE100DD646DA00486E4F /* colbrowser */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = C9A3EE160DD646DB00486E4F /* Build configuration list for PBXNativeTarget "colbrowser" */;
- buildPhases = (
- C9A3EE0D0DD646DA00486E4F /* Resources */,
- C9A3EE0E0DD646DA00486E4F /* Sources */,
- C9A3EE0F0DD646DA00486E4F /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- C9A3EE680DD64A6300486E4F /* PBXTargetDependency */,
- C9A3EE6A0DD64A6A00486E4F /* PBXTargetDependency */,
- );
- name = colbrowser;
- productName = colbrowser;
- productReference = C9A3EE110DD646DA00486E4F /* colbrowser.app */;
- productType = "com.apple.product-type.application";
- };
C9C870BD0DD7721700A9793F /* color_chooser */ = {
isa = PBXNativeTarget;
buildConfigurationList = C9C870C30DD7721700A9793F /* Build configuration list for PBXNativeTarget "color_chooser" */;
@@ -4980,6 +5218,7 @@
C9C870BA0DD7721700A9793F /* Resources */,
C9C870BB0DD7721700A9793F /* Sources */,
C9C870BC0DD7721700A9793F /* Frameworks */,
+ C9EAC47F0E787699004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -4998,6 +5237,7 @@
C9C871E40DD773E700A9793F /* Resources */,
C9C871E50DD773E700A9793F /* Sources */,
C9C871E60DD773E700A9793F /* Frameworks */,
+ C9EAC4800E787699004F64F7 /* CopyFiles */,
);
buildRules = (
);
@@ -5033,6 +5273,26 @@
productReference = C9C873740DD7772000A9793F /* Fluid.app */;
productType = "com.apple.product-type.application";
};
+ C9EAC2DB0E786725004F64F7 /* colbrowser */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = C9EAC2E10E786726004F64F7 /* Build configuration list for PBXNativeTarget "colbrowser" */;
+ buildPhases = (
+ C9EAC2D80E786725004F64F7 /* Resources */,
+ C9EAC2D90E786725004F64F7 /* Sources */,
+ C9EAC2DA0E786725004F64F7 /* Frameworks */,
+ C9EAC4700E78765E004F64F7 /* CopyFiles */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ C9EAC2FF0E7867C9004F64F7 /* PBXTargetDependency */,
+ C9EAC3010E7867C9004F64F7 /* PBXTargetDependency */,
+ );
+ name = colbrowser;
+ productName = colbrowser;
+ productReference = C9EAC2DC0E786725004F64F7 /* colbrowser.app */;
+ productType = "com.apple.product-type.application";
+ };
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -5065,12 +5325,12 @@
C9A3EDC60DD645C200486E4F /* buttons */,
C9A3EDDD0DD6460900486E4F /* checkers */,
C9A3EDF80DD6467E00486E4F /* clock */,
- C9A3EE100DD646DA00486E4F /* colbrowser */,
+ C9EAC2DB0E786725004F64F7 /* colbrowser */,
C9C870BD0DD7721700A9793F /* color_chooser */,
C9C871E70DD773E700A9793F /* cube */,
C99CF5230DD78B550094BD10 /* CubeView */,
C97741840DD9D1910047C1BF /* cursor */,
- C97741DB0DD9D2D80047C1BF /* curve */,
+ C99E1EAD0E78628600AECCF6 /* curve */,
C977425C0DD9D8110047C1BF /* doublebuffer */,
C918DB360DD9EE4100167E99 /* editor */,
C918DB560DD9EEB800167E99 /* fast_slow */,
@@ -5446,25 +5706,25 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- C97741D80DD9D2D80047C1BF /* Resources */ = {
+ C97742590DD9D8110047C1BF /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
- C97742590DD9D8110047C1BF /* Resources */ = {
+ C99CF5200DD78B550094BD10 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ C99CF52E0DD78BD50094BD10 /* CubeViewUI.fl in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
- C99CF5200DD78B550094BD10 /* Resources */ = {
+ C99E1EAA0E78628600AECCF6 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- C99CF52E0DD78BD50094BD10 /* CubeViewUI.fl in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5594,35 +5854,42 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- C9A3EE0D0DD646DA00486E4F /* Resources */ = {
+ C9C870BA0DD7721700A9793F /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
- C9C870BA0DD7721700A9793F /* Resources */ = {
+ C9C871E40DD773E700A9793F /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
- C9C871E40DD773E700A9793F /* Resources */ = {
+ C9C873700DD7772000A9793F /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ C93F25300DDA257B0017EE72 /* fluid.icns in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
- C9C873700DD7772000A9793F /* Resources */ = {
+ C9EAC2D80E786725004F64F7 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- C93F25300DDA257B0017EE72 /* fluid.icns in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
+ C9EAC4140E787298004F64F7 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -5989,14 +6256,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- C97741D90DD9D2D80047C1BF /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- C97741E80DD9D2ED0047C1BF /* curve.cxx in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
C97741FC0DD9D33B0047C1BF /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -6023,6 +6282,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ C99E1EAB0E78628600AECCF6 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ C99E1EBC0E7862DA00AECCF6 /* curve.cxx in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
C9A3E94E0DD6336500486E4F /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -6163,6 +6430,9 @@
C9A3EC410DD634CC00486E4F /* fl_shadow_box.cxx in Sources */,
C94A763B0E76CF6700AAA38E /* fl_utf.c in Sources */,
C94A763C0E76CF6700AAA38E /* fl_utf8.cxx in Sources */,
+ C99E1E9B0E78620B00AECCF6 /* case.c in Sources */,
+ C99E1E9C0E78620B00AECCF6 /* is_right2left.c in Sources */,
+ C99E1E9D0E78620B00AECCF6 /* is_spacing.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6382,14 +6652,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- C9A3EE0E0DD646DA00486E4F /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- C9A3EE190DD646F100486E4F /* colbrowser.cxx in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
C9C870BB0DD7721700A9793F /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -6432,6 +6694,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ C9EAC2D90E786725004F64F7 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ C9EAC2E80E786767004F64F7 /* colbrowser.cxx in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
@@ -6460,11 +6730,6 @@
target = C9A3E9500DD6336500486E4F /* fltk */;
targetProxy = C918DB740DD9EF4900167E99 /* PBXContainerItemProxy */;
};
- C918DB990DD9EFED00167E99 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = C9A3ECA20DD63A5200486E4F /* adjuster */;
- targetProxy = C918DB980DD9EFED00167E99 /* PBXContainerItemProxy */;
- };
C918DBA60DD9F00700167E99 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C9A3E9500DD6336500486E4F /* fltk */;
@@ -7045,11 +7310,6 @@
target = C9A3E9500DD6336500486E4F /* fltk */;
targetProxy = C97742130DD9D38A0047C1BF /* PBXContainerItemProxy */;
};
- C97742160DD9D3990047C1BF /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = C9A3E9500DD6336500486E4F /* fltk */;
- targetProxy = C97742150DD9D3990047C1BF /* PBXContainerItemProxy */;
- };
C97742190DD9D3BA0047C1BF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C9C873730DD7772000A9793F /* Fluid */;
@@ -7135,11 +7395,6 @@
target = C9A3EDF80DD6467E00486E4F /* clock */;
targetProxy = C977423C0DD9D3BA0047C1BF /* PBXContainerItemProxy */;
};
- C977423F0DD9D3BA0047C1BF /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = C9A3EE100DD646DA00486E4F /* colbrowser */;
- targetProxy = C977423E0DD9D3BA0047C1BF /* PBXContainerItemProxy */;
- };
C97742410DD9D3BA0047C1BF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C9C870BD0DD7721700A9793F /* color_chooser */;
@@ -7160,11 +7415,6 @@
target = C97741840DD9D1910047C1BF /* cursor */;
targetProxy = C97742460DD9D3BA0047C1BF /* PBXContainerItemProxy */;
};
- C97742490DD9D3BA0047C1BF /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = C97741DB0DD9D2D80047C1BF /* curve */;
- targetProxy = C97742480DD9D3BA0047C1BF /* PBXContainerItemProxy */;
- };
C977426A0DD9D8470047C1BF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C9A3E9500DD6336500486E4F /* fltk */;
@@ -7190,16 +7440,6 @@
target = C9A3E9500DD6336500486E4F /* fltk */;
targetProxy = C9A3EE630DD64A5100486E4F /* PBXContainerItemProxy */;
};
- C9A3EE680DD64A6300486E4F /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = C9A3E9500DD6336500486E4F /* fltk */;
- targetProxy = C9A3EE670DD64A6300486E4F /* PBXContainerItemProxy */;
- };
- C9A3EE6A0DD64A6A00486E4F /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = C9A3EC6D0DD6397400486E4F /* fltk_forms */;
- targetProxy = C9A3EE690DD64A6A00486E4F /* PBXContainerItemProxy */;
- };
C9C870D60DD772AA00A9793F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C9A3E9500DD6336500486E4F /* fltk */;
@@ -7320,6 +7560,26 @@
target = C9A3EC990DD639E600486E4F /* fltk_jpeg */;
targetProxy = C9DD583B0DD7888200A896B4 /* PBXContainerItemProxy */;
};
+ C9EAC2EC0E786785004F64F7 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = C9A3E9500DD6336500486E4F /* fltk */;
+ targetProxy = C9EAC2EB0E786785004F64F7 /* PBXContainerItemProxy */;
+ };
+ C9EAC2FF0E7867C9004F64F7 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = C9A3E9500DD6336500486E4F /* fltk */;
+ targetProxy = C9EAC2FE0E7867C9004F64F7 /* PBXContainerItemProxy */;
+ };
+ C9EAC3010E7867C9004F64F7 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = C9A3EC6D0DD6397400486E4F /* fltk_forms */;
+ targetProxy = C9EAC3000E7867C9004F64F7 /* PBXContainerItemProxy */;
+ };
+ C9EAC41F0E78730F004F64F7 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = C94A76CF0E77F59E00AAA38E /* utf8 */;
+ targetProxy = C9EAC41E0E78730F004F64F7 /* PBXContainerItemProxy */;
+ };
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
@@ -9438,109 +9698,109 @@
};
name = Release;
};
- C97741DF0DD9D2D90047C1BF /* Debug */ = {
+ C97742020DD9D33C0047C1BF /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
+ CURRENT_PROJECT_VERSION = 1.3;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+ GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/curve-Info.plist";
+ INFOPLIST_FILE = "plists/Demo-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = curve;
+ PRODUCT_NAME = Demo;
+ SKIP_INSTALL = YES;
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
};
name = Debug;
};
- C97741E00DD9D2D90047C1BF /* Release */ = {
+ C97742030DD9D33C0047C1BF /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = YES;
+ CURRENT_PROJECT_VERSION = 1.3;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+ GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/curve-Info.plist";
+ INFOPLIST_FILE = "plists/Demo-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = curve;
+ PRODUCT_NAME = Demo;
+ SKIP_INSTALL = YES;
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
name = Release;
};
- C97742020DD9D33C0047C1BF /* Debug */ = {
+ C97742600DD9D8110047C1BF /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 1.3;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
- GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/Demo-Info.plist";
+ INFOPLIST_FILE = "plists/doublebuffer-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = Demo;
- SKIP_INSTALL = YES;
+ PRODUCT_NAME = doublebuffer;
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
};
name = Debug;
};
- C97742030DD9D33C0047C1BF /* Release */ = {
+ C97742610DD9D8110047C1BF /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 1.3;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
- GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/Demo-Info.plist";
+ INFOPLIST_FILE = "plists/doublebuffer-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = Demo;
- SKIP_INSTALL = YES;
+ PRODUCT_NAME = doublebuffer;
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
name = Release;
};
- C97742600DD9D8110047C1BF /* Debug */ = {
+ C99CF5270DD78B550094BD10 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -9551,20 +9811,20 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/doublebuffer-Info.plist";
+ INFOPLIST_FILE = "plists/CubeView-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = doublebuffer;
+ PRODUCT_NAME = CubeView;
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
};
name = Debug;
};
- C97742610DD9D8110047C1BF /* Release */ = {
+ C99CF5280DD78B550094BD10 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
@@ -9574,22 +9834,23 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/doublebuffer-Info.plist";
+ INFOPLIST_FILE = "plists/CubeView-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = doublebuffer;
+ PRODUCT_NAME = CubeView;
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
name = Release;
};
- C99CF5270DD78B550094BD10 /* Debug */ = {
+ C99E1EB70E78628800AECCF6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -9597,39 +9858,35 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
- HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/CubeView-Info.plist";
+ INFOPLIST_FILE = "plists/curve-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = CubeView;
- WRAPPER_EXTENSION = app;
- ZERO_LINK = YES;
+ PRODUCT_NAME = curve;
};
name = Debug;
};
- C99CF5280DD78B550094BD10 /* Release */ = {
+ C99E1EB80E78628800AECCF6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
- HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/CubeView-Info.plist";
+ INFOPLIST_FILE = "curve-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = CubeView;
- WRAPPER_EXTENSION = app;
+ PRODUCT_NAME = curve;
ZERO_LINK = NO;
};
name = Release;
@@ -10556,7 +10813,7 @@
};
name = Release;
};
- C9A3EE140DD646DB00486E4F /* Debug */ = {
+ C9C870C10DD7721700A9793F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -10566,22 +10823,21 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
- GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/colbrowser-Info.plist";
+ INFOPLIST_FILE = "plists/color_chooser-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = colbrowser;
+ PRODUCT_NAME = color_chooser;
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
};
name = Debug;
};
- C9A3EE150DD646DB00486E4F /* Release */ = {
+ C9C870C20DD7721700A9793F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
@@ -10590,22 +10846,21 @@
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
- GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/colbrowser-Info.plist";
+ INFOPLIST_FILE = "plists/color_chooser-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = colbrowser;
+ PRODUCT_NAME = color_chooser;
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
name = Release;
};
- C9C870C10DD7721700A9793F /* Debug */ = {
+ C9C871EB0DD773E700A9793F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -10616,20 +10871,20 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/color_chooser-Info.plist";
+ INFOPLIST_FILE = "plists/cube-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = color_chooser;
+ PRODUCT_NAME = cube;
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
};
name = Debug;
};
- C9C870C20DD7721700A9793F /* Release */ = {
+ C9C871EC0DD773E700A9793F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
@@ -10639,20 +10894,20 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/color_chooser-Info.plist";
+ INFOPLIST_FILE = "plists/cube-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = color_chooser;
+ PRODUCT_NAME = cube;
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
name = Release;
};
- C9C871EB0DD773E700A9793F /* Debug */ = {
+ C9C873770DD7772100A9793F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -10662,21 +10917,26 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
- HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/cube-Info.plist";
- INSTALL_PATH = "$(HOME)/Applications";
+ HEADER_SEARCH_PATHS = (
+ ../../ide/XCode3/,
+ ../../,
+ ../../png,
+ );
+ INFOPLIST_FILE = "plists/Fluid-Info.plist";
+ INSTALL_PATH = /Applications;
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = cube;
+ PRODUCT_NAME = Fluid;
+ USER_HEADER_SEARCH_PATHS = "";
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
};
name = Debug;
};
- C9C871EC0DD773E700A9793F /* Release */ = {
+ C9C873780DD7772100A9793F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
@@ -10685,23 +10945,29 @@
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
- HEADER_SEARCH_PATHS = ../../;
- INFOPLIST_FILE = "plists/cube-Info.plist";
- INSTALL_PATH = "$(HOME)/Applications";
+ HEADER_SEARCH_PATHS = (
+ ../../ide/XCode3/,
+ ../../,
+ ../../png,
+ );
+ INFOPLIST_FILE = "plists/Fluid-Info.plist";
+ INSTALL_PATH = /Applications;
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = cube;
+ PRODUCT_NAME = Fluid;
+ USER_HEADER_SEARCH_PATHS = "";
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
name = Release;
};
- C9C873770DD7772100A9793F /* Debug */ = {
+ C9EAC2DF0E786726004F64F7 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -10709,49 +10975,37 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
- HEADER_SEARCH_PATHS = (
- ../../ide/XCode3/,
- ../../,
- ../../png,
- );
- INFOPLIST_FILE = "plists/Fluid-Info.plist";
- INSTALL_PATH = /Applications;
+ GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
+ INFOPLIST_FILE = "plists/colbrowser-Info.plist";
+ INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = Fluid;
- USER_HEADER_SEARCH_PATHS = "";
- WRAPPER_EXTENSION = app;
- ZERO_LINK = YES;
+ PRODUCT_NAME = colbrowser;
};
name = Debug;
};
- C9C873780DD7772100A9793F /* Release */ = {
+ C9EAC2E00E786726004F64F7 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
- HEADER_SEARCH_PATHS = (
- ../../ide/XCode3/,
- ../../,
- ../../png,
- );
- INFOPLIST_FILE = "plists/Fluid-Info.plist";
- INSTALL_PATH = /Applications;
+ GCC_PREPROCESSOR_DEFINITIONS = USING_XCODE;
+ INFOPLIST_FILE = "colbrowser-Info.plist";
+ INSTALL_PATH = "$(HOME)/Applications";
OTHER_LDFLAGS = (
"-framework",
Carbon,
);
PREBINDING = NO;
- PRODUCT_NAME = Fluid;
- USER_HEADER_SEARCH_PATHS = "";
- WRAPPER_EXTENSION = app;
+ PRODUCT_NAME = colbrowser;
ZERO_LINK = NO;
};
name = Release;
@@ -11164,15 +11418,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- C97741E10DD9D2D90047C1BF /* Build configuration list for PBXNativeTarget "curve" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- C97741DF0DD9D2D90047C1BF /* Debug */,
- C97741E00DD9D2D90047C1BF /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
C97742040DD9D33C0047C1BF /* Build configuration list for PBXNativeTarget "Demo" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@@ -11200,6 +11445,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
+ C99E1EB90E78628800AECCF6 /* Build configuration list for PBXNativeTarget "curve" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ C99E1EB70E78628800AECCF6 /* Debug */,
+ C99E1EB80E78628800AECCF6 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
C9A3E93F0DD6332D00486E4F /* Build configuration list for PBXProject "FLTK" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@@ -11371,15 +11625,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- C9A3EE160DD646DB00486E4F /* Build configuration list for PBXNativeTarget "colbrowser" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- C9A3EE140DD646DB00486E4F /* Debug */,
- C9A3EE150DD646DB00486E4F /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
C9C870C30DD7721700A9793F /* Build configuration list for PBXNativeTarget "color_chooser" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@@ -11407,6 +11652,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
+ C9EAC2E10E786726004F64F7 /* Build configuration list for PBXNativeTarget "colbrowser" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ C9EAC2DF0E786726004F64F7 /* Debug */,
+ C9EAC2E00E786726004F64F7 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
/* End XCConfigurationList section */
};
rootObject = C9A3E93C0DD6332D00486E4F /* Project object */;
Modified: branches/branch-1.3-utf8/ide/Xcode3.1/plists/colbrowser-Info.plist
===================================================================
--- branches/branch-1.3-utf8/ide/Xcode3.0/plists/colbrowser-Info.plist 2008-09-10 13:27:52 UTC (rev 6206)
+++ branches/branch-1.3-utf8/ide/Xcode3.1/plists/colbrowser-Info.plist 2008-09-10 21:55:14 UTC (rev 6208)
@@ -7,13 +7,13 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
- <string>com.yourcompany.colbrowser</string>
+ <string>org.fltk.test.colbrowser</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
- <string>????</string>
+ <string>FLTK</string>
<key>CFBundleVersion</key>
<string>1.0</string>
</dict>
Modified: branches/branch-1.3-utf8/ide/Xcode3.1/plists/curve-Info.plist
===================================================================
--- branches/branch-1.3-utf8/ide/Xcode3.0/plists/curve-Info.plist 2008-09-10 13:27:52 UTC (rev 6206)
+++ branches/branch-1.3-utf8/ide/Xcode3.1/plists/curve-Info.plist 2008-09-10 21:55:14 UTC (rev 6208)
@@ -7,13 +7,13 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
- <string>com.yourcompany.curve</string>
+ <string>org.fltk.test.curve</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
- <string>????</string>
+ <string>FLTK</string>
<key>CFBundleVersion</key>
<string>1.0</string>
</dict>
Modified: branches/branch-1.3-utf8/src/Makefile
===================================================================
--- branches/branch-1.3-utf8/src/Makefile 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/src/Makefile 2008-09-10 21:55:14 UTC (rev 6208)
@@ -189,11 +189,20 @@
CFILES = fl_call_main.c flstring.c scandir.c numericsort.c vsnprintf.c fl_utf.c
+UTF8CFILES = \
+ xutf8/case.c \
+ xutf8/is_right2left.c \
+ xutf8/is_spacing.c \
+ xutf8/keysym2Ucs.c \
+ xutf8/utf8Input.c \
+ xutf8/utf8Utils.c \
+ xutf8/utf8Wrap.c
+
################################################################
include ../makeinclude
-OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o)
+OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) $(UTF8CFILES:.c=.o)
GLOBJECTS = $(GLCPPFILES:.cxx=.o)
FLOBJECTS = $(FLCPPFILES:.cxx=.o)
IMGOBJECTS = $(IMGCPPFILES:.cxx=.o)
@@ -418,9 +427,9 @@
libfltk_gl.dylib libfltk_images.dylib \
cmap core
-depend: $(CPPFILES) $(FLCPPFILES) $(GLCPPFILES) $(IMGCPPFILES) $(CFILES)
+depend: $(CPPFILES) $(FLCPPFILES) $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8CFILES)
makedepend -Y -I.. -f makedepend $(CPPFILES) $(FLCPPFILES) \
- $(GLCPPFILES) $(IMGCPPFILES) $(CFILES)
+ $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8CFILES)
# Automatically generated dependencies...
include makedepend
Modified: branches/branch-1.3-utf8/src/fl_utf8.cxx
===================================================================
--- branches/branch-1.3-utf8/src/fl_utf8.cxx 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/src/fl_utf8.cxx 2008-09-10 21:55:14 UTC (rev 6208)
@@ -68,11 +68,6 @@
unsigned short XUtf8IsNonSpacing(unsigned int ucs);
};
-int XUtf8Tolower(int ucs) {
- if (ucs<128) return tolower(ucs);
- return ucs;
-}
-
#else // X-windows platform
# include <FL/Xutf8.h>
Modified: branches/branch-1.3-utf8/src/xutf8/case.c
===================================================================
--- branches/branch-1.3-utf8/src/xutf8/case.c 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/src/xutf8/case.c 2008-09-10 21:55:14 UTC (rev 6208)
@@ -36,6 +36,10 @@
******************************************************************************/
+/*
+ * This file is required on all platforms for utf8 support
+ */
+
#include "headers/case.h"
#include <stdlib.h>
Modified: branches/branch-1.3-utf8/src/xutf8/is_right2left.c
===================================================================
--- branches/branch-1.3-utf8/src/xutf8/is_right2left.c 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/src/xutf8/is_right2left.c 2008-09-10 21:55:14 UTC (rev 6208)
@@ -24,6 +24,10 @@
******************************************************************************/
+/*
+ * This file is required on all platforms for utf8 support
+ */
+
unsigned short
XUtf8IsRightToLeft(
unsigned int ucs)
Modified: branches/branch-1.3-utf8/src/xutf8/is_spacing.c
===================================================================
--- branches/branch-1.3-utf8/src/xutf8/is_spacing.c 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/src/xutf8/is_spacing.c 2008-09-10 21:55:14 UTC (rev 6208)
@@ -24,6 +24,10 @@
******************************************************************************/
+/*
+ * This file is required on all platforms for utf8 support
+ */
+
#include "headers/spacing.h"
Modified: branches/branch-1.3-utf8/src/xutf8/keysym2Ucs.c
===================================================================
--- branches/branch-1.3-utf8/src/xutf8/keysym2Ucs.c 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/src/xutf8/keysym2Ucs.c 2008-09-10 21:55:14 UTC (rev 6208)
@@ -36,7 +36,9 @@
#define KEYSYM2UCS_INCLUDED
-#include <FL/Xutf8.h>
+#if !defined(WIN32) && !defined(__APPLE__)
+
+#include "../../FL/Xutf8.h"
#include "imKStoUCS.c"
@@ -45,3 +47,5 @@
return (long) KeySymToUcs4(keysym);
}
+#endif // X11 only
+
Modified: branches/branch-1.3-utf8/src/xutf8/utf8Input.c
===================================================================
--- branches/branch-1.3-utf8/src/xutf8/utf8Input.c 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/src/xutf8/utf8Input.c 2008-09-10 21:55:14 UTC (rev 6208)
@@ -33,8 +33,10 @@
******************************************************************************/
-#include "../config.h"
-#include <FL/Xutf8.h>
+#if !defined(WIN32) && !defined(__APPLE__)
+
+#include "config.h"
+#include "../../FL/Xutf8.h"
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -440,4 +442,5 @@
return len;
}
+#endif // X11 only
Modified: branches/branch-1.3-utf8/src/xutf8/utf8Utils.c
===================================================================
--- branches/branch-1.3-utf8/src/xutf8/utf8Utils.c 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/src/xutf8/utf8Utils.c 2008-09-10 21:55:14 UTC (rev 6208)
@@ -38,8 +38,10 @@
* Author: Jean-Marc Lienher ( http://oksid.ch )
*/
-#include <FL/Xutf8.h>
+#if !defined(WIN32) && !defined(__APPLE__)
+#include "../../FL/Xutf8.h"
+
/*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/
/*
@@ -249,6 +251,8 @@
return -1;
}
+#endif // X11 only
+
/*
* End of "$Id: $".
*/
Modified: branches/branch-1.3-utf8/src/xutf8/utf8Wrap.c
===================================================================
--- branches/branch-1.3-utf8/src/xutf8/utf8Wrap.c 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/src/xutf8/utf8Wrap.c 2008-09-10 21:55:14 UTC (rev 6208)
@@ -38,8 +38,9 @@
* Author: Jean-Marc Lienher ( http://oksid.ch )
*/
+#if !defined(WIN32) && !defined(__APPLE__)
-#include <FL/Xutf8.h>
+#include "../../FL/Xutf8.h"
#include <X11/Xlib.h>
#include <ctype.h>
#include <stdlib.h>
@@ -926,6 +927,8 @@
free(font_set);
}
+#endif // X11 only
+
/*
* End of "$Id: $".
*/
Modified: branches/branch-1.3-utf8/test/demo.cxx
===================================================================
--- branches/branch-1.3-utf8/test/demo.cxx 2008-09-10 19:19:56 UTC (rev 6207)
+++ branches/branch-1.3-utf8/test/demo.cxx 2008-09-10 21:55:14 UTC (rev 6208)
@@ -274,7 +274,17 @@
delete[] command;
delete[] copy_of_icommand;
-
+
+#elif defined USING_XCODE
+
+ int icommand_length = strlen(menus[men].icommand[bn]);
+ char* command = new char[icommand_length+24]; // extraspace for 'open ../../(name).app &\0'
+
+ sprintf(command, "open ../../../%s.app &", menus[men].icommand[bn]);
+ system(command);
+
+ delete[] command;
+
#else // NON WIN32 systems.
int icommand_length = strlen(menus[men].icommand[bn]);
[ Direct Link to Message ] | |
