Changeset 424

Timestamp:

07/02/07 21:08:38 (15 months ago)

Author:

krobillard

Message:

m2 - Added qt-static. Implemented this for Mac OS.

Location:

trunk/m2

Files:

• m2 (modified) (2 diffs)
• m2_macx.r (modified) (4 diffs)

trunk/m2/m2

@@ -79 +79 @@
         configuration: context [
                 release: debug: warn: false
-                opengl: qt: x11: false
+                opengl: qt: qt-static: x11: false
         ]
 
@@ -332 +332 @@
 qt3:      func [{Using Troll Tech's Qt 3.}]    [ m2/ct/cfg/qt: 3 ]
 qt:       func [{Using Troll Tech's Qt 4.} libs [block!]] [ m2/ct/cfg/qt: libs ]
+qt-static: does [m2/ct/cfg/qt-static: true]
 x11:      func [{Using X11 libraries.}]        [ m2/ct/cfg/x11: true ]
 

trunk/m2/m2_macx.r

@@ -69 +69 @@
 
 
-qt-includes: context [
+qt-libs: context [
    gui:     does [include_from {/Library/Frameworks/QtGui.framework/Headers}
                   lflags   {-framework QtGui}]
@@ -89 +89 @@
 ]
 
+qt-static-libs: context [
+   qlib: func [name] [
+       include_from join {$(QTDIR)/include/} name
+       lflags join {-l} name
+   ]
+   gui:     does [qlib {QtGui}]
+   network: does [qlib {QtNetwork}]
+   opengl:  does [qlib {QtOpenGL}]
+   xml:     does [qlib {QtXml}]
+   svg:     does [qlib {QtSvg}]
+   sql:     does [qlib {QtSql}]
+   support: does [qlib {Qt3Support} cxxflags {-DQT3_SUPPORT}]
+]
 
 exe_target: make m2/target_env
@@ -132 +145 @@
                 include_from {$(QTDIR)/include}
             ][
-                include_from {/Library/Frameworks/QtCore.framework/Headers}
-                cflags {-F/Library/Frameworks}
-                lflags {-F/Library/Frameworks -framework QtCore}
-                lflags {-framework Carbon}
-                do bind cfg/qt in qt-includes 'gui
+                either cfg/qt-static [
+                    include_from {$(QTDIR)/include}
+                    include_from {$(QTDIR)/include/QtCore}
+                    lflags {-L$(QTDIR)/lib -lQtCore}
+                    lflags {-framework Carbon -lz -liconv}
+                    do bind cfg/qt in qt-static-libs 'gui
+                ][
+                    include_from {/Library/Frameworks/QtCore.framework/Headers}
+                    cflags {-F/Library/Frameworks}
+                    lflags {-F/Library/Frameworks -framework QtCore}
+                    lflags {-framework Carbon}
+                    do bind cfg/qt in qt-libs 'gui
+                ]
             ]
             if cfg/release [
@@ -160 +181 @@
                 lflags {-framework Carbon -lz}
             ]
-            ;[
-            ;    lflags {-bind_at_load -framework QtGui -framework QtCore}
-            ;    lflags {-framework Carbon}
-            ;]
         ]
     ]