Changeset 107 for trunk/m2

Timestamp:

04/03/06 21:55:07 (3 years ago)

Author:

krobillard

Message:

m2 - Can now build Mac OS universal binaries.

Files:

• trunk/m2/m2_macx.r (modified) (8 diffs)

trunk/m2/m2_macx.r

@@ -5 +5 @@
 
 macx: func [blk] [do blk]
+
+bundle:    does [m2/ct/cfg_bundle: true]
+universal: does [m2/ct/cfg_universal: true]
 
 eol: "^/" 
@@ -92 +95 @@
     built_obj_rule: none
 
+    cfg_bundle: none
+    cfg_universal: none
+
     obj_macro: none
 
@@ -110 +116 @@
         if cfg/release [
             cflags {-O3 -DNDEBUG}
+        ]
+
+        if cfg_universal [
+            cflags {-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386}
+            lflags {-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386}
         ]
 
@@ -122 +133 @@
             ][
                 include_from {/Library/Frameworks/QtCore.framework/Headers}
-                lflags {-framework QtCore}
+                cflags {-F/Library/Frameworks}
+                lflags {-F/Library/Frameworks -framework QtCore}
+                lflags {-framework Carbon}
                 do bind cfg/qt in qt-includes 'gui
             ]
@@ -143 +156 @@
                 libs_from %"$(QTDIR)/lib" {qt}
                 ; If Qt is compiled as a static library.
-                lflags {-framework carbon -lz}
+                lflags {-framework Carbon -lz}
             ]
             ;[
-                ;    lflags {-bind_at_load -framework QtGui -framework QtCore}
-            ;    lflags {-framework carbon}
+            ;    lflags {-bind_at_load -framework QtGui -framework QtCore}
+            ;    lflags {-framework Carbon}
             ;]
         ]
@@ -196 +209 @@
             { $(} uc {_LIBS)} eol
         ]
+
+        ;if cfg_bundle [ emit {^/# bundle} ]
     ]
 ]
@@ -209 +224 @@
     [
         emit [ eol output_file ": " obj_macro
-            "^/^(tab)ar rc $@ " obj_macro " $(" uppercase name "_LFLAGS)"
+            "^/^(tab)ar rc $@ " obj_macro  ; " $(" uppercase name "_LFLAGS)"
             "^/^(tab)ranlib $@^/"
         ]
@@ -249 +264 @@
 CC       = gcc
 CXX      = g++
-LINK     = gcc
+LINK     = gcc
 LINK_CXX = g++
 TAR      = tar -cf
-GZIP     = gzip -9f
+GZIP     = gzip -9f
 MOC      = <moc_exe>