The 3 objective-c++ files used for the Mac OS X support are no longer included

by other files but added to the list of source files to be compiled
for Mac OS X only. Support files for autoconf/configure/make, CMake and Xcode
are also modified accordingly.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8049 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 25 insertions, 13 deletions

diff --git a/fluid/ide_maketools.cxx b/fluid/ide_maketools.cxx
index 91dd49249..f2b6eb503 100644
--- a/fluid/ide_maketools.cxx
+++ b/fluid/ide_maketools.cxx
@@ -490,6 +490,11 @@ public:
     fputs("\tfl_utf8.cxx \\\n", f);
     fputs("\tps_image.cxx\n", f);
     fputs("\n", f);
+    
+    fputs("OBJCPPFILES = \\\n", f);
+    fputs("\tFl_cocoa.mm Fl_Quartz_Printer.mm Fl_Native_File_Chooser_MAC.mm\n", f);
+    fputs("\n", f);
+    
     fputs("FLCPPFILES = \\\n", f);
     fputs("\tforms_compatability.cxx \\\n", f);
     fputs("\tforms_bitmap.cxx \\\n", f);
@@ -538,7 +543,12 @@ public:
     fputs("\n", f);
     fputs("include ../makeinclude\n", f);
     fputs("\n", f);
-    fputs("OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) $(UTF8CFILES:.c=.o)\n", f);
+    
+    fputs("MMFILES = $(shell \\\n"
+	  "\tif [ $(USEMMFILES) = Yes ]; then echo $(OBJCPPFILES);\\\n"
+	  "\tfi)\n\n", f);
+    
+    fputs("OBJECTS = $(MMFILES:.mm=.o) $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) $(UTF8CFILES:.c=.o)\n", f);
     fputs("GLOBJECTS = $(GLCPPFILES:.cxx=.o)\n", f);
     fputs("FLOBJECTS = $(FLCPPFILES:.cxx=.o)\n", f);
     fputs("IMGOBJECTS = $(IMGCPPFILES:.cxx=.o)\n", f);
@@ -795,8 +805,8 @@ public:
     fputs("\t\tlibfltk_gl.dylib libfltk_images.dylib \\\n", f);
     fputs("\t\tcmap core\n", f);
     fputs("\n", f);
-    fputs("depend:\t$(CPPFILES) $(FLCPPFILES) $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8CFILES)\n", f);
-    fputs("\tmakedepend -Y -I.. -f makedepend $(CPPFILES) $(FLCPPFILES) \\\n", f);
+    fputs("depend:\t$(CPPFILES) $(MMFILES) $(FLCPPFILES) $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8CFILES)\n", f);
+    fputs("\tmakedepend -Y -I.. -f makedepend $(CPPFILES) $(MMFILES) $(FLCPPFILES) \\\n", f);
     fputs("\t\t$(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8CFILES)\n", f);
     fputs("\n", f);
     fputs("# Automatically generated dependencies... generated on a Linux/Unix host !\n", f);
@@ -807,8 +817,11 @@ public:
     fputs("# Please add only non-Linux/Unix files or such that are optional\n", f);
     fputs("# (like \"*xft*\") here:\n", f);
     fputs("Fl_get_key.o:\tFl_get_key_mac.cxx Fl_get_key_win32.cxx\n", f);
-    fputs("Fl_Native_File_Chooser.o : Fl_Native_File_Chooser_MAC.mm Fl_Native_File_Chooser_WIN32.cxx\n", f);
-    fputs("Fl.o:\t\tFl_mac.cxx Fl_win32.cxx Fl_cocoa.mm\n", f);
+    fputs("Fl_Native_File_Chooser.o : Fl_Native_File_Chooser_WIN32.cxx\n", f);
+    fputs("Fl_Native_File_Chooser_MAC.o : Fl_Native_File_Chooser_MAC.mm\n", f);
+    fputs("Fl_Quartz_Printer.o : Fl_Quartz_Printer.mm\n", f);
+    fputs("Fl.o:\t\tFl_win32.cxx\n", f);
+    fputs("Fl_cocoa.o:\t\tFl_cocoa.mm\n", f);
     fputs("fl_color.o:\tfl_color_mac.cxx fl_color_win32.cxx\n", f);
     fputs("fl_dnd.o:\tfl_dnd_mac.cxx fl_dnd_win32.cxx fl_dnd_x.cxx\n", f);
     fputs("fl_draw_image.o: fl_draw_image_mac.cxx fl_draw_image_win32.cxx\n", f);
@@ -816,7 +829,7 @@ public:
     fputs("fl_read_image.o: fl_read_image_mac.cxx fl_read_image_win32.cxx\n", f);
     fputs("fl_set_fonts.o:\tfl_set_fonts_mac.cxx fl_set_fonts_x.cxx \\\n", f);
     fputs("\t\tfl_set_fonts_xft.cxx fl_set_fonts_win32.cxx\n", f);
-    fputs("Fl_Printer.o:\tFl_Quartz_Printer.mm Fl_GDI_Printer.cxx Fl_PS_Printer.cxx\n", f);
+    fputs("Fl_Printer.o:\tFl_GDI_Printer.cxx Fl_PostScript.cxx\n", f);
     fputs("\n", f);
     fputs("fl_arci.o:\t../FL/mac.H ../FL/win32.H\n", f);
     fputs("Fl_arg.o:\t../FL/mac.H ../FL/win32.H\n", f);
diff --git a/fluid/ide_support.cxx b/fluid/ide_support.cxx
index b88d32002..bcd88528a 100644
--- a/fluid/ide_support.cxx
+++ b/fluid/ide_support.cxx
@@ -510,7 +510,10 @@ int create_new_database(const char *filename)
     fltk_lib.add_source(files_db, "src/xutf8/case.c");
     fltk_lib.add_source(files_db, "src/xutf8/is_right2left.c");
     fltk_lib.add_source(files_db, "src/xutf8/is_spacing.c");
-    
+
+    xcode_only(fltk_lib.add_source(files_db, "src/Fl_cocoa.mm"));
+    xcode_only(fltk_lib.add_source(files_db, "src/Fl_Quartz_Printer.mm"));
+    xcode_only(fltk_lib.add_source(files_db, "src/Fl_Native_File_Chooser_MAC.mm"));
     
     fltk_lib.add_header(files_db, "FL/Enumerations.H");
     fltk_lib.add_header(files_db, "FL/Fl.H");
@@ -638,7 +641,7 @@ int create_new_database(const char *filename)
     fltk_lib.add_header(files_db, "FL/math.h");
     fltk_lib.add_header(files_db, "FL/names.h");
     fltk_lib.add_header(files_db, "FL/win32.H");
-    fltk_lib.add_header(files_db, "FL/x.H");    
+    fltk_lib.add_header(files_db, "FL/x.H");
     
     xcode_only(fltk_lib.add_external_lib(files_db, "/System/Library/Frameworks/AudioToolbox.framework"));
   }
diff --git a/fluid/ide_xcode.cxx b/fluid/ide_xcode.cxx
index 8c459f212..1063d3b11 100644
--- a/fluid/ide_xcode.cxx
+++ b/fluid/ide_xcode.cxx
@@ -29,7 +29,7 @@
  
     XCODE 3.0 IDE FILES
  
- The Xcode 3.0 IDE file format is using a quite comlex tree of multiply linked
+ The Xcode 3.0 IDE file format is using a quite complex tree of multiply linked
  entries to leave as much possibilities to developers as somehow possible. To 
  write this format, we will need to generate a bunch of new unique IDs that will
  be stored in the DB.
@@ -447,10 +447,6 @@ public:
       const char *filetype = "test";
       const char *ext = fileDB.fileExt();
       if (!ext) {
-      } else if (strcmp(pathAndName, "src/Fl.cxx")==0
-               ||strcmp(pathAndName, "src/Fl_Native_File_Chooser.cxx")==0
-               ||strcmp(pathAndName, "src/Fl_Printer.cxx")==0) { // FIXME: bad hack!
-        filetype = "sourcecode.cpp.objcpp";
       } else if (strcmp(ext, ".cxx")==0) {
         filetype = "sourcecode.cpp.cpp";
       } else if (strcmp(ext, ".H")==0) {