Legend:
- Unmodified
- Added
- Removed
-
trunk/m2/ChangeLog
r12 r93 1 1 M2 Change Log 2 3 4 V0.4.0 - ?? March 2006 5 6 * Individual Qt 4 libraries are now specified. 2 7 3 8 -
trunk/m2/README
r12 r93 1 M2 Version 0. 3.11 M2 Version 0.4.0 2 2 3 3 -
trunk/m2/m2
r12 r93 4 4 RCS: {$Id: m2,v 1.16 2005/06/21 05:07:06 karl Exp $} 5 5 Title: "m2" 6 Version: 0. 3.17 Rights: "Copyright (C) 2001 Karl Robillard"6 Version: 0.4.0 7 Rights: "Copyright (C) 2001-2006 Karl Robillard" 8 8 Author: "Karl Robillard" 9 9 Date: 27-May-2001 … … 330 330 331 331 opengl: func [{Using OpenGL libraries.}] [ m2/ct/cfg/opengl: true ] 332 qt :func [{Using Troll Tech's Qt 3.}] [ m2/ct/cfg/qt: 3 ]333 qt 4: func [{Using Troll Tech's Qt 4.}] [ m2/ct/cfg/qt: 4]332 qt3: func [{Using Troll Tech's Qt 3.}] [ m2/ct/cfg/qt: 3 ] 333 qt: func [{Using Troll Tech's Qt 4.} libs [block!]] [ m2/ct/cfg/qt: libs ] 334 334 x11: func [{Using X11 libraries.}] [ m2/ct/cfg/x11: true ] 335 335 -
trunk/m2/m2_cygwin.r
r12 r93 62 62 63 63 64 qt-includes: context [ 65 gui: does [ include_from {$(QTDIR)\include\QtGui} ] 66 network: does [ include_from {$(QTDIR)\include\QtNetwork} ] 67 opengl: does [ include_from {$(QTDIR)\include\QtOpenGL} ] 68 xml: does [ include_from {$(QTDIR)\include\QtXml} ] 69 svg: does [ include_from {$(QTDIR)\include\QtSvg} ] 70 sql: does [ include_from {$(QTDIR)\include\QtSql} ] 71 support: does [ include_from {$(QTDIR)\include\Qt3Support} 72 cxxflags {-DQT3_SUPPORT} ] 73 ] 74 75 qt-libraries: context [ 76 core: { QtCore4} 77 gui: { QtGui4} 78 network: { QtNetwork4} 79 opengl: { QtOpenGL4} 80 xml: { QtXml4} 81 svg: { QtSvg4} 82 sql: { QtSql4} 83 support: { Qt3Support4} 84 main: { qtmain} 85 ] 86 87 qt-debug-libraries: context [ 88 core: { QtCored4} 89 gui: { QtGuid4} 90 network: { QtNetworkd4} 91 opengl: { QtOpenGLd4} 92 xml: { QtXmld4} 93 xml: { QtXmld4} 94 svg: { QtSvgd4} 95 sql: { QtSqld4} 96 support: { Qt3Supportd4} 97 main: { qtmaind} 98 ] 99 100 64 101 exe_target: make m2/target_env 65 102 [ … … 101 138 102 139 if cfg/qt [ 103 include_from {$(QTDIR)/include} 140 either cfg/qt = 3 [ 141 include_from {$(QTDIR)\include} 142 ][ 143 include_from {$(QTDIR)\include} 144 include_from {$(QTDIR)\include\QtCore} 145 do bind cfg/qt in qt-includes 'gui 146 ] 104 147 if cfg/release [ 105 148 cxxflags {-DQT_NO_DEBUG} … … 117 160 do config 118 161 if cfg/qt [ 119 libs_from %"$(QTDIR)/lib" {qt} 162 either cfg/qt = 3 [ 163 ;libs_from {$(QTDIR)\lib} {qt} 164 ;libs_from {$(QTDIR)\lib} {qt-mt331 qtmain} 165 libs_from {$(QTDIR)\lib} {qt-mt qtmain} 166 167 ; If Qt statically compiled must link with more libs. 168 libs {ole32 comdlg32 winspool advapi32 imm32 ws2_32 shell32} 169 ][ 170 append qt4-libs: copy cfg/qt [core main] 171 172 libs_from %"$(QTDIR)/lib" 173 rejoin bind qt4-libs either cfg/debug 174 [in qt-debug-libraries 'gui] 175 [in qt-libraries 'gui] 176 177 libs {comdlg32 winspool advapi32 shell32 ole32} 178 ] 120 179 ] 121 180 ] -
trunk/m2/m2_linux.r
r12 r93 61 61 62 62 63 qt-includes: context [ 64 gui: does [ include_from {$(QTDIR)/include/QtGui} ] 65 network: does [ include_from {$(QTDIR)/include/QtNetwork} ] 66 opengl: does [ include_from {$(QTDIR)/include/QtOpenGL} ] 67 xml: does [ include_from {$(QTDIR)/include/QtXml} ] 68 svg: does [ include_from {$(QTDIR)/include/QtSvg} ] 69 sql: does [ include_from {$(QTDIR)/include/QtSql} ] 70 support: does [ include_from {$(QTDIR)/include/Qt3Support} 71 cxxflags {-DQT3_SUPPORT} ] 72 ] 73 74 qt-libraries: context [ 75 core: { QtCore} 76 gui: { QtGui} 77 network: { QtNetwork} 78 opengl: { QtOpenGL} 79 xml: { QtXml} 80 svg: { QtSvg} 81 sql: { QtSql} 82 support: { Qt3Support} 83 ] 84 85 qt-debug-libraries: context [ 86 core: { QtCore_debug} 87 gui: { QtGui_debug} 88 network: { QtNetwork_debug} 89 opengl: { QtOpenGL_debug} 90 xml: { QtXml} 91 xml: { QtXml_debug} 92 svg: { QtSvg_debug} 93 sql: { QtSql_debug} 94 support: { Qt3Support_debug} 95 ] 96 97 63 98 exe_target: make m2/target_env 64 99 [ … … 93 128 94 129 if cfg/qt [ 95 either cfg/qt < 4[130 either cfg/qt = 3 [ 96 131 include_from {$(QTDIR)/include} 97 132 ][ 98 133 include_from {$(QTDIR)/include} 99 134 include_from {$(QTDIR)/include/QtCore} 100 include_from {$(QTDIR)/include/QtGui} 101 include_from {$(QTDIR)/include/Qt3Support} 102 cxxflags {-DQT3_SUPPORT} 135 do bind cfg/qt in qt-includes 'gui 103 136 ] 104 137 if cfg/release [ … … 117 150 do config 118 151 if cfg/qt [ 119 either cfg/qt < 4[152 either cfg/qt = 3 [ 120 153 libs_from %"$(QTDIR)/lib" {qt-mt} 154 121 155 ; Linking statically requires more libs. 122 156 ;libs_from %"$(QTDIR)/lib" {qt} … … 124 158 ;libs {freetype dl} 125 159 ][ 126 libs_from %"$(QTDIR)/lib" {QtGui Qt3Support QtCore} 160 append qt4-libs: copy cfg/qt 'core 161 162 libs_from %"$(QTDIR)/lib" 163 rejoin bind qt4-libs either cfg/debug 164 [in qt-debug-libraries 'gui] 165 [in qt-libraries 'gui] 127 166 ] 128 167 ] -
trunk/m2/m2_macx.r
r12 r93 28 28 t/built_obj_rule: t/make_obj_rule 29 29 30 if t/cfg/qt == 4[30 if t/cfg/qt <> 3 [ 31 31 moc_exe: {moc} ; /usr/bin/moc-4.0 32 32 ] … … 66 66 67 67 68 qt-includes: context [ 69 gui: does [include_from {/Library/Frameworks/QtGui.framework/Headers} 70 lflags {-framework QtGui}] 71 network: does [include_from {/Library/Frameworks/QtNetwork.framework/Headers} 72 lflags {-framework QtNetwork}] 73 opengl: does [include_from {/Library/Frameworks/QtOpenGL.framework/Headers} 74 lflags {-framework QtOpenGL}] 75 xml: does [include_from {/Library/Frameworks/QtXml.framework/Headers} 76 lflags {-framework QtXml}] 77 svg: does [include_from {/Library/Frameworks/QtSvg.framework/Headers} 78 lflags {-framework QtSvg}] 79 sql: does [include_from {/Library/Frameworks/QtSql.framework/Headers} 80 lflags {-framework QtSql}] 81 support: does [ 82 include_from {/Library/Frameworks/Qt3Support.framework/Headers} 83 cxxflags {-DQT3_SUPPORT} 84 lflags {-framework Qt3Support } 85 ] 86 ] 87 88 68 89 exe_target: make m2/target_env 69 90 [ … … 97 118 98 119 if cfg/qt [ 99 either cfg/qt < 4[120 either cfg/qt = 3 [ 100 121 include_from {$(QTDIR)/include} 101 122 ][ 102 include_from {/Library/Frameworks/QtGui.framework/Headers}103 123 include_from {/Library/Frameworks/QtCore.framework/Headers} 124 lflags {-framework QtCore} 125 do bind cfg/qt in qt-includes 'gui 104 126 ] 105 127 if cfg/release [ … … 118 140 do config 119 141 if cfg/qt [ 120 either cfg/qt < 4[142 if cfg/qt = 3 [ 121 143 libs_from %"$(QTDIR)/lib" {qt} 122 144 ; If Qt is compiled as a static library. 123 145 lflags {-framework carbon -lz} 124 ][125 lflags {-bind_at_load -framework QtGui -framework QtCore}126 lflags {-framework carbon}127 146 ] 147 ;[ 148 ; lflags {-bind_at_load -framework QtGui -framework QtCore} 149 ; lflags {-framework carbon} 150 ;] 128 151 ] 129 152 ] -
trunk/m2/m2_sun.r
r12 r93 1 1 REBOL [ 2 2 Title: "m2 Solaris-g++ template" 3 Notes: "Only tested on Solaris 8"4 3 ] 5 4 … … 62 61 63 62 63 qt-includes: context [ 64 gui: does [ include_from {$(QTDIR)/include/QtGui} ] 65 network: does [ include_from {$(QTDIR)/include/QtNetwork} ] 66 opengl: does [ include_from {$(QTDIR)/include/QtOpenGL} ] 67 xml: does [ include_from {$(QTDIR)/include/QtXml} ] 68 svg: does [ include_from {$(QTDIR)/include/QtSvg} ] 69 sql: does [ include_from {$(QTDIR)/include/QtSql} ] 70 support: does [ include_from {$(QTDIR)/include/Qt3Support} 71 cxxflags {-DQT3_SUPPORT} ] 72 ] 73 74 qt-libraries: context [ 75 core: { QtCore} 76 gui: { QtGui} 77 network: { QtNetwork} 78 opengl: { QtOpenGL} 79 xml: { QtXml} 80 svg: { QtSvg} 81 sql: { QtSql} 82 support: { Qt3Support} 83 ] 84 85 qt-debug-libraries: context [ 86 core: { QtCore_debug} 87 gui: { QtGui_debug} 88 network: { QtNetwork_debug} 89 opengl: { QtOpenGL_debug} 90 xml: { QtXml_debug} 91 svg: { QtSvg_debug} 92 sql: { QtSql_debug} 93 support: { Qt3Support_debug} 94 ] 95 96 64 97 exe_target: make m2/target_env 65 98 [ … … 94 127 95 128 if cfg/qt [ 96 include_from {$(QTDIR)/include} 129 either cfg/qt = 3 [ 130 include_from {$(QTDIR)/include} 131 ][ 132 include_from {$(QTDIR)/include} 133 include_from {$(QTDIR)/include/QtCore} 134 do bind cfg/qt in qt-includes 'gui 135 ] 97 136 if cfg/release [ 98 137 cxxflags {-DQT_NO_DEBUG} … … 110 149 do config 111 150 if cfg/qt [ 112 ;libs_from %"$(QTDIR)/lib" {qt-mt} 113 ; Linking statically requires more libs. 114 libs_from %"$(QTDIR)/lib" {qt} 115 libs_from %/usr/X/lib {SM Xext X11 ICE} 116 libs {dl} 151 either cfg/qt = 3 [ 152 ;libs_from %"$(QTDIR)/lib" {qt-mt} 153 154 ; Linking statically requires more libs. 155 libs_from %"$(QTDIR)/lib" {qt} 156 libs_from %/usr/X/lib {SM Xext X11 ICE} 157 libs {dl} 158 ][ 159 append qt4-libs: copy cfg/qt 'core 160 161 libs_from %"$(QTDIR)/lib" 162 rejoin bind qt4-libs either cfg/debug 163 [in qt-debug-libraries 'gui] 164 [in qt-libraries 'gui] 165 ] 117 166 ] 118 167 ] -
trunk/m2/m2_visualc.r
r12 r93 58 58 59 59 60 qt-includes: context [ 61 gui: does [ include_from {$(QTDIR)\include\QtGui} ] 62 network: does [ include_from {$(QTDIR)\include\QtNetwork} ] 63 opengl: does [ include_from {$(QTDIR)\include\QtOpenGL} ] 64 xml: does [ include_from {$(QTDIR)\include\QtXml} ] 65 svg: does [ include_from {$(QTDIR)\include\QtSvg} ] 66 sql: does [ include_from {$(QTDIR)\include\QtSql} ] 67 support: does [ include_from {$(QTDIR)\include\Qt3Support} 68 cxxflags {-DQT3_SUPPORT} ] 69 ] 70 71 qt-libraries: context [ 72 core: { QtCore4} 73 gui: { QtGui4} 74 network: { QtNetwork4} 75 opengl: { QtOpenGL4} 76 xml: { QtXml4} 77 svg: { QtSvg4} 78 sql: { QtSql4} 79 support: { Qt3Support4} 80 main: { qtmain} 81 ] 82 83 qt-debug-libraries: context [ 84 core: { QtCored4} 85 gui: { QtGuid4} 86 network: { QtNetworkd4} 87 opengl: { QtOpenGLd4} 88 xml: { QtXmld4} 89 xml: { QtXmld4} 90 svg: { QtSvgd4} 91 sql: { QtSqld4} 92 support: { Qt3Supportd4} 93 main: { qtmaind} 94 ] 95 96 60 97 exe_target: make m2/target_env 61 98 [ … … 68 105 69 106 cflags {/nologo} 70 ;cflags {/MD} ; Creates a multithreaded DLL using MSVCRT.lib71 107 cxxflags {-GX} 72 108 lflags {/nologo /incremental:no} … … 87 123 88 124 if cfg/debug [ 125 cflags {/MDd} 89 126 cflags {-Zi -DDEBUG} 90 127 lflags {/DEBUG} … … 92 129 93 130 if cfg/release [ 131 cflags {/MD} 94 132 cflags {-O1 -DNDEBUG} 95 133 ] … … 100 138 101 139 if cfg/qt [ 102 include_from {$(QTDIR)\include} 103 if cfg/qt >= 4 [ 140 either cfg/qt = 3 [ 141 include_from {$(QTDIR)\include} 142 ][ 143 include_from {$(QTDIR)\include} 104 144 include_from {$(QTDIR)\include\QtCore} 105 include_from {$(QTDIR)\include\QtGui} 106 ;include_from {$(QTDIR)\include\Qt3Support} 107 ;cxxflags {-DQT3_SUPPORT} 145 do bind cfg/qt in qt-includes 'gui 108 146 ] 109 147 if cfg/release [ … … 122 160 do config 123 161 if cfg/qt [ 124 either cfg/qt < 4[162 either cfg/qt = 3 [ 125 163 ;libs_from {$(QTDIR)\lib} {qt} 126 164 ;libs_from {$(QTDIR)\lib} {qt-mt331 qtmain} 127 165 libs_from {$(QTDIR)\lib} {qt-mt qtmain} 166 128 167 ; If Qt statically compiled must link with more libs. 129 168 libs {ole32 comdlg32 winspool advapi32 imm32 ws2_32 shell32} 130 169 ][ 131 either cfg/debug [ 132 libs_from %"$(QTDIR)\lib" {QtGuid4 QtCored4 qtmaind} 133 ][ 134 ;libs_from %"$(QTDIR)\lib" {QtGui4 Qt3Support QtCore4 qtmain} 135 libs_from %"$(QTDIR)\lib" {QtGui4 QtCore4 qtmain} 136 ] 137 libs {comdlg32 winspool advapi32 shell32 ole32} 170 append qt4-libs: copy cfg/qt [core main] 171 172 libs_from %"$(QTDIR)/lib" 173 rejoin bind qt4-libs either cfg/debug 174 [in qt-debug-libraries 'gui] 175 [in qt-libraries 'gui] 176 177 libs {comdlg32 winspool advapi32 shell32 ole32} 138 178 ] 139 179 ]
