-rw-r--r-- | qmake/generators/win32/borland_bmake.cpp | 246 | ||||
-rw-r--r-- | qmake/generators/win32/borland_bmake.h | 11 | ||||
-rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 1232 | ||||
-rw-r--r-- | qmake/generators/win32/mingw_make.h | 119 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_dsp.cpp | 244 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_dsp.h | 15 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 321 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_nmake.h | 17 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 341 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 43 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 712 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.h | 14 | ||||
-rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 161 | ||||
-rw-r--r-- | qmake/generators/win32/winmakefile.h | 12 |
14 files changed, 2330 insertions, 1158 deletions
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp index 26eea88..12607cf 100644 --- a/qmake/generators/win32/borland_bmake.cpp +++ b/qmake/generators/win32/borland_bmake.cpp | |||
@@ -1,509 +1,661 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of ________ class. | 4 | ** NmakeMakefileGenerator of BorlandMakefileGenerator class. |
5 | ** | 5 | ** |
6 | ** Created : 970521 | 6 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. | 8 | ** This file is part of qmake. |
9 | ** | ||
10 | ** This file is part of the network module of the Qt GUI Toolkit. | ||
11 | ** | 9 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 13 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 14 | ** This file may be distributed and/or modified under the terms of the |
17 | ** GNU General Public License version 2 as published by the Free Software | 15 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 17 | ** packaging of this file. |
20 | ** | 18 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
22 | ** file in accordance with the Qt Commercial License Agreement provided | 20 | ** file in accordance with the Qt Commercial License Agreement provided |
23 | ** with the Software. | 21 | ** with the Software. |
24 | ** | 22 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 25 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 30 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 32 | ** not clear to you. |
35 | ** | 33 | ** |
36 | **********************************************************************/ | 34 | **********************************************************************/ |
37 | 35 | ||
38 | #include "borland_bmake.h" | 36 | #include "borland_bmake.h" |
39 | #include "option.h" | 37 | #include "option.h" |
40 | #include <qdir.h> | 38 | #include <qdir.h> |
41 | #include <qregexp.h> | 39 | #include <qregexp.h> |
42 | #include <time.h> | 40 | #include <time.h> |
43 | #include <stdlib.h> | 41 | #include <stdlib.h> |
44 | 42 | ||
45 | 43 | ||
46 | BorlandMakefileGenerator::BorlandMakefileGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE) | 44 | BorlandMakefileGenerator::BorlandMakefileGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE) |
47 | { | 45 | { |
48 | 46 | ||
49 | } | 47 | } |
50 | 48 | ||
51 | bool | 49 | bool |
52 | BorlandMakefileGenerator::writeMakefile(QTextStream &t) | 50 | BorlandMakefileGenerator::writeMakefile(QTextStream &t) |
53 | { | 51 | { |
54 | writeHeader(t); | 52 | writeHeader(t); |
55 | if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { | 53 | if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { |
56 | t << "all clean:" << "\n\t" | 54 | t << "all clean:" << "\n\t" |
57 | << "@echo \"Some of the required modules (" | 55 | << "@echo \"Some of the required modules (" |
58 | << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t" | 56 | << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t" |
59 | << "@echo \"Skipped.\"" << endl << endl; | 57 | << "@echo \"Skipped.\"" << endl << endl; |
60 | return TRUE; | 58 | return TRUE; |
61 | } | 59 | } |
62 | 60 | ||
63 | if(project->first("TEMPLATE") == "app" || | 61 | if(project->first("TEMPLATE") == "app" || |
64 | project->first("TEMPLATE") == "lib") { | 62 | project->first("TEMPLATE") == "lib") { |
65 | writeBorlandParts(t); | 63 | writeBorlandParts(t); |
66 | return MakefileGenerator::writeMakefile(t); | 64 | return MakefileGenerator::writeMakefile(t); |
67 | } | 65 | } |
68 | else if(project->first("TEMPLATE") == "subdirs") { | 66 | else if(project->first("TEMPLATE") == "subdirs") { |
69 | writeSubDirs(t); | 67 | writeSubDirs(t); |
70 | return TRUE; | 68 | return TRUE; |
71 | } | 69 | } |
72 | return FALSE; | 70 | return FALSE; |
73 | } | 71 | } |
74 | 72 | ||
75 | void | 73 | void |
76 | BorlandMakefileGenerator::writeBorlandParts(QTextStream &t) | 74 | BorlandMakefileGenerator::writeBorlandParts(QTextStream &t) |
77 | { | 75 | { |
78 | t << "!if !$d(BCB)" << endl; | 76 | t << "!if !$d(BCB)" << endl; |
79 | t << "BCB = $(MAKEDIR)\\.." << endl; | 77 | t << "BCB = $(MAKEDIR)\\.." << endl; |
80 | t << "!endif" << endl << endl; | 78 | t << "!endif" << endl << endl; |
81 | t << "####### Compiler, tools and options" << endl << endl; | 79 | t << "####### Compiler, tools and options" << endl << endl; |
82 | t << "CC =" << var("QMAKE_CC") << endl; | 80 | t << "CC =" << var("QMAKE_CC") << endl; |
83 | t << "CXX =" << var("QMAKE_CXX") << endl; | 81 | t << "CXX =" << var("QMAKE_CXX") << endl; |
84 | t << "LEX = " << var("QMAKE_LEX") << endl; | 82 | t << "LEX = " << var("QMAKE_LEX") << endl; |
85 | t << "YACC = " << var("QMAKE_YACC") << endl; | 83 | t << "YACC = " << var("QMAKE_YACC") << endl; |
86 | t << "CFLAGS =" << var("QMAKE_CFLAGS") << " " | 84 | t << "CFLAGS =" << var("QMAKE_CFLAGS") << " " |
87 | << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " " | 85 | << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " " |
88 | << varGlue("DEFINES","-D"," -D","") << endl; | 86 | << varGlue("DEFINES","-D"," -D","") << endl; |
89 | t << "CXXFLAGS=" << var("QMAKE_CXXFLAGS") << " " | 87 | t << "CXXFLAGS=" << var("QMAKE_CXXFLAGS") << " " |
90 | << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " " | 88 | << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " " |
91 | << varGlue("DEFINES","-D"," -D","") << endl; | 89 | << varGlue("DEFINES","-D"," -D","") << endl; |
92 | t << "LEXFLAGS=" << var("QMAKE_LEXFLAGS") << endl; | 90 | t << "LEXFLAGS=" << var("QMAKE_LEXFLAGS") << endl; |
93 | t << "YACCFLAGS=" << var("QMAKE_YACCFLAGS") << endl; | 91 | t << "YACCFLAGS=" << var("QMAKE_YACCFLAGS") << endl; |
94 | 92 | ||
95 | t << "INCPATH ="; | 93 | t << "INCPATH ="; |
96 | QStringList &incs = project->variables()["INCLUDEPATH"]; | 94 | QStringList &incs = project->variables()["INCLUDEPATH"]; |
97 | for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { | 95 | for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { |
98 | QString inc = (*incit); | 96 | QString inc = (*incit); |
99 | inc.replace(QRegExp("\\\\*$"), ""); | 97 | inc.replace(QRegExp("\\\\*$"), ""); |
100 | inc.replace("\"", ""); | 98 | inc.replace("\"", ""); |
101 | t << " -I\"" << inc << "\""; | 99 | t << " -I\"" << inc << "\""; |
102 | } | 100 | } |
103 | t << " -I\"" << specdir() << "\"" | 101 | t << " -I\"" << specdir() << "\"" |
104 | << endl; | 102 | << endl; |
105 | 103 | ||
106 | if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) { | 104 | if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) { |
107 | t << "LINK =" << var("QMAKE_LINK") << endl; | 105 | t << "LINK =" << var("QMAKE_LINK") << endl; |
108 | t << "LFLAGS ="; | 106 | t << "LFLAGS ="; |
109 | if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() ) | 107 | if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() ) |
110 | t << varGlue("QMAKE_LIBDIR","-L",";","") << " "; | 108 | t << varGlue("QMAKE_LIBDIR","-L",";","") << " "; |
111 | t << var("QMAKE_LFLAGS") << endl; | 109 | t << var("QMAKE_LFLAGS") << endl; |
112 | t << "LIBS =" << var("QMAKE_LIBS") << endl; | 110 | t << "LIBS =" << var("QMAKE_LIBS") << endl; |
113 | } | 111 | } |
114 | else { | 112 | else { |
115 | t << "LIB =" << var("QMAKE_LIB") << endl; | 113 | t << "LIB =" << var("QMAKE_LIB") << endl; |
116 | } | 114 | } |
117 | t << "MOC =" << (project->isEmpty("QMAKE_MOC") ? QString("moc") : | 115 | t << "MOC =" << (project->isEmpty("QMAKE_MOC") ? QString("moc") : |
118 | Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl; | 116 | Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl; |
119 | t << "UIC =" << (project->isEmpty("QMAKE_UIC") ? QString("uic") : | 117 | t << "UIC =" << (project->isEmpty("QMAKE_UIC") ? QString("uic") : |
120 | Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl; | 118 | Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl; |
121 | t << "QMAKE = " << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : | 119 | t << "QMAKE = " << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : |
122 | Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl; | 120 | Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl; |
123 | t << "IDC =" << (project->isEmpty("QMAKE_IDC") ? QString("idc") : | 121 | t << "IDC =" << (project->isEmpty("QMAKE_IDC") ? QString("idc") : |
124 | Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl; | 122 | Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl; |
125 | t << "IDL =" << (project->isEmpty("QMAKE_IDL") ? QString("midl") : | 123 | t << "IDL =" << (project->isEmpty("QMAKE_IDL") ? QString("midl") : |
126 | Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl; | 124 | Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl; |
127 | t << "ZIP =" << var("QMAKE_ZIP") << endl; | 125 | t << "ZIP =" << var("QMAKE_ZIP") << endl; |
128 | t << "DEF_FILE =" << varList("DEF_FILE") << endl; | 126 | t << "DEF_FILE =" << varList("DEF_FILE") << endl; |
129 | t << "RES_FILE =" << varList("RES_FILE") << endl; | 127 | t << "RES_FILE =" << varList("RES_FILE") << endl; |
130 | t << "COPY_FILE = " << var("QMAKE_COPY") << endl; | 128 | t << "COPY_FILE = " << var("QMAKE_COPY") << endl; |
131 | t << "COPY_DIR = " << var("QMAKE_COPY") << endl; | 129 | t << "COPY_DIR = " << var("QMAKE_COPY") << endl; |
132 | t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl; | 130 | t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl; |
133 | t << "DEL_DIR = " << var("QMAKE_DEL_DIR") << endl; | 131 | t << "DEL_DIR = " << var("QMAKE_DEL_DIR") << endl; |
134 | t << "MOVE = " << var("QMAKE_MOVE") << endl; | 132 | t << "MOVE = " << var("QMAKE_MOVE") << endl; |
135 | t << "CHK_DIR_EXISTS =" << var("QMAKE_CHK_DIR_EXISTS") << endl; | 133 | t << "CHK_DIR_EXISTS =" << var("QMAKE_CHK_DIR_EXISTS") << endl; |
136 | t << "MKDIR =" << var("QMAKE_MKDIR") << endl; | 134 | t << "MKDIR =" << var("QMAKE_MKDIR") << endl; |
135 | t << "INSTALL_FILE= " << var("QMAKE_INSTALL_FILE") << endl; | ||
136 | t << "INSTALL_DIR = " << var("QMAKE_INSTALL_DIR") << endl; | ||
137 | t << endl; | 137 | t << endl; |
138 | 138 | ||
139 | t << "####### Files" << endl << endl; | 139 | t << "####### Files" << endl << endl; |
140 | t << "HEADERS =" << varList("HEADERS") << endl; | 140 | t << "HEADERS =" << varList("HEADERS") << endl; |
141 | t << "SOURCES =" << varList("SOURCES") << endl; | 141 | t << "SOURCES =" << varList("SOURCES") << endl; |
142 | t << "OBJECTS =" << varList("OBJECTS") << endl; | 142 | t << "OBJECTS =" << varList("OBJECTS") << endl; |
143 | t << "FORMS =" << varList("FORMS") << endl; | 143 | t << "FORMS =" << varList("FORMS") << endl; |
144 | t << "UICDECLS =" << varList("UICDECLS") << endl; | 144 | t << "UICDECLS =" << varList("UICDECLS") << endl; |
145 | t << "UICIMPLS =" << varList("UICIMPLS") << endl; | 145 | t << "UICIMPLS =" << varList("UICIMPLS") << endl; |
146 | t << "SRCMOC =" << varList("SRCMOC") << endl; | 146 | t << "SRCMOC =" << varList("SRCMOC") << endl; |
147 | t << "OBJMOC =" << varList("OBJMOC") << endl; | 147 | t << "OBJMOC =" << varList("OBJMOC") << endl; |
148 | |||
149 | QString extraCompilerDeps; | ||
150 | if(!project->isEmpty("QMAKE_EXTRA_WIN_COMPILERS")) { | ||
151 | t << "OBJCOMP = " << varList("OBJCOMP") << endl; | ||
152 | extraCompilerDeps += " $(OBJCOMP) "; | ||
153 | |||
154 | QStringList &comps = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"]; | ||
155 | for(QStringList::Iterator compit = comps.begin(); compit != comps.end(); ++compit) { | ||
156 | QStringList &vars = project->variables()[(*compit) + ".variables"]; | ||
157 | for(QStringList::Iterator varit = vars.begin(); varit != vars.end(); ++varit) { | ||
158 | QStringList vals = project->variables()[(*varit)]; | ||
159 | if(!vals.isEmpty()) | ||
160 | t << "QMAKE_COMP_" << (*varit) << " = " << valList(vals) << endl; | ||
161 | } | ||
162 | } | ||
163 | } | ||
164 | |||
148 | t << "DIST =" << varList("DISTFILES") << endl; | 165 | t << "DIST =" << varList("DISTFILES") << endl; |
149 | t << "TARGET =" | 166 | t << "TARGET =" |
150 | << varGlue("TARGET",project->first("DESTDIR"),"",project->first("TARGET_EXT")) | 167 | << varGlue("TARGET",project->first("DESTDIR"),"",project->first("TARGET_EXT")) |
151 | << endl; | 168 | << endl; |
152 | t << endl; | 169 | t << endl; |
153 | 170 | ||
154 | t << "####### Implicit rules" << endl << endl; | 171 | t << "####### Implicit rules" << endl << endl; |
155 | t << ".SUFFIXES: .c"; | 172 | t << ".SUFFIXES: .c"; |
156 | QStringList::Iterator cppit; | 173 | QStringList::Iterator cppit; |
157 | for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) | 174 | for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) |
158 | t << " " << (*cppit); | 175 | t << " " << (*cppit); |
159 | t << endl << endl; | 176 | t << endl << endl; |
160 | for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) | 177 | for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) |
161 | t << (*cppit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl; | 178 | t << (*cppit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl; |
162 | t << ".c" << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl; | 179 | t << ".c" << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl; |
163 | 180 | ||
164 | t << "####### Build rules" << endl << endl; | 181 | t << "####### Build rules" << endl << endl; |
165 | t << "all: " << varGlue("ALL_DEPS",""," "," ") << " $(TARGET)" << endl << endl; | 182 | t << "all: " << fileFixify(Option::output.name()) << " " << varGlue("ALL_DEPS"," "," "," ") << " $(TARGET)" << endl << endl; |
166 | t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " | 183 | t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " |
167 | << var("POST_TARGETDEPS"); | 184 | << extraCompilerDeps << var("POST_TARGETDEPS"); |
168 | if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) { | 185 | if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) { |
169 | t << "\n\t" << "$(LINK) @&&|" << "\n\t" | 186 | t << "\n\t" << "$(LINK) @&&|" << "\n\t" |
170 | << "$(LFLAGS) $(OBJECTS) $(OBJMOC),$(TARGET),,$(LIBS),$(DEF_FILE),$(RES_FILE)"; | 187 | << "$(LFLAGS) $(OBJECTS) $(OBJMOC),$(TARGET),,$(LIBS),$(DEF_FILE),$(RES_FILE)"; |
171 | } else { | 188 | } else { |
172 | t << "\n\t-del $(TARGET)" | 189 | t << "\n\t-$(DEL_FILE) $(TARGET)" |
173 | << "\n\t" << "$(LIB) $(TARGET) @&&|" << " \n+" | 190 | << "\n\t" << "$(LIB) $(TARGET) @&&|" << " \n+" |
174 | << project->variables()["OBJECTS"].join(" \\\n+") << " \\\n+" | 191 | << project->variables()["OBJECTS"].join(" \\\n+") << " \\\n+" |
175 | << project->variables()["OBJMOC"].join(" \\\n+"); | 192 | << project->variables()["OBJMOC"].join(" \\\n+"); |
176 | } | 193 | } |
194 | t << extraCompilerDeps; | ||
177 | t << endl << "|" << endl; | 195 | t << endl << "|" << endl; |
178 | 196 | ||
179 | if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() ) | 197 | if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() ) |
180 | t << "\t" <<var("QMAKE_POST_LINK") << endl; | 198 | t << "\t" <<var("QMAKE_POST_LINK") << endl; |
181 | 199 | ||
182 | if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) { | 200 | if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) { |
183 | QStringList dlldirs = project->variables()["DLLDESTDIR"]; | 201 | QStringList dlldirs = project->variables()["DLLDESTDIR"]; |
184 | for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) { | 202 | for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) { |
185 | t << "\n\t" << "-copy $(TARGET) " << *dlldir; | 203 | t << "\n\t" << "-$(COPY_FILE) \"$(TARGET)\" " << *dlldir; |
186 | } | 204 | } |
187 | } | 205 | } |
188 | QString targetfilename = project->variables()["TARGET"].first(); | 206 | QString targetfilename = project->variables()["TARGET"].first(); |
189 | if(project->isActiveConfig("activeqt")) { | 207 | if(project->isActiveConfig("activeqt")) { |
190 | QString version = project->variables()["VERSION"].first(); | 208 | QString version = project->variables()["VERSION"].first(); |
191 | if ( version.isEmpty() ) | 209 | if ( version.isEmpty() ) |
192 | version = "1.0"; | 210 | version = "1.0"; |
193 | 211 | ||
194 | if ( project->isActiveConfig("dll")) { | 212 | if ( project->isActiveConfig("dll")) { |
195 | t << "\n\t" << ("-$(IDC) $(TARGET) /idl tmp\\" + targetfilename + ".idl -version " + version); | 213 | t << "\n\t" << ("-$(IDC) $(TARGET) /idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); |
196 | t << "\n\t" << ("-$(IDL) tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl"); | 214 | t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
197 | t << "\n\t" << ("-$(IDC) $(TARGET) /tlb tmp\\" + targetfilename + ".tlb"); | 215 | t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
198 | t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" ); | 216 | t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" ); |
199 | } else { | 217 | } else { |
200 | t << "\n\t" << ("-$(TARGET) -dumpidl tmp\\" + targetfilename + ".idl -version " + version); | 218 | t << "\n\t" << ("-$(TARGET) -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); |
201 | t << "\n\t" << ("-$(IDL) tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl"); | 219 | t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
202 | t << "\n\t" << ("-$(IDC) $(TARGET) /tlb tmp\\" + targetfilename + ".tlb"); | 220 | t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
203 | t << "\n\t" << ("-$(TARGET) -regserver"); | 221 | t << "\n\t" << ("-$(TARGET) -regserver"); |
204 | } | 222 | } |
205 | } | 223 | } |
206 | t << endl << endl; | 224 | t << endl << endl; |
207 | 225 | ||
208 | if(!project->variables()["RC_FILE"].isEmpty()) { | 226 | if(!project->variables()["RC_FILE"].isEmpty()) { |
209 | t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t" | 227 | t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t" |
210 | << var("QMAKE_RC") << " " << var("RC_FILE") << endl << endl; | 228 | << var("QMAKE_RC") << " " << var("RC_FILE") << endl << endl; |
211 | } | 229 | } |
212 | t << "mocables: $(SRCMOC)" << endl << endl; | 230 | t << "mocables: $(SRCMOC)" << endl |
231 | << "uicables: $(UICIMPLS) $(UICDECLS)" << endl << endl; | ||
213 | 232 | ||
214 | writeMakeQmake(t); | 233 | writeMakeQmake(t); |
215 | 234 | ||
235 | QStringList dist_files = Option::mkfile::project_files; | ||
236 | if(!project->isEmpty("QMAKE_INTERNAL_INCLUDED_FILES")) | ||
237 | dist_files += project->variables()["QMAKE_INTERNAL_INCLUDED_FILES"]; | ||
238 | if(!project->isEmpty("TRANSLATIONS")) | ||
239 | dist_files << var("TRANSLATIONS"); | ||
240 | if(!project->isEmpty("FORMS")) { | ||
241 | QStringList &forms = project->variables()["FORMS"]; | ||
242 | for(QStringList::Iterator formit = forms.begin(); formit != forms.end(); ++formit) { | ||
243 | QString ui_h = fileFixify((*formit) + Option::h_ext.first()); | ||
244 | if(QFile::exists(ui_h) ) | ||
245 | dist_files << ui_h; | ||
246 | } | ||
247 | } | ||
216 | t << "dist:" << "\n\t" | 248 | t << "dist:" << "\n\t" |
217 | << "$(ZIP) " << var("PROJECT") << ".zip " << var("PROJECT") << ".pro $(SOURCES) $(HEADERS) $(DIST) $(FORMS)" | 249 | << "$(ZIP) " << var("QMAKE_ORIG_TARGET") << ".zip " << "$(SOURCES) $(HEADERS) $(DIST) $(FORMS) " |
218 | << endl << endl; | 250 | << dist_files.join(" ") << " " << var("TRANSLATIONS") << " " << var("IMAGES") << endl << endl; |
251 | |||
252 | t << "uiclean:"; | ||
253 | QString uiclean = varGlue("UICDECLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") + varGlue("UICIMPLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ",""); | ||
254 | if ( uiclean.isEmpty() ) { | ||
255 | // Borland make does not like an empty command section | ||
256 | uiclean = "\n\t@cd ."; | ||
257 | } | ||
258 | t << uiclean << endl; | ||
259 | |||
260 | t << "mocclean:"; | ||
261 | QString mocclean = varGlue("SRCMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") + varGlue("OBJMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ",""); | ||
262 | if ( mocclean.isEmpty() ) { | ||
263 | // Borland make does not like an empty command section | ||
264 | mocclean = "\n\t@cd ."; | ||
265 | } | ||
266 | t << mocclean << endl; | ||
219 | 267 | ||
220 | t << "clean:\n" | 268 | t << "clean: uiclean mocclean" |
221 | << varGlue("OBJECTS","\t-del ","\n\t-del ","") | 269 | << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") |
222 | << varGlue("SRCMOC" ,"\n\t-del ","\n\t-del ","") | 270 | << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") |
223 | << varGlue("OBJMOC" ,"\n\t-del ","\n\t-del ","") | 271 | << varGlue("CLEAN_FILES","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ",""); |
224 | << varGlue("UICDECLS" ,"\n\t-del ","\n\t-del ","") | ||
225 | << varGlue("UICIMPLS" ,"\n\t-del ","\n\t-del ","") | ||
226 | << varGlue("QMAKE_CLEAN","\n\t-del ","\n\t-del ","") | ||
227 | << varGlue("CLEAN_FILES","\n\t-del ","\n\t-del ",""); | ||
228 | if ( project->isActiveConfig("activeqt")) { | 272 | if ( project->isActiveConfig("activeqt")) { |
229 | t << ("\n\t-del tmp\\" + targetfilename + ".*"); | 273 | t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".idl"); |
230 | t << "\n\t-del tmp\\dump.*"; | 274 | t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
231 | } | 275 | } |
232 | if(!project->isEmpty("IMAGES")) | 276 | if(!project->isEmpty("IMAGES")) |
233 | t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-del ", "\n\t-del ", ""); | 277 | t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", ""); |
278 | t << endl; | ||
234 | 279 | ||
235 | // blasted user defined targets | 280 | // user defined targets |
281 | QStringList::Iterator it; | ||
236 | QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"]; | 282 | QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"]; |
237 | for(QStringList::Iterator it = qut.begin(); it != qut.end(); ++it) { | 283 | for(it = qut.begin(); it != qut.end(); ++it) { |
238 | QString targ = var((*it) + ".target"), | 284 | QString targ = var((*it) + ".target"), |
239 | cmd = var((*it) + ".commands"), deps; | 285 | cmd = var((*it) + ".commands"), deps; |
240 | if(targ.isEmpty()) | 286 | if(targ.isEmpty()) |
241 | targ = (*it); | 287 | targ = (*it); |
242 | QStringList &deplist = project->variables()[(*it) + ".depends"]; | 288 | QStringList &deplist = project->variables()[(*it) + ".depends"]; |
243 | for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) { | 289 | for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) { |
244 | QString dep = var((*dep_it) + ".target"); | 290 | QString dep = var((*dep_it) + ".target"); |
245 | if(dep.isEmpty()) | 291 | if(dep.isEmpty()) |
246 | dep = (*dep_it); | 292 | dep = (*dep_it); |
247 | deps += " " + dep; | 293 | deps += " " + dep; |
248 | } | 294 | } |
295 | if(!project->variables()["QMAKE_NOFORCE"].isEmpty() && | ||
296 | project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1) | ||
297 | deps += QString(" ") + "FORCE"; | ||
249 | t << "\n\n" << targ << ":" << deps << "\n\t" | 298 | t << "\n\n" << targ << ":" << deps << "\n\t" |
250 | << cmd; | 299 | << cmd; |
251 | } | 300 | } |
252 | 301 | ||
253 | t << endl << endl; | 302 | t << endl << endl; |
254 | 303 | ||
304 | QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"]; | ||
305 | for(it = quc.begin(); it != quc.end(); ++it) { | ||
306 | QString tmp_out = project->variables()[(*it) + ".output"].first(); | ||
307 | QString tmp_cmd = project->variables()[(*it) + ".commands"].join(" "); | ||
308 | QString tmp_dep = project->variables()[(*it) + ".depends"].join(" "); | ||
309 | QStringList &vars = project->variables()[(*it) + ".variables"]; | ||
310 | if(tmp_out.isEmpty() || tmp_cmd.isEmpty()) | ||
311 | continue; | ||
312 | QStringList &tmp = project->variables()[(*it) + ".input"]; | ||
313 | for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) { | ||
314 | QStringList &inputs = project->variables()[(*it2)]; | ||
315 | for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) { | ||
316 | QFileInfo fi(Option::fixPathToLocalOS((*input))); | ||
317 | QString in = Option::fixPathToTargetOS((*input), FALSE), | ||
318 | out = tmp_out, cmd = tmp_cmd, deps; | ||
319 | out.replace("${QMAKE_FILE_BASE}", fi.baseName()); | ||
320 | out.replace("${QMAKE_FILE_NAME}", fi.fileName()); | ||
321 | cmd.replace("${QMAKE_FILE_BASE}", fi.baseName()); | ||
322 | cmd.replace("${QMAKE_FILE_OUT}", out); | ||
323 | cmd.replace("${QMAKE_FILE_NAME}", fi.fileName()); | ||
324 | for(QStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3) | ||
325 | cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")"); | ||
326 | if(!tmp_dep.isEmpty()) { | ||
327 | char buff[256]; | ||
328 | QString dep_cmd = tmp_dep; | ||
329 | dep_cmd.replace("${QMAKE_FILE_NAME}", fi.fileName()); | ||
330 | if(FILE *proc = QT_POPEN(dep_cmd.latin1(), "r")) { | ||
331 | while(!feof(proc)) { | ||
332 | int read_in = int(fread(buff, 1, 255, proc)); | ||
333 | if(!read_in) | ||
334 | break; | ||
335 | int l = 0; | ||
336 | for(int i = 0; i < read_in; i++) { | ||
337 | if(buff[i] == '\n' || buff[i] == ' ') { | ||
338 | deps += " " + QCString(buff+l, (i - l) + 1); | ||
339 | l = i; | ||
340 | } | ||
341 | } | ||
342 | } | ||
343 | fclose(proc); | ||
344 | } | ||
345 | } | ||
346 | t << out << ": " << in << deps << "\n\t" | ||
347 | << cmd << endl << endl; | ||
348 | } | ||
349 | } | ||
350 | } | ||
351 | t << endl; | ||
352 | |||
255 | t << "distclean: clean" | 353 | t << "distclean: clean" |
256 | << "\n\t-del $(TARGET)" | 354 | << "\n\t-$(DEL_FILE) $(TARGET)" |
257 | << endl << endl; | 355 | << endl << endl; |
258 | } | 356 | } |
259 | 357 | ||
260 | void | 358 | void |
261 | BorlandMakefileGenerator::init() | 359 | BorlandMakefileGenerator::init() |
262 | { | 360 | { |
263 | if(init_flag) | 361 | if(init_flag) |
264 | return; | 362 | return; |
265 | init_flag = TRUE; | 363 | init_flag = TRUE; |
266 | 364 | ||
267 | project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; | 365 | project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; |
268 | 366 | ||
269 | /* this should probably not be here, but I'm using it to wrap the .t files */ | 367 | /* this should probably not be here, but I'm using it to wrap the .t files */ |
270 | if(project->first("TEMPLATE") == "app") | 368 | if(project->first("TEMPLATE") == "app") |
271 | project->variables()["QMAKE_APP_FLAG"].append("1"); | 369 | project->variables()["QMAKE_APP_FLAG"].append("1"); |
272 | else if(project->first("TEMPLATE") == "lib") | 370 | else if(project->first("TEMPLATE") == "lib") |
273 | project->variables()["QMAKE_LIB_FLAG"].append("1"); | 371 | project->variables()["QMAKE_LIB_FLAG"].append("1"); |
274 | else if(project->first("TEMPLATE") == "subdirs") { | 372 | else if(project->first("TEMPLATE") == "subdirs") { |
275 | MakefileGenerator::init(); | 373 | MakefileGenerator::init(); |
276 | if(project->variables()["MAKEFILE"].isEmpty()) | 374 | if(project->variables()["MAKEFILE"].isEmpty()) |
277 | project->variables()["MAKEFILE"].append("Makefile"); | 375 | project->variables()["MAKEFILE"].append("Makefile"); |
278 | if(project->variables()["QMAKE"].isEmpty()) | 376 | if(project->variables()["QMAKE"].isEmpty()) |
279 | project->variables()["QMAKE"].append("qmake"); | 377 | project->variables()["QMAKE"].append("qmake"); |
280 | return; | 378 | return; |
281 | } | 379 | } |
282 | 380 | ||
381 | if(project->isEmpty("QMAKE_INSTALL_FILE")) | ||
382 | project->variables()["QMAKE_INSTALL_FILE"].append("$(COPY_FILE)"); | ||
383 | if(project->isEmpty("QMAKE_INSTALL_DIR")) | ||
384 | project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); | ||
385 | |||
283 | bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qtmt"QTDLL_POSTFIX); | 386 | bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qtmt"QTDLL_POSTFIX); |
284 | QStringList &configs = project->variables()["CONFIG"]; | 387 | QStringList &configs = project->variables()["CONFIG"]; |
285 | if (project->isActiveConfig("shared")) | 388 | if (project->isActiveConfig("shared")) |
286 | project->variables()["DEFINES"].append("QT_DLL"); | 389 | project->variables()["DEFINES"].append("QT_DLL"); |
287 | if (project->isActiveConfig("qt_dll")) | 390 | if (project->isActiveConfig("qt_dll")) |
288 | if(configs.findIndex("qt") == -1) configs.append("qt"); | 391 | if(configs.findIndex("qt") == -1) configs.append("qt"); |
392 | if ( project->isActiveConfig("qtopia") ) { | ||
393 | if(configs.findIndex("qtopialib") == -1) | ||
394 | configs.append("qtopialib"); | ||
395 | if(configs.findIndex("qtopiainc") == -1) | ||
396 | configs.append("qtopiainc"); | ||
397 | } | ||
289 | if ( project->isActiveConfig("qt") ) { | 398 | if ( project->isActiveConfig("qt") ) { |
290 | if ( project->isActiveConfig("plugin") ) { | 399 | if ( project->isActiveConfig("plugin") ) { |
291 | project->variables()["CONFIG"].append("dll"); | 400 | project->variables()["CONFIG"].append("dll"); |
292 | project->variables()["DEFINES"].append("QT_PLUGIN"); | 401 | project->variables()["DEFINES"].append("QT_PLUGIN"); |
293 | } | 402 | } |
294 | if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) && | 403 | if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) && |
295 | ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 || | 404 | ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 || |
296 | project->variables()["DEFINES"].findIndex("QT_DLL") != -1) || | 405 | project->variables()["DEFINES"].findIndex("QT_DLL") != -1) || |
297 | (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) { | 406 | (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) { |
298 | project->variables()["QMAKE_QT_DLL"].append("1"); | 407 | project->variables()["QMAKE_QT_DLL"].append("1"); |
299 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) | 408 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) |
300 | project->variables()["CONFIG"].append("dll"); | 409 | project->variables()["CONFIG"].append("dll"); |
301 | } | 410 | } |
302 | } | 411 | } |
303 | if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { | 412 | if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { |
304 | project->variables()["CONFIG"].remove("staticlib"); | 413 | project->variables()["CONFIG"].remove("staticlib"); |
305 | project->variables()["QMAKE_APP_OR_DLL"].append("1"); | 414 | project->variables()["QMAKE_APP_OR_DLL"].append("1"); |
306 | } else { | 415 | } else { |
307 | project->variables()["CONFIG"].append("staticlib"); | 416 | project->variables()["CONFIG"].append("staticlib"); |
308 | } | 417 | } |
309 | if ( project->isActiveConfig("warn_off") ) { | 418 | if ( project->isActiveConfig("warn_off") ) { |
310 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_OFF"]; | 419 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_OFF"]; |
311 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_OFF"]; | 420 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_OFF"]; |
312 | } else if ( project->isActiveConfig("warn_on") ) { | 421 | } else if ( project->isActiveConfig("warn_on") ) { |
313 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_ON"]; | 422 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_ON"]; |
314 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"]; | 423 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"]; |
315 | } | 424 | } |
316 | if(project->isActiveConfig("qt")) { | 425 | if(project->isActiveConfig("qt")) { |
317 | if ( project->isActiveConfig("thread") ) | 426 | if ( project->isActiveConfig("thread") ) |
318 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); | 427 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); |
319 | if ( project->isActiveConfig("accessibility" ) ) | 428 | if ( project->isActiveConfig("accessibility" ) ) |
320 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); | 429 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); |
321 | if ( project->isActiveConfig("tablet") ) | 430 | if ( project->isActiveConfig("tablet") ) |
322 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT"); | 431 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT"); |
323 | } | 432 | } |
324 | 433 | ||
325 | if ( project->isActiveConfig("debug") ) { | 434 | if ( project->isActiveConfig("debug") ) { |
326 | if ( project->isActiveConfig("thread") ) { | 435 | if ( project->isActiveConfig("thread") ) { |
327 | if ( project->isActiveConfig("dll") ) { | 436 | if ( project->isActiveConfig("dll") ) { |
328 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLLDBG"]; | 437 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLLDBG"]; |
329 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"]; | 438 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"]; |
330 | } else { | 439 | } else { |
331 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DBG"]; | 440 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DBG"]; |
332 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"]; | 441 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"]; |
333 | } | 442 | } |
334 | } | 443 | } |
335 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_DEBUG"]; | 444 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_DEBUG"]; |
336 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_DEBUG"]; | 445 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_DEBUG"]; |
337 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_DEBUG"]; | 446 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_DEBUG"]; |
338 | } else { | 447 | } else { |
339 | if ( project->isActiveConfig("thread") ) { | 448 | if ( project->isActiveConfig("thread") ) { |
340 | if ( project->isActiveConfig("dll") ) { | 449 | if ( project->isActiveConfig("dll") ) { |
341 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLL"]; | 450 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLL"]; |
342 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"]; | 451 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"]; |
343 | } else { | 452 | } else { |
344 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT"]; | 453 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT"]; |
345 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT"]; | 454 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT"]; |
346 | } | 455 | } |
347 | } | 456 | } |
348 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RELEASE"]; | 457 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RELEASE"]; |
349 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RELEASE"]; | 458 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RELEASE"]; |
350 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_RELEASE"]; | 459 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_RELEASE"]; |
351 | } | 460 | } |
352 | 461 | ||
353 | if ( !project->variables()["QMAKE_INCDIR"].isEmpty()) { | 462 | if ( !project->variables()["QMAKE_INCDIR"].isEmpty()) { |
354 | project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"]; | 463 | project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"]; |
355 | } | 464 | } |
356 | if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") ) { | 465 | if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") ) { |
357 | project->variables()["CONFIG"].append("windows"); | 466 | project->variables()["CONFIG"].append("windows"); |
358 | } | 467 | } |
468 | if ( project->isActiveConfig("qtopiainc") ) | ||
469 | project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"]; | ||
470 | if ( project->isActiveConfig("qtopialib") ) { | ||
471 | if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA")) | ||
472 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QTOPIA"]; | ||
473 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"]; | ||
474 | } | ||
359 | if ( project->isActiveConfig("qt") ) { | 475 | if ( project->isActiveConfig("qt") ) { |
360 | project->variables()["CONFIG"].append("moc"); | 476 | project->variables()["CONFIG"].append("moc"); |
361 | project->variables()["INCLUDEPATH"] +=project->variables()["QMAKE_INCDIR_QT"]; | 477 | project->variables()["INCLUDEPATH"] +=project->variables()["QMAKE_INCDIR_QT"]; |
362 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"]; | 478 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"]; |
363 | if ( !project->isActiveConfig("debug") ) | 479 | if ( !project->isActiveConfig("debug") ) |
364 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG"); | 480 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG"); |
365 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { | 481 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { |
366 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) { | 482 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) { |
367 | project->variables()["DEFINES"].append("QT_MAKEDLL"); | 483 | project->variables()["DEFINES"].append("QT_MAKEDLL"); |
368 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_QT_DLL"]; | 484 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_QT_DLL"]; |
369 | } | 485 | } |
370 | } else { | 486 | } else { |
371 | if(project->isActiveConfig("thread")) | 487 | if(project->isActiveConfig("thread")) |
372 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; | 488 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; |
373 | else | 489 | else |
374 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; | 490 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; |
375 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { | 491 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { |
376 | int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt"); | 492 | int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt"); |
377 | if ( hver == -1 ) | 493 | if ( hver == -1 ) |
378 | hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qtmt"); | 494 | hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qtmt"); |
379 | if(hver != -1) { | 495 | if(hver != -1) { |
380 | QString ver; | 496 | QString ver; |
381 | ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "mt" : ""), hver); | 497 | ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "mt" : ""), hver); |
382 | QStringList &libs = project->variables()["QMAKE_LIBS"]; | 498 | QStringList &libs = project->variables()["QMAKE_LIBS"]; |
383 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) | 499 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) |
384 | (*libit).replace(QRegExp("qt(mt)?\\.lib"), ver); | 500 | (*libit).replace(QRegExp("qt(mt)?\\.lib"), ver); |
385 | } | 501 | } |
386 | } | 502 | } |
387 | if ( project->isActiveConfig( "activeqt" ) ) { | 503 | if ( project->isActiveConfig( "activeqt" ) ) { |
388 | project->variables().remove("QMAKE_LIBS_QT_ENTRY"); | 504 | project->variables().remove("QMAKE_LIBS_QT_ENTRY"); |
389 | project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib"; | 505 | project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib"; |
390 | if ( project->isActiveConfig( "dll" ) ) | 506 | if ( project->isActiveConfig( "dll" ) ) |
391 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; | 507 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; |
392 | } | 508 | } |
393 | if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { | 509 | if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { |
394 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; | 510 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; |
395 | } | 511 | } |
396 | } | 512 | } |
397 | } | 513 | } |
398 | if ( project->isActiveConfig("opengl") ) { | 514 | if ( project->isActiveConfig("opengl") ) { |
399 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"]; | 515 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"]; |
400 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"]; | 516 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"]; |
401 | } | 517 | } |
402 | if ( project->isActiveConfig("dll") ) { | 518 | if ( project->isActiveConfig("dll") ) { |
403 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE_DLL"]; | 519 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE_DLL"]; |
404 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE_DLL"]; | 520 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE_DLL"]; |
405 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"]; | 521 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"]; |
406 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"]; | 522 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"]; |
407 | if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty()) { | 523 | if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty()) { |
408 | project->variables()["TARGET_EXT"].append( | 524 | project->variables()["TARGET_EXT"].append( |
409 | QStringList::split('.',project->first("VERSION")).join("") + ".dll"); | 525 | QStringList::split('.',project->first("VERSION")).join("") + ".dll"); |
410 | } else { | 526 | } else { |
411 | project->variables()["TARGET_EXT"].append(".dll"); | 527 | project->variables()["TARGET_EXT"].append(".dll"); |
412 | } | 528 | } |
413 | } else { | 529 | } else { |
414 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"]; | 530 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"]; |
415 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE"]; | 531 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE"]; |
416 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE"]; | 532 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE"]; |
417 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS"]; | 533 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS"]; |
418 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty()) { | 534 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty()) { |
419 | project->variables()["TARGET_EXT"].append(".exe"); | 535 | project->variables()["TARGET_EXT"].append(".exe"); |
420 | } else { | 536 | } else { |
421 | project->variables()["TARGET_EXT"].append(".lib"); | 537 | project->variables()["TARGET_EXT"].append(".lib"); |
422 | } | 538 | } |
423 | } | 539 | } |
424 | if ( project->isActiveConfig("windows") ) { | 540 | if ( project->isActiveConfig("windows") ) { |
425 | if ( project->isActiveConfig("console") ) { | 541 | if ( project->isActiveConfig("console") ) { |
426 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; | 542 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; |
427 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; | 543 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; |
428 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; | 544 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; |
429 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; | 545 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; |
430 | } else { | 546 | } else { |
431 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"]; | 547 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"]; |
432 | } | 548 | } |
433 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"]; | 549 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"]; |
434 | } else { | 550 | } else { |
435 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; | 551 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; |
436 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; | 552 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; |
437 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; | 553 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; |
438 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; | 554 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; |
439 | } | 555 | } |
440 | if ( project->isActiveConfig("stl") ) { | 556 | if ( project->isActiveConfig("stl") ) { |
441 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"]; | 557 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"]; |
442 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"]; | 558 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"]; |
443 | } else { | 559 | } else { |
444 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"]; | 560 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"]; |
445 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"]; | 561 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"]; |
446 | } | 562 | } |
447 | if ( project->isActiveConfig("exceptions") ) { | 563 | if ( project->isActiveConfig("exceptions") ) { |
448 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"]; | 564 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"]; |
449 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"]; | 565 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"]; |
450 | } else { | 566 | } else { |
451 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"]; | 567 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"]; |
452 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"]; | 568 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"]; |
453 | } | 569 | } |
454 | if ( project->isActiveConfig("rtti") ) { | 570 | if ( project->isActiveConfig("rtti") ) { |
455 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"]; | 571 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"]; |
456 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"]; | 572 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"]; |
457 | } else { | 573 | } else { |
458 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"]; | 574 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"]; |
459 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"]; | 575 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"]; |
460 | } | 576 | } |
461 | 577 | ||
462 | if ( project->isActiveConfig("thread") ) { | 578 | if ( project->isActiveConfig("thread") ) { |
463 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_RTMT"]; | 579 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_RTMT"]; |
464 | } else { | 580 | } else { |
465 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_RT"]; | 581 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_RT"]; |
466 | } | 582 | } |
467 | if ( project->isActiveConfig("moc") ) { | 583 | if ( project->isActiveConfig("moc") ) { |
468 | setMocAware(TRUE); | 584 | setMocAware(TRUE); |
469 | } | 585 | } |
470 | project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"]; | 586 | project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"]; |
587 | // Update -lname to name.lib, and -Ldir to | ||
588 | QStringList &libList = project->variables()["QMAKE_LIBS"]; | ||
589 | for( QStringList::Iterator stIt = libList.begin(); stIt != libList.end(); ) { | ||
590 | QString s = *stIt; | ||
591 | if( s.startsWith( "-l" ) ) { | ||
592 | stIt = libList.remove( stIt ); | ||
593 | stIt = libList.insert( stIt, s.mid( 2 ) + ".lib" ); | ||
594 | } else if( s.startsWith( "-L" ) ) { | ||
595 | stIt = libList.remove( stIt ); | ||
596 | project->variables()["QMAKE_LIBDIR"].append(QDir::convertSeparators(s.mid( 2 ))); | ||
597 | } else { | ||
598 | stIt++; | ||
599 | } | ||
600 | } | ||
471 | project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ', | 601 | project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ', |
472 | "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH"); | 602 | "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH"); |
473 | QStringList &l = project->variables()["QMAKE_FILETAGS"]; | 603 | QStringList &l = project->variables()["QMAKE_FILETAGS"]; |
474 | for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) { | 604 | QStringList::Iterator it; |
605 | for(it = l.begin(); it != l.end(); ++it) { | ||
475 | QStringList &gdmf = project->variables()[(*it)]; | 606 | QStringList &gdmf = project->variables()[(*it)]; |
476 | for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner) | 607 | for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner) |
477 | (*inner) = Option::fixPathToTargetOS((*inner), FALSE); | 608 | (*inner) = Option::fixPathToTargetOS((*inner), FALSE); |
478 | } | 609 | } |
479 | 610 | ||
480 | if ( !project->variables()["RC_FILE"].isEmpty()) { | 611 | if ( !project->variables()["RC_FILE"].isEmpty()) { |
481 | if ( !project->variables()["RES_FILE"].isEmpty()) { | 612 | if ( !project->variables()["RES_FILE"].isEmpty()) { |
482 | fprintf(stderr, "Both .rc and .res file specified.\n"); | 613 | fprintf(stderr, "Both .rc and .res file specified.\n"); |
483 | fprintf(stderr, "Please specify one of them, not both."); | 614 | fprintf(stderr, "Please specify one of them, not both."); |
484 | exit(666); | 615 | exit(666); |
485 | } | 616 | } |
486 | project->variables()["RES_FILE"] = project->variables()["RC_FILE"]; | 617 | project->variables()["RES_FILE"] = project->variables()["RC_FILE"]; |
487 | project->variables()["RES_FILE"].first().replace(".rc",".res"); | 618 | project->variables()["RES_FILE"].first().replace(".rc",".res"); |
488 | project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"]; | 619 | project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"]; |
620 | project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"]; | ||
489 | } | 621 | } |
490 | MakefileGenerator::init(); | 622 | MakefileGenerator::init(); |
491 | if ( !project->variables()["VERSION"].isEmpty()) { | 623 | if ( !project->variables()["VERSION"].isEmpty()) { |
492 | QStringList l = QStringList::split('.', project->first("VERSION")); | 624 | QStringList l = QStringList::split('.', project->first("VERSION")); |
493 | project->variables()["VER_MAJ"].append(l[0]); | 625 | project->variables()["VER_MAJ"].append(l[0]); |
494 | project->variables()["VER_MIN"].append(l[1]); | 626 | project->variables()["VER_MIN"].append(l[1]); |
495 | } | 627 | } |
496 | 628 | ||
497 | if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { | 629 | if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { |
498 | // bcc does not generate a .tds file for static libs | 630 | // bcc does not generate a .tds file for static libs |
499 | QString tdsPostfix; | 631 | QString tdsPostfix; |
500 | if ( !project->variables()["VERSION"].isEmpty() ) { | 632 | if ( !project->variables()["VERSION"].isEmpty() ) { |
501 | tdsPostfix = QStringList::split( '.', project->first("VERSION") ).join("") | 633 | tdsPostfix = QStringList::split( '.', project->first("VERSION") ).join("") |
502 | + ".tds"; | 634 | + ".tds"; |
503 | } else { | 635 | } else { |
504 | tdsPostfix = ".tds"; | 636 | tdsPostfix = ".tds"; |
505 | } | 637 | } |
506 | project->variables()["QMAKE_CLEAN"].append( | 638 | project->variables()["QMAKE_CLEAN"].append( |
507 | project->first("DESTDIR") + project->first("TARGET") + tdsPostfix ); | 639 | project->first("DESTDIR") + project->first("TARGET") + tdsPostfix ); |
508 | } | 640 | } |
641 | |||
642 | QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"]; | ||
643 | for(it = quc.begin(); it != quc.end(); ++it) { | ||
644 | QString tmp_out = project->variables()[(*it) + ".output"].first(); | ||
645 | if(tmp_out.isEmpty()) | ||
646 | continue; | ||
647 | QStringList &tmp = project->variables()[(*it) + ".input"]; | ||
648 | for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) { | ||
649 | QStringList &inputs = project->variables()[(*it2)]; | ||
650 | for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) { | ||
651 | QFileInfo fi(Option::fixPathToLocalOS((*input))); | ||
652 | QString in = Option::fixPathToTargetOS((*input), FALSE), | ||
653 | out = tmp_out; | ||
654 | out.replace("${QMAKE_FILE_BASE}", fi.baseName()); | ||
655 | out.replace("${QMAKE_FILE_NAME}", fi.fileName()); | ||
656 | if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1) | ||
657 | project->variables()["OBJCOMP"] += out; | ||
658 | } | ||
659 | } | ||
660 | } | ||
509 | } | 661 | } |
diff --git a/qmake/generators/win32/borland_bmake.h b/qmake/generators/win32/borland_bmake.h index 5ffed58..700e7f7 100644 --- a/qmake/generators/win32/borland_bmake.h +++ b/qmake/generators/win32/borland_bmake.h | |||
@@ -1,58 +1,57 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of ________ class. | 4 | ** Definition of BorlandMakefileGenerator class. |
5 | ** | 5 | ** |
6 | ** Created : 970521 | 6 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. | 8 | ** This file is part of qmake. |
9 | ** | ||
10 | ** This file is part of the network module of the Qt GUI Toolkit. | ||
11 | ** | 9 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 13 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 14 | ** This file may be distributed and/or modified under the terms of the |
17 | ** GNU General Public License version 2 as published by the Free Software | 15 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 17 | ** packaging of this file. |
20 | ** | 18 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
22 | ** file in accordance with the Qt Commercial License Agreement provided | 20 | ** file in accordance with the Qt Commercial License Agreement provided |
23 | ** with the Software. | 21 | ** with the Software. |
24 | ** | 22 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 25 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 30 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 32 | ** not clear to you. |
35 | ** | 33 | ** |
36 | **********************************************************************/ | 34 | **********************************************************************/ |
35 | |||
37 | #ifndef __BORLAND_BMAKE_H__ | 36 | #ifndef __BORLAND_BMAKE_H__ |
38 | #define __BORLAND_BMAKE_H__ | 37 | #define __BORLAND_BMAKE_H__ |
39 | 38 | ||
40 | #include "winmakefile.h" | 39 | #include "winmakefile.h" |
41 | 40 | ||
42 | class BorlandMakefileGenerator : public Win32MakefileGenerator | 41 | class BorlandMakefileGenerator : public Win32MakefileGenerator |
43 | { | 42 | { |
44 | bool init_flag; | 43 | bool init_flag; |
45 | void writeBorlandParts(QTextStream &); | 44 | void writeBorlandParts(QTextStream &); |
46 | 45 | ||
47 | bool writeMakefile(QTextStream &); | 46 | bool writeMakefile(QTextStream &); |
48 | void init(); | 47 | void init(); |
49 | 48 | ||
50 | public: | 49 | public: |
51 | BorlandMakefileGenerator(QMakeProject *p); | 50 | BorlandMakefileGenerator(QMakeProject *p); |
52 | ~BorlandMakefileGenerator(); | 51 | ~BorlandMakefileGenerator(); |
53 | }; | 52 | }; |
54 | 53 | ||
55 | inline BorlandMakefileGenerator::~BorlandMakefileGenerator() | 54 | inline BorlandMakefileGenerator::~BorlandMakefileGenerator() |
56 | { } | 55 | { } |
57 | 56 | ||
58 | #endif /* __BORLAND_BMAKE_H__ */ | 57 | #endif /* __BORLAND_BMAKE_H__ */ |
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 7f58a55..c693d6a 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp | |||
@@ -1,524 +1,708 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of ________ class. | 4 | ** Implementation of MingwMakefileGenerator class. |
5 | ** | 5 | ** |
6 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. | 6 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** This file is part of the network module of the Qt GUI Toolkit. | 8 | ** This file is part of qmake. |
9 | ** | 9 | ** |
10 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
11 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
12 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
13 | ** | 13 | ** |
14 | ** This file may be distributed and/or modified under the terms of the | 14 | ** This file may be distributed and/or modified under the terms of the |
15 | ** GNU General Public License version 2 as published by the Free Software | 15 | ** GNU General Public License version 2 as published by the Free Software |
16 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
17 | ** packaging of this file. | 17 | ** packaging of this file. |
18 | ** | 18 | ** |
19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
20 | ** file in accordance with the Qt Commercial License Agreement provided | 20 | ** file in accordance with the Qt Commercial License Agreement provided |
21 | ** with the Software. | 21 | ** with the Software. |
22 | ** | 22 | ** |
23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
25 | ** | 25 | ** |
26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
27 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
30 | ** | 30 | ** |
31 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
32 | ** not clear to you. | 32 | ** not clear to you. |
33 | ** | 33 | ** |
34 | **********************************************************************/ | 34 | **********************************************************************/ |
35 | 35 | ||
36 | #include "mingw_make.h" | 36 | #include "mingw_make.h" |
37 | #include "option.h" | 37 | #include "option.h" |
38 | #include <qregexp.h> | 38 | #include <qregexp.h> |
39 | #include <qdir.h> | 39 | #include <qdir.h> |
40 | #include <stdlib.h> | 40 | #include <stdlib.h> |
41 | #include <time.h> | 41 | #include <time.h> |
42 | 42 | ||
43 | 43 | ||
44 | MingwMakefileGenerator::MingwMakefileGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE) | 44 | MingwMakefileGenerator::MingwMakefileGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE) |
45 | { | 45 | { |
46 | Option::obj_ext = ".o"; | 46 | Option::obj_ext = ".o"; |
47 | } | 47 | } |
48 | 48 | ||
49 | bool | 49 | bool |
50 | MingwMakefileGenerator::writeMakefile(QTextStream &t) | 50 | MingwMakefileGenerator::findLibraries() // todo - pascal |
51 | { | 51 | { |
52 | writeHeader(t); | 52 | return TRUE; |
53 | if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { | 53 | } |
54 | t << "all clean:" << "\n\t" | 54 | |
55 | << "@echo \"Some of the required modules (" | 55 | bool |
56 | << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t" | 56 | MingwMakefileGenerator::writeMakefile(QTextStream &t) |
57 | << "@echo \"Skipped.\"" << endl << endl; | 57 | { |
58 | writeMakeQmake(t); | 58 | writeHeader(t); |
59 | return TRUE; | 59 | if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { |
60 | } | 60 | t << "all clean:" << "\n\t" |
61 | 61 | << "@echo \"Some of the required modules (" | |
62 | if(project->first("TEMPLATE") == "app" || | 62 | << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t" |
63 | project->first("TEMPLATE") == "lib") { | 63 | << "@echo \"Skipped.\"" << endl << endl; |
64 | writeMingwParts(t); | 64 | writeMakeQmake(t); |
65 | return MakefileGenerator::writeMakefile(t); | 65 | return TRUE; |
66 | } | 66 | } |
67 | else if(project->first("TEMPLATE") == "subdirs") { | 67 | |
68 | writeSubDirs(t); | 68 | if(project->first("TEMPLATE") == "app" || |
69 | return TRUE; | 69 | project->first("TEMPLATE") == "lib") { |
70 | } | 70 | writeMingwParts(t); |
71 | return FALSE; | 71 | return MakefileGenerator::writeMakefile(t); |
72 | } | 72 | } |
73 | 73 | else if(project->first("TEMPLATE") == "subdirs") { | |
74 | void | 74 | writeSubDirs(t); |
75 | MingwMakefileGenerator::writeMingwParts(QTextStream &t) | 75 | return TRUE; |
76 | { | 76 | } |
77 | t << "####### Compiler, tools and options" << endl << endl; | 77 | return FALSE; |
78 | t << "CC =" << var("QMAKE_CC") << endl; | 78 | } |
79 | t << "CXX =" << var("QMAKE_CXX") << endl; | 79 | |
80 | t << "LEX = " << var("QMAKE_LEX") << endl; | 80 | void createLdObjectScriptFile(const QString & fileName, QStringList & objList) |
81 | t << "YACC = " << var("QMAKE_YACC") << endl; | 81 | { |
82 | t << "CFLAGS =" << var("QMAKE_CFLAGS") << " " | 82 | QString filePath = Option::output_dir + QDir::separator() + fileName; |
83 | << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " " | 83 | QFile file(filePath); |
84 | << varGlue("DEFINES","-D"," -D","") << endl; | 84 | if (file.open(IO_WriteOnly | IO_Translate )) { |
85 | t << "CXXFLAGS =" << var("QMAKE_CXXFLAGS") << " " | 85 | QTextStream t(&file); |
86 | << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " " | 86 | t << "INPUT(" << endl; |
87 | << varGlue("DEFINES","-D"," -D","") << endl; | 87 | for (QStringList::Iterator it = objList.begin(); it != objList.end(); ++it ) { |
88 | t << "LEXFLAGS=" << var("QMAKE_LEXFLAGS") << endl; | 88 | t << *it << endl; |
89 | t << "YACCFLAGS=" << var("QMAKE_YACCFLAGS") << endl; | 89 | } |
90 | 90 | t << ");" << endl; | |
91 | t << "INCPATH ="; | 91 | file.close(); |
92 | QStringList &incs = project->variables()["INCLUDEPATH"]; | 92 | } |
93 | for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { | 93 | } |
94 | QString inc = (*incit); | 94 | |
95 | inc.replace(QRegExp("\\\\$"), "\\\\"); | 95 | void |
96 | inc.replace(QRegExp("\""), ""); | 96 | MingwMakefileGenerator::writeMingwParts(QTextStream &t) |
97 | t << " -I" << inc ; | 97 | { |
98 | } | 98 | t << "####### Compiler, tools and options" << endl << endl; |
99 | t << " -I" << specdir() | 99 | t << "CC =" << var("QMAKE_CC") << endl; |
100 | << endl; | 100 | t << "CXX =" << var("QMAKE_CXX") << endl; |
101 | if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) { | 101 | t << "LEX = " << var("QMAKE_LEX") << endl; |
102 | t << "LINK =" << var("QMAKE_LINK") << endl; | 102 | t << "YACC = " << var("QMAKE_YACC") << endl; |
103 | t << "LFLAGS ="; | 103 | t << "CFLAGS =" << var("QMAKE_CFLAGS") << " " |
104 | if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() ) | 104 | << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " " |
105 | t << varGlue("QMAKE_LIBDIR","-L",";","") << " "; | 105 | << varGlue("DEFINES","-D"," -D","") << endl; |
106 | t << var("QMAKE_LFLAGS") << endl; | 106 | t << "CXXFLAGS =" << var("QMAKE_CXXFLAGS") << " " |
107 | t << "LIBS =" << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << endl; | 107 | << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " " |
108 | } | 108 | << varGlue("DEFINES","-D"," -D","") << endl; |
109 | else { | 109 | t << "LEXFLAGS=" << var("QMAKE_LEXFLAGS") << endl; |
110 | t << "LIB =" << var("QMAKE_LIB") << endl; | 110 | t << "YACCFLAGS=" << var("QMAKE_YACCFLAGS") << endl; |
111 | } | 111 | |
112 | t << "MOC =" << (project->isEmpty("QMAKE_MOC") ? QString("moc") : | 112 | t << "INCPATH ="; |
113 | Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl; | 113 | QStringList &incs = project->variables()["INCLUDEPATH"]; |
114 | t << "UIC =" << (project->isEmpty("QMAKE_UIC") ? QString("uic") : | 114 | for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { |
115 | Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl; | 115 | QString inc = (*incit); |
116 | t << "QMAKE =" << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : | 116 | inc.replace(QRegExp("\\\\$"), "\\\\"); |
117 | Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl; | 117 | inc.replace(QRegExp("\""), ""); |
118 | t << "IDC =" << (project->isEmpty("QMAKE_IDC") ? QString("idc") : | 118 | t << " -I" << "\"" << inc << "\""; |
119 | Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl; | 119 | } |
120 | t << "IDL =" << (project->isEmpty("QMAKE_IDL") ? QString("midl") : | 120 | t << " -I" << "\"" << specdir() << "\"" << endl; |
121 | Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl; | 121 | if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) { |
122 | t << "ZIP =" << var("QMAKE_ZIP") << endl; | 122 | t << "LINK =" << var("QMAKE_LINK") << endl; |
123 | t << "DEF_FILE =" << varList("DEF_FILE") << endl; | 123 | t << "LFLAGS =" << var("QMAKE_LFLAGS") << endl; |
124 | t << "COPY_FILE= " << var("QMAKE_COPY") << endl; | 124 | t << "LIBS ="; |
125 | t << "COPY_DIR= " << var("QMAKE_COPY") << endl; | 125 | if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() ) |
126 | t << "DEL_FILE= " << var("QMAKE_DEL_FILE") << endl; | 126 | t << varGlue("QMAKE_LIBDIR","-L\"","\" -L\"","\"") << " "; |
127 | t << "DEL_DIR= " << var("QMAKE_DEL_DIR") << endl; | 127 | t << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << endl; |
128 | t << "MOVE = " << var("QMAKE_MOVE") << endl; | 128 | } |
129 | t << "CHK_DIR_EXISTS =" << var("QMAKE_CHK_DIR_EXISTS") << endl; | 129 | else { |
130 | t << "MKDIR =" << var("QMAKE_MKDIR") << endl; | 130 | t << "LIB =" << var("QMAKE_LIB") << endl; |
131 | t << endl; | 131 | } |
132 | 132 | t << "MOC =" << (project->isEmpty("QMAKE_MOC") ? QString("moc") : | |
133 | t << "####### Output directory" << endl << endl; | 133 | Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl; |
134 | if (! project->variables()["OBJECTS_DIR"].isEmpty()) | 134 | t << "UIC =" << (project->isEmpty("QMAKE_UIC") ? QString("uic") : |
135 | t << "OBJECTS_DIR = " << var("OBJECTS_DIR").replace(QRegExp("\\\\$"),"") << endl; | 135 | Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl; |
136 | else | 136 | t << "QMAKE =" << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : |
137 | t << "OBJECTS_DIR = . " << endl; | 137 | Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl; |
138 | if (! project->variables()["MOC_DIR"].isEmpty()) | 138 | t << "IDC =" << (project->isEmpty("QMAKE_IDC") ? QString("idc") : |
139 | t << "MOC_DIR = " << var("MOC_DIR").replace(QRegExp("\\\\$"),"") << endl; | 139 | Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl; |
140 | else | 140 | t << "IDL =" << (project->isEmpty("QMAKE_IDL") ? QString("midl") : |
141 | t << "MOC_DIR = . " << endl; | 141 | Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl; |
142 | t << endl; | 142 | t << "ZIP =" << var("QMAKE_ZIP") << endl; |
143 | 143 | t << "DEF_FILE =" << varList("DEF_FILE") << endl; | |
144 | t << "####### Files" << endl << endl; | 144 | t << "COPY_FILE= " << var("QMAKE_COPY") << endl; |
145 | t << "HEADERS =" << varList("HEADERS") << endl; | 145 | t << "COPY_DIR= " << var("QMAKE_COPY") << endl; |
146 | t << "SOURCES =" << varList("SOURCES") << endl; | 146 | t << "DEL_FILE= " << var("QMAKE_DEL_FILE") << endl; |
147 | // t << "OBJECTS =" << varList("OBJECTS").replace(QRegExp("\\.obj"),".o") << endl; | 147 | t << "DEL_DIR= " << var("QMAKE_DEL_DIR") << endl; |
148 | t << "OBJECTS =" << varList("OBJECTS") << endl; | 148 | t << "MOVE = " << var("QMAKE_MOVE") << endl; |
149 | t << "FORMS =" << varList("FORMS") << endl; | 149 | t << "CHK_DIR_EXISTS =" << var("QMAKE_CHK_DIR_EXISTS") << endl; |
150 | t << "UICDECLS =" << varList("UICDECLS") << endl; | 150 | t << "MKDIR =" << var("QMAKE_MKDIR") << endl; |
151 | t << "UICIMPLS =" << varList("UICIMPLS") << endl; | 151 | t << "INSTALL_FILE= " << var("QMAKE_INSTALL_FILE") << endl; |
152 | t << "SRCMOC =" << varList("SRCMOC") << endl; | 152 | t << "INSTALL_DIR = " << var("QMAKE_INSTALL_DIR") << endl; |
153 | t << "OBJMOC =" << varList("OBJMOC") << endl; | 153 | t << endl; |
154 | // t << "OBJMOC =" << varList("OBJMOC").replace(QRegExp("\\.obj"),".o") << endl; | 154 | |
155 | t << "DIST =" << varList("DISTFILES") << endl; | 155 | t << "####### Output directory" << endl << endl; |
156 | t << "TARGET ="; | 156 | if (! project->variables()["OBJECTS_DIR"].isEmpty()) |
157 | if( !project->variables()[ "DESTDIR" ].isEmpty() ) | 157 | t << "OBJECTS_DIR = " << var("OBJECTS_DIR").replace(QRegExp("\\\\$"),"") << endl; |
158 | t << varGlue("TARGET",project->first("DESTDIR"),"",project->first("TARGET_EXT")); | 158 | else |
159 | else | 159 | t << "OBJECTS_DIR = . " << endl; |
160 | t << project->variables()[ "TARGET" ].first() << project->variables()[ "TARGET_EXT" ].first(); | 160 | if (! project->variables()["MOC_DIR"].isEmpty()) |
161 | t << endl; | 161 | t << "MOC_DIR = " << var("MOC_DIR").replace(QRegExp("\\\\$"),"") << endl; |
162 | t << endl; | 162 | else |
163 | 163 | t << "MOC_DIR = . " << endl; | |
164 | t << "####### Implicit rules" << endl << endl; | 164 | t << endl; |
165 | t << ".SUFFIXES: .cpp .cxx .cc .C .c" << endl << endl; | 165 | |
166 | t << ".cpp.o:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl; | 166 | t << "####### Files" << endl << endl; |
167 | t << ".cxx.o:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl; | 167 | t << "HEADERS =" << varList("HEADERS") << endl; |
168 | t << ".cc.o:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl; | 168 | t << "SOURCES =" << varList("SOURCES") << endl; |
169 | t << ".C.o:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl; | 169 | QString objectsLinkLine; |
170 | t << ".c.o:\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl; | 170 | if (!project->variables()["QMAKE_APP_OR_DLL"].isEmpty() && |
171 | 171 | project->variables()["OBJECTS"].count() > var("QMAKE_LINK_OBJECT_MAX").toUInt()) { | |
172 | t << "####### Build rules" << endl << endl; | 172 | createLdObjectScriptFile(var("QMAKE_LINK_OBJECT_SCRIPT"), project->variables()["OBJECTS"]); |
173 | t << "all: " << "$(OBJECTS_DIR) " << "$(MOC_DIR) " << varGlue("ALL_DEPS",""," "," ") << "$(TARGET)" << endl << endl; | 173 | objectsLinkLine = var("QMAKE_LINK_OBJECT_SCRIPT"); |
174 | t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " | 174 | } else { |
175 | << var("POST_TARGETDEPS"); | 175 | objectsLinkLine = "$(OBJECTS)"; |
176 | if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) { | 176 | } |
177 | t << "\n\t" << "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)"; | 177 | t << "OBJECTS =" << varList("OBJECTS") << endl; |
178 | } else { | 178 | t << "FORMS =" << varList("FORMS") << endl; |
179 | t << "\n\t" << "$(LIB) $(TARGET) $(OBJECTS) $(OBJMOC)"; | 179 | t << "UICDECLS =" << varList("UICDECLS") << endl; |
180 | } | 180 | t << "UICIMPLS =" << varList("UICIMPLS") << endl; |
181 | 181 | t << "SRCMOC =" << varList("SRCMOC") << endl; | |
182 | if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) { | 182 | QString objmocLinkLine; |
183 | QStringList dlldirs = project->variables()["DLLDESTDIR"]; | 183 | if (!project->variables()["QMAKE_APP_OR_DLL"].isEmpty() && |
184 | for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) { | 184 | project->variables()["OBJMOC"].count() > var("QMAKE_LINK_OBJECT_MAX").toUInt()) { |
185 | t << "\n\t" << "copy $(TARGET) " << *dlldir; | 185 | createLdObjectScriptFile(var("QMAKE_LINK_OBJMOC_SCRIPT"), project->variables()["OBJMOC"]); |
186 | } | 186 | objmocLinkLine = var("QMAKE_LINK_OBJMOC_SCRIPT"); |
187 | } | 187 | } else { |
188 | QString targetfilename = project->variables()["TARGET"].first(); | 188 | objmocLinkLine = "$(OBJMOC)"; |
189 | if(project->isActiveConfig("activeqt")) { | 189 | } |
190 | QString version = project->variables()["VERSION"].first(); | 190 | t << "OBJMOC =" << varList("OBJMOC") << endl; |
191 | if ( version.isEmpty() ) | 191 | QString extraCompilerDeps; |
192 | version = "1.0"; | 192 | if(!project->isEmpty("QMAKE_EXTRA_WIN_COMPILERS")) { |
193 | 193 | t << "OBJCOMP = " << varList("OBJCOMP") << endl; | |
194 | if ( project->isActiveConfig("dll")) { | 194 | extraCompilerDeps += " $(OBJCOMP) "; |
195 | t << "\n\t" << ("-$(IDC) $(TARGET) /idl tmp\\" + targetfilename + ".idl -version " + version); | 195 | |
196 | t << "\n\t" << ("-$(IDL) tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl"); | 196 | QStringList &comps = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"]; |
197 | t << "\n\t" << ("-$(IDC) $(TARGET) /tlb tmp\\" + targetfilename + ".tlb"); | 197 | for(QStringList::Iterator compit = comps.begin(); compit != comps.end(); ++compit) { |
198 | t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" ); | 198 | QStringList &vars = project->variables()[(*compit) + ".variables"]; |
199 | } else { | 199 | for(QStringList::Iterator varit = vars.begin(); varit != vars.end(); ++varit) { |
200 | t << "\n\t" << ("-$(TARGET) -dumpidl tmp\\" + targetfilename + ".idl -version " + version); | 200 | QStringList vals = project->variables()[(*varit)]; |
201 | t << "\n\t" << ("-$(IDL) tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl"); | 201 | if(!vals.isEmpty()) |
202 | t << "\n\t" << ("-$(IDC) $(TARGET) /tlb tmp\\" + targetfilename + ".tlb"); | 202 | t << "QMAKE_COMP_" << (*varit) << " = " << valList(vals) << endl; |
203 | t << "\n\t" << "-$(TARGET) -regserver"; | 203 | } |
204 | } | 204 | } |
205 | } | 205 | } |
206 | t << endl << endl; | 206 | |
207 | 207 | t << "DIST =" << varList("DISTFILES") << endl; | |
208 | if(!project->variables()["RC_FILE"].isEmpty()) { | 208 | t << "TARGET ="; |
209 | t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t" | 209 | if( !project->variables()[ "DESTDIR" ].isEmpty() ) |
210 | << var("QMAKE_RC") << " -i " << var("RC_FILE") << " -o " << var("RC_FILE").replace(QRegExp("\\.rc"),".o") << endl << endl; | 210 | t << varGlue("TARGET",project->first("DESTDIR"),"",project->first("TARGET_EXT")); |
211 | } | 211 | else |
212 | project->variables()["RES_FILE"].first().replace(QRegExp("\\.rc"),".o"); | 212 | t << project->variables()[ "TARGET" ].first() << project->variables()[ "TARGET_EXT" ].first(); |
213 | 213 | t << endl; | |
214 | t << "mocables: $(SRCMOC)" << endl << endl; | 214 | t << endl; |
215 | 215 | ||
216 | t << "$(OBJECTS_DIR):" << "\n\t" | 216 | t << "####### Implicit rules" << endl << endl; |
217 | << "@if not exist $(OBJECTS_DIR) mkdir $(OBJECTS_DIR)" << endl << endl; | 217 | t << ".SUFFIXES: .cpp .cxx .cc .C .c" << endl << endl; |
218 | 218 | t << ".cpp.o:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl; | |
219 | t << "$(MOC_DIR):" << "\n\t" | 219 | t << ".cxx.o:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl; |
220 | << "@if not exist $(MOC_DIR) mkdir $(MOC_DIR)" << endl << endl; | 220 | t << ".cc.o:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl; |
221 | 221 | t << ".C.o:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl; | |
222 | writeMakeQmake(t); | 222 | t << ".c.o:\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl; |
223 | 223 | ||
224 | t << "dist:" << "\n\t" | 224 | t << "####### Build rules" << endl << endl; |
225 | << "$(ZIP) " << var("PROJECT") << ".zip " | 225 | t << "all: " << "$(OBJECTS_DIR) " << "$(MOC_DIR) " << varGlue("ALL_DEPS",""," "," ") << "$(TARGET)" << endl << endl; |
226 | << var("PROJECT") << ".pro $(SOURCES) $(HEADERS) $(DIST) $(FORMS)" << endl << endl; | 226 | t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " |
227 | 227 | << extraCompilerDeps << var("POST_TARGETDEPS"); | |
228 | t << "clean:" | 228 | if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) { |
229 | << varGlue("OBJECTS","\n\t-del ","\n\t-del ","").replace(QRegExp("\\.obj"),".o") | 229 | t << "\n\t" << "$(LINK) $(LFLAGS) -o $(TARGET) " << objectsLinkLine << " " << objmocLinkLine << " $(LIBS)"; |
230 | << varGlue("SRCMOC" ,"\n\t-del ","\n\t-del ","") | 230 | } else { |
231 | << varGlue("OBJMOC" ,"\n\t-del ","\n\t-del ","").replace(QRegExp("\\.obj"),".o") | 231 | t << "\n\t" << "$(LIB) $(TARGET) " << objectsLinkLine << " " << objmocLinkLine; |
232 | << varGlue("UICDECLS" ,"\n\t-del ","\n\t-del ","") | 232 | } |
233 | << varGlue("UICIMPLS" ,"\n\t-del ","\n\t-del ","") | 233 | t << extraCompilerDeps; |
234 | << "\n\t-del $(TARGET)" | 234 | if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) { |
235 | << varGlue("QMAKE_CLEAN","\n\t-del ","\n\t-del ","") | 235 | QStringList dlldirs = project->variables()["DLLDESTDIR"]; |
236 | << varGlue("CLEAN_FILES","\n\t-del ","\n\t-del ",""); | 236 | for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) { |
237 | if ( project->isActiveConfig("activeqt")) { | 237 | t << "\n\t" << "$(COPY_FILE) \"$(TARGET)\" " << *dlldir; |
238 | t << ("\n\t-del tmp\\" + targetfilename + ".*"); | 238 | } |
239 | t << "\n\t-del tmp\\dump.*"; | 239 | } |
240 | } | 240 | QString targetfilename = project->variables()["TARGET"].first(); |
241 | if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) | 241 | if(project->isActiveConfig("activeqt")) { |
242 | t << "\n\t-del " << var("DLLDESTDIR") << "\\" << project->variables()[ "TARGET" ].first() << project->variables()[ "TARGET_EXT" ].first(); | 242 | QString version = project->variables()["VERSION"].first(); |
243 | if(!project->isEmpty("IMAGES")) | 243 | if ( version.isEmpty() ) |
244 | t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-del ", "\n\t-del ", ""); | 244 | version = "1.0"; |
245 | 245 | ||
246 | // blasted user defined targets | 246 | if ( project->isActiveConfig("dll")) { |
247 | QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"]; | 247 | t << "\n\t" << ("-$(IDC) $(TARGET) /idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); |
248 | for(QStringList::Iterator it = qut.begin(); it != qut.end(); ++it) { | 248 | t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
249 | QString targ = var((*it) + ".target"), | 249 | t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
250 | cmd = var((*it) + ".commands"), deps; | 250 | t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" ); |
251 | if(targ.isEmpty()) | 251 | } else { |
252 | targ = (*it); | 252 | t << "\n\t" << ("-$(TARGET) -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); |
253 | QStringList &deplist = project->variables()[(*it) + ".depends"]; | 253 | t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
254 | for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) { | 254 | t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
255 | QString dep = var((*dep_it) + ".target"); | 255 | t << "\n\t" << "-$(TARGET) -regserver"; |
256 | if(dep.isEmpty()) | 256 | } |
257 | dep = (*dep_it); | 257 | } |
258 | deps += " " + dep; | 258 | t << endl << endl; |
259 | } | 259 | |
260 | t << "\n\n" << targ << ":" << deps << "\n\t" | 260 | if(!project->variables()["RC_FILE"].isEmpty()) { |
261 | << cmd; | 261 | t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t" |
262 | } | 262 | << var("QMAKE_RC") << " -i " << var("RC_FILE") << " -o " << var("RC_FILE").replace(QRegExp("\\.rc"),".o") << " --include-dir=" << QFileInfo(var("RC_FILE")).dirPath() << endl << endl; |
263 | 263 | } | |
264 | t << endl << endl; | 264 | project->variables()["RES_FILE"].first().replace(QRegExp("\\.rc"),".o"); |
265 | } | 265 | |
266 | 266 | t << "mocables: $(SRCMOC)" << endl << endl; | |
267 | 267 | ||
268 | void | 268 | t << "$(OBJECTS_DIR):" << "\n\t" |
269 | MingwMakefileGenerator::init() | 269 | << "@if not exist $(OBJECTS_DIR) $(MKDIR) $(OBJECTS_DIR)" << endl << endl; |
270 | { | 270 | |
271 | if(init_flag) | 271 | t << "$(MOC_DIR):" << "\n\t" |
272 | return; | 272 | << "@if not exist $(MOC_DIR) $(MKDIR) $(MOC_DIR)" << endl << endl; |
273 | init_flag = TRUE; | 273 | |
274 | 274 | writeMakeQmake(t); | |
275 | /* this should probably not be here, but I'm using it to wrap the .t files */ | 275 | |
276 | if(project->first("TEMPLATE") == "app") | 276 | t << "dist:" << "\n\t" |
277 | project->variables()["QMAKE_APP_FLAG"].append("1"); | 277 | << "$(ZIP) " << var("PROJECT") << ".zip " |
278 | else if(project->first("TEMPLATE") == "lib") | 278 | << var("PROJECT") << ".pro $(SOURCES) $(HEADERS) $(DIST) $(FORMS)" << endl << endl; |
279 | project->variables()["QMAKE_LIB_FLAG"].append("1"); | 279 | |
280 | else if(project->first("TEMPLATE") == "subdirs") { | 280 | t << "clean:" |
281 | MakefileGenerator::init(); | 281 | << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").replace(QRegExp("\\.obj"),".o") |
282 | if(project->variables()["MAKEFILE"].isEmpty()) | 282 | << varGlue("SRCMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") |
283 | project->variables()["MAKEFILE"].append("Makefile"); | 283 | << varGlue("OBJMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").replace(QRegExp("\\.obj"),".o") |
284 | if(project->variables()["QMAKE"].isEmpty()) | 284 | << varGlue("UICDECLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") |
285 | project->variables()["QMAKE"].append("qmake"); | 285 | << varGlue("UICIMPLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") |
286 | return; | 286 | << "\n\t-$(DEL_FILE) $(TARGET)" |
287 | } | 287 | << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") |
288 | 288 | << varGlue("CLEAN_FILES","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ",""); | |
289 | bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); | 289 | if ( project->isActiveConfig("activeqt")) { |
290 | project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; | 290 | t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".idl"); |
291 | 291 | t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".tlb"); | |
292 | // LIBS defined in Profile comes first for gcc | 292 | } |
293 | project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"]; | 293 | if(!project->isEmpty("IMAGES")) |
294 | 294 | t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", ""); | |
295 | QString targetfilename = project->variables()["TARGET"].first(); | 295 | |
296 | QStringList &configs = project->variables()["CONFIG"]; | 296 | // user defined targets |
297 | if (project->isActiveConfig("qt") && project->isActiveConfig("shared")) | 297 | QStringList::Iterator it; |
298 | project->variables()["DEFINES"].append("QT_DLL"); | 298 | QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"]; |
299 | if (project->isActiveConfig("qt_dll")) | 299 | |
300 | if(configs.findIndex("qt") == -1) configs.append("qt"); | 300 | for(it = qut.begin(); it != qut.end(); ++it) { |
301 | if ( project->isActiveConfig("qt") ) { | 301 | QString targ = var((*it) + ".target"), |
302 | if ( project->isActiveConfig( "plugin" ) ) { | 302 | cmd = var((*it) + ".commands"), deps; |
303 | project->variables()["CONFIG"].append("dll"); | 303 | if(targ.isEmpty()) |
304 | if(project->isActiveConfig("qt")) | 304 | targ = (*it); |
305 | project->variables()["DEFINES"].append("QT_PLUGIN"); | 305 | QStringList &deplist = project->variables()[(*it) + ".depends"]; |
306 | } | 306 | for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) { |
307 | if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) && | 307 | QString dep = var((*dep_it) + ".target"); |
308 | ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 || | 308 | if(dep.isEmpty()) |
309 | project->variables()["DEFINES"].findIndex("QT_DLL") != -1) || | 309 | dep = (*dep_it); |
310 | (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) { | 310 | deps += " " + dep; |
311 | project->variables()["QMAKE_QT_DLL"].append("1"); | 311 | } |
312 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) | 312 | t << "\n\n" << targ << ":" << deps << "\n\t" |
313 | project->variables()["CONFIG"].append("dll"); | 313 | << cmd; |
314 | } | 314 | } |
315 | if ( project->isActiveConfig("thread") ) | 315 | |
316 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); | 316 | t << endl << endl; |
317 | if ( project->isActiveConfig("accessibility" ) ) | 317 | |
318 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); | 318 | QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"]; |
319 | if ( project->isActiveConfig("tablet") ) | 319 | for(it = quc.begin(); it != quc.end(); ++it) { |
320 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT"); | 320 | QString tmp_out = project->variables()[(*it) + ".output"].first(); |
321 | } | 321 | QString tmp_cmd = project->variables()[(*it) + ".commands"].join(" "); |
322 | if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { | 322 | QString tmp_dep = project->variables()[(*it) + ".depends"].join(" "); |
323 | project->variables()["CONFIG"].remove("staticlib"); | 323 | QStringList &vars = project->variables()[(*it) + ".variables"]; |
324 | project->variables()["QMAKE_APP_OR_DLL"].append("1"); | 324 | if(tmp_out.isEmpty() || tmp_cmd.isEmpty()) |
325 | } else { | 325 | continue; |
326 | project->variables()["CONFIG"].append("staticlib"); | 326 | QStringList &tmp = project->variables()[(*it) + ".input"]; |
327 | } | 327 | for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) { |
328 | if ( project->isActiveConfig("warn_off") ) { | 328 | QStringList &inputs = project->variables()[(*it2)]; |
329 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_OFF"]; | 329 | for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) { |
330 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_OFF"]; | 330 | QFileInfo fi(Option::fixPathToLocalOS((*input))); |
331 | } else if ( project->isActiveConfig("warn_on") ) { | 331 | QString in = Option::fixPathToTargetOS((*input), FALSE), |
332 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_ON"]; | 332 | out = tmp_out, cmd = tmp_cmd, deps; |
333 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"]; | 333 | out.replace("${QMAKE_FILE_BASE}", fi.baseName()); |
334 | } | 334 | out.replace("${QMAKE_FILE_NAME}", fi.fileName()); |
335 | if ( project->isActiveConfig("debug") ) { | 335 | cmd.replace("${QMAKE_FILE_BASE}", fi.baseName()); |
336 | if ( project->isActiveConfig("thread") ) { | 336 | cmd.replace("${QMAKE_FILE_OUT}", out); |
337 | // use the DLL RT even here | 337 | cmd.replace("${QMAKE_FILE_NAME}", fi.fileName()); |
338 | if ( project->variables()["DEFINES"].contains("QT_DLL") ) { | 338 | for(QStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3) |
339 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLLDBG"]; | 339 | cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")"); |
340 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"]; | 340 | if(!tmp_dep.isEmpty()) { |
341 | } else { | 341 | char buff[256]; |
342 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DBG"]; | 342 | QString dep_cmd = tmp_dep; |
343 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"]; | 343 | dep_cmd.replace("${QMAKE_FILE_NAME}", fi.fileName()); |
344 | } | 344 | if(FILE *proc = QT_POPEN(dep_cmd.latin1(), "r")) { |
345 | } | 345 | while(!feof(proc)) { |
346 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_DEBUG"]; | 346 | int read_in = int(fread(buff, 1, 255, proc)); |
347 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_DEBUG"]; | 347 | if(!read_in) |
348 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_DEBUG"]; | 348 | break; |
349 | } else { | 349 | int l = 0; |
350 | if ( project->isActiveConfig("thread") ) { | 350 | for(int i = 0; i < read_in; i++) { |
351 | if ( project->variables()["DEFINES"].contains("QT_DLL") ) { | 351 | if(buff[i] == '\n' || buff[i] == ' ') { |
352 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLL"]; | 352 | deps += " " + QCString(buff+l, (i - l) + 1); |
353 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"]; | 353 | l = i; |
354 | } else { | 354 | } |
355 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT"]; | 355 | } |
356 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT"]; | 356 | } |
357 | } | 357 | fclose(proc); |
358 | } | 358 | } |
359 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RELEASE"]; | 359 | } |
360 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RELEASE"]; | 360 | t << out << ": " << in << deps << "\n\t" |
361 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_RELEASE"]; | 361 | << cmd << endl << endl; |
362 | } | 362 | } |
363 | 363 | } | |
364 | if ( !project->variables()["QMAKE_INCDIR"].isEmpty()) | 364 | } |
365 | project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"]; | 365 | t << endl; |
366 | if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") ) | 366 | } |
367 | project->variables()["CONFIG"].append("windows"); | 367 | |
368 | if ( project->isActiveConfig("qt") ) { | 368 | |
369 | project->variables()["CONFIG"].append("moc"); | 369 | void |
370 | project->variables()["INCLUDEPATH"] +=project->variables()["QMAKE_INCDIR_QT"]; | 370 | MingwMakefileGenerator::init() |
371 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"]; | 371 | { |
372 | if ( !project->isActiveConfig("debug") ) | 372 | if(init_flag) |
373 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG"); | 373 | return; |
374 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { | 374 | init_flag = TRUE; |
375 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) { | 375 | |
376 | project->variables()["DEFINES"].append("QT_MAKEDLL"); | 376 | /* this should probably not be here, but I'm using it to wrap the .t files */ |
377 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_QT_DLL"]; | 377 | if(project->first("TEMPLATE") == "app") |
378 | } | 378 | project->variables()["QMAKE_APP_FLAG"].append("1"); |
379 | } else { | 379 | else if(project->first("TEMPLATE") == "lib") |
380 | if(project->isActiveConfig("thread")) | 380 | project->variables()["QMAKE_LIB_FLAG"].append("1"); |
381 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; | 381 | else if(project->first("TEMPLATE") == "subdirs") { |
382 | else | 382 | MakefileGenerator::init(); |
383 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; | 383 | if(project->variables()["MAKEFILE"].isEmpty()) |
384 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { | 384 | project->variables()["MAKEFILE"].append("Makefile"); |
385 | int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt"); | 385 | if(project->variables()["QMAKE"].isEmpty()) |
386 | if ( hver == -1 ) | 386 | project->variables()["QMAKE"].append("qmake"); |
387 | hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt"); | 387 | return; |
388 | if(hver != -1) { | 388 | } |
389 | QString ver; | 389 | |
390 | ver.sprintf("libqt-%s" QTDLL_POSTFIX "%d.a", (project->isActiveConfig("thread") ? "-mt" : ""), hver); | 390 | if(project->isEmpty("QMAKE_INSTALL_FILE")) |
391 | QStringList &libs = project->variables()["QMAKE_LIBS"]; | 391 | project->variables()["QMAKE_INSTALL_FILE"].append("$(COPY_FILE)"); |
392 | // @@@HGTODO maybe we must change the replace regexp if we understand what's going on | 392 | if(project->isEmpty("QMAKE_INSTALL_DIR")) |
393 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) | 393 | project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); |
394 | (*libit).replace(QRegExp("qt(-mt)?\\.lib"), ver); | 394 | |
395 | } | 395 | bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); |
396 | } | 396 | project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; |
397 | if ( project->isActiveConfig( "activeqt" ) ) { | 397 | |
398 | project->variables().remove("QMAKE_LIBS_QT_ENTRY"); | 398 | // LIBS defined in Profile comes first for gcc |
399 | project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib"; | 399 | project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"]; |
400 | if ( project->isActiveConfig( "dll" ) ) | 400 | |
401 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; | 401 | QString targetfilename = project->variables()["TARGET"].first(); |
402 | } | 402 | QStringList &configs = project->variables()["CONFIG"]; |
403 | if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { | 403 | |
404 | project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"]; | 404 | if (project->isActiveConfig("qt") && project->isActiveConfig("shared")) |
405 | } | 405 | project->variables()["DEFINES"].append("QT_DLL"); |
406 | } | 406 | |
407 | } | 407 | if (project->isActiveConfig("qt_dll")) |
408 | if ( project->isActiveConfig("opengl") ) { | 408 | if (configs.findIndex("qt") == -1) |
409 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"]; | 409 | configs.append("qt"); |
410 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"]; | 410 | |
411 | } | 411 | if ( project->isActiveConfig("qt") ) { |
412 | if ( project->isActiveConfig("dll") ) { | 412 | if ( project->isActiveConfig( "plugin" ) ) { |
413 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE_DLL"]; | 413 | project->variables()["CONFIG"].append("dll"); |
414 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE_DLL"]; | 414 | if(project->isActiveConfig("qt")) |
415 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"]; | 415 | project->variables()["DEFINES"].append("QT_PLUGIN"); |
416 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"]; | 416 | } |
417 | if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty()) { | 417 | if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) && |
418 | project->variables()["TARGET_EXT"].append( | 418 | ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 || |
419 | QStringList::split('.',project->first("VERSION")).join("") + ".dll"); | 419 | project->variables()["DEFINES"].findIndex("QT_DLL") != -1) || |
420 | } else { | 420 | (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) { |
421 | project->variables()["TARGET_EXT"].append(".dll"); | 421 | project->variables()["QMAKE_QT_DLL"].append("1"); |
422 | } | 422 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) |
423 | } else { | 423 | project->variables()["CONFIG"].append("dll"); |
424 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"]; | 424 | } |
425 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE"]; | 425 | if ( project->isActiveConfig("thread") ) |
426 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE"]; | 426 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); |
427 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS"]; | 427 | if ( project->isActiveConfig("accessibility" ) ) |
428 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty()) { | 428 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); |
429 | project->variables()["TARGET_EXT"].append(".exe"); | 429 | if ( project->isActiveConfig("tablet") ) |
430 | } else { | 430 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT"); |
431 | project->variables()["TARGET_EXT"].append(".a"); | 431 | } |
432 | project->variables()["QMAKE_LFLAGS"].append("-static"); | 432 | |
433 | if(project->variables()["TARGET"].first().left(3) != "lib") | 433 | if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { |
434 | project->variables()["TARGET"].first().prepend("lib"); | 434 | project->variables()["CONFIG"].remove("staticlib"); |
435 | } | 435 | project->variables()["QMAKE_APP_OR_DLL"].append("1"); |
436 | } | 436 | } else { |
437 | if ( project->isActiveConfig("windows") ) { | 437 | project->variables()["CONFIG"].append("staticlib"); |
438 | if ( project->isActiveConfig("console") ) { | 438 | } |
439 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; | 439 | |
440 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; | 440 | if ( project->isActiveConfig("warn_off") ) { |
441 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; | 441 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_OFF"]; |
442 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; | 442 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_OFF"]; |
443 | } else { | 443 | } else if ( project->isActiveConfig("warn_on") ) { |
444 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"]; | 444 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_ON"]; |
445 | } | 445 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"]; |
446 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"]; | 446 | } |
447 | } else { | 447 | |
448 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; | 448 | if ( project->isActiveConfig("debug") ) { |
449 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; | 449 | if ( project->isActiveConfig("thread") ) { |
450 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; | 450 | // use the DLL RT even here |
451 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; | 451 | if ( project->variables()["DEFINES"].contains("QT_DLL") ) { |
452 | } | 452 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLLDBG"]; |
453 | 453 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"]; | |
454 | if ( project->isActiveConfig("moc") ) | 454 | } else { |
455 | setMocAware(TRUE); | 455 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DBG"]; |
456 | project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ', | 456 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"]; |
457 | "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH"); | 457 | } |
458 | QStringList &l = project->variables()["QMAKE_FILETAGS"]; | 458 | } |
459 | for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) { | 459 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_DEBUG"]; |
460 | QStringList &gdmf = project->variables()[(*it)]; | 460 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_DEBUG"]; |
461 | for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner) | 461 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_DEBUG"]; |
462 | (*inner) = Option::fixPathToTargetOS((*inner), FALSE); | 462 | } else { |
463 | } | 463 | if ( project->isActiveConfig("thread") ) { |
464 | 464 | if ( project->variables()["DEFINES"].contains("QT_DLL") ) { | |
465 | if ( project->isActiveConfig("dll") ) | 465 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLL"]; |
466 | project->variables()["QMAKE_LFLAGS"].append(QString("-Wl,--out-implib,") + project->first("DESTDIR") + "\\lib"+ project->first("TARGET") + ".a"); | 466 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"]; |
467 | 467 | } else { | |
468 | if ( !project->variables()["DEF_FILE"].isEmpty() ) | 468 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT"]; |
469 | project->variables()["QMAKE_LFLAGS"].append(QString("-Wl,--output-def,") + project->first("DEF_FILE")); | 469 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT"]; |
470 | // if(!project->isActiveConfig("incremental")) | 470 | } |
471 | //project->variables()["QMAKE_LFLAGS"].append(QString("/incremental:no")); | 471 | } |
472 | 472 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RELEASE"]; | |
473 | #if 0 | 473 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RELEASE"]; |
474 | if ( !project->variables()["VERSION"].isEmpty() ) { | 474 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_RELEASE"]; |
475 | QString version = project->variables()["VERSION"][0]; | 475 | } |
476 | int firstDot = version.find( "." ); | 476 | |
477 | QString major = version.left( firstDot ); | 477 | if ( !project->variables()["QMAKE_INCDIR"].isEmpty()) |
478 | QString minor = version.right( version.length() - firstDot - 1 ); | 478 | project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"]; |
479 | minor.replace( ".", "" ); | 479 | |
480 | project->variables()["QMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor ); | 480 | if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") ) |
481 | } | 481 | project->variables()["CONFIG"].append("windows"); |
482 | #endif | 482 | |
483 | if ( !project->variables()["RC_FILE"].isEmpty()) { | 483 | if ( project->isActiveConfig("qt") ) { |
484 | if ( !project->variables()["RES_FILE"].isEmpty()) { | 484 | project->variables()["CONFIG"].append("moc"); |
485 | fprintf(stderr, "Both .rc and .res file specified.\n"); | 485 | project->variables()["INCLUDEPATH"] +=project->variables()["QMAKE_INCDIR_QT"]; |
486 | fprintf(stderr, "Please specify one of them, not both."); | 486 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"]; |
487 | exit(666); | 487 | if ( !project->isActiveConfig("debug") ) |
488 | } | 488 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG"); |
489 | project->variables()["RES_FILE"] = project->variables()["RC_FILE"]; | 489 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { |
490 | project->variables()["RES_FILE"].first().replace(".rc",".o"); | 490 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) { |
491 | project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"]; | 491 | project->variables()["DEFINES"].append("QT_MAKEDLL"); |
492 | } | 492 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_QT_DLL"]; |
493 | if ( !project->variables()["RES_FILE"].isEmpty()) | 493 | } |
494 | project->variables()["QMAKE_LIBS"] += project->variables()["RES_FILE"]; | 494 | } else { |
495 | 495 | ||
496 | MakefileGenerator::init(); | 496 | if(project->isActiveConfig("thread")) |
497 | if ( !project->variables()["VERSION"].isEmpty()) { | 497 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; |
498 | QStringList l = QStringList::split('.', project->first("VERSION")); | 498 | else |
499 | project->variables()["VER_MAJ"].append(l[0]); | 499 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; |
500 | project->variables()["VER_MIN"].append(l[1]); | 500 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { |
501 | } | 501 | int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt"); |
502 | if(project->isActiveConfig("dll")) { | 502 | if ( hver == -1 ) |
503 | project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") +"lib" + project->first("TARGET") + ".a"); | 503 | hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt"); |
504 | } | 504 | if(hver != -1) { |
505 | } | 505 | QString ver; |
506 | 506 | ver.sprintf("libqt-%s" QTDLL_POSTFIX "%d.a", (project->isActiveConfig("thread") ? "-mt" : ""), hver); | |
507 | void | 507 | QStringList &libs = project->variables()["QMAKE_LIBS"]; |
508 | MingwMakefileGenerator::writeSubDirs(QTextStream &t) | 508 | // @@@HGTODO maybe we must change the replace regexp if we understand what's going on |
509 | { | 509 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) |
510 | QString qs ; | 510 | (*libit).replace(QRegExp("qt(-mt)?\\.lib"), ver); |
511 | QTextStream ts (&qs, IO_WriteOnly) ; | 511 | } |
512 | Win32MakefileGenerator::writeSubDirs( ts ) ; | 512 | } |
513 | QRegExp rx("(\\n\\tcd [^\\n\\t]+)(\\n\\t.+)\\n\\t@cd ..") ; | 513 | if ( project->isActiveConfig( "activeqt" ) ) { |
514 | rx.setMinimal(true); | 514 | project->variables().remove("QMAKE_LIBS_QT_ENTRY"); |
515 | int pos = 0 ; | 515 | project->variables()["QMAKE_LIBS_QT_ENTRY"] = "-lqaxserver"; |
516 | while ( -1 != (pos = rx.search( qs, pos))) | 516 | if ( project->isActiveConfig( "dll" ) ) { |
517 | { | 517 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; |
518 | QString qsMatch = rx.cap(2); | 518 | } |
519 | qsMatch.replace("\n\t"," && \\\n\t"); | 519 | } |
520 | qs.replace(pos+rx.cap(1).length(), rx.cap(2).length(), qsMatch ); | 520 | if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { |
521 | pos += (rx.cap(1).length()+qsMatch.length()); | 521 | project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"]; |
522 | } | 522 | } |
523 | t << qs ; | 523 | |
524 | } | 524 | // QMAKE_LIBS_QT_ENTRY should be first on the link line as it needs qt |
525 | project->variables()["QMAKE_LIBS"].remove(project->variables()["QMAKE_LIBS_QT_ENTRY"].first()); | ||
526 | project->variables()["QMAKE_LIBS"].prepend(project->variables()["QMAKE_LIBS_QT_ENTRY"].first()); | ||
527 | |||
528 | } | ||
529 | } | ||
530 | |||
531 | if ( project->isActiveConfig("opengl") ) { | ||
532 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"]; | ||
533 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"]; | ||
534 | } | ||
535 | |||
536 | if ( project->isActiveConfig("dll") ) { | ||
537 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE_DLL"]; | ||
538 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE_DLL"]; | ||
539 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"]; | ||
540 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"]; | ||
541 | if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty()) { | ||
542 | project->variables()["TARGET_EXT"].append( | ||
543 | QStringList::split('.',project->first("VERSION")).join("") + ".dll"); | ||
544 | } else { | ||
545 | project->variables()["TARGET_EXT"].append(".dll"); | ||
546 | } | ||
547 | } else { | ||
548 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"]; | ||
549 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE"]; | ||
550 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE"]; | ||
551 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS"]; | ||
552 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty()) { | ||
553 | project->variables()["TARGET_EXT"].append(".exe"); | ||
554 | } else { | ||
555 | project->variables()["TARGET_EXT"].append(".a"); | ||
556 | project->variables()["QMAKE_LFLAGS"].append("-static"); | ||
557 | if(project->variables()["TARGET"].first().left(3) != "lib") | ||
558 | project->variables()["TARGET"].first().prepend("lib"); | ||
559 | } | ||
560 | } | ||
561 | |||
562 | if ( project->isActiveConfig("windows") ) { | ||
563 | if ( project->isActiveConfig("console") ) { | ||
564 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; | ||
565 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; | ||
566 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; | ||
567 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; | ||
568 | } else { | ||
569 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"]; | ||
570 | } | ||
571 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"]; | ||
572 | } else { | ||
573 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; | ||
574 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; | ||
575 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; | ||
576 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; | ||
577 | } | ||
578 | |||
579 | if ( project->isActiveConfig("exceptions") ) { | ||
580 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"]; | ||
581 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"]; | ||
582 | } else { | ||
583 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"]; | ||
584 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"]; | ||
585 | } | ||
586 | |||
587 | if ( project->isActiveConfig("rtti") ) { | ||
588 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"]; | ||
589 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"]; | ||
590 | } else { | ||
591 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"]; | ||
592 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"]; | ||
593 | } | ||
594 | |||
595 | if ( project->isActiveConfig("moc") ) | ||
596 | setMocAware(TRUE); | ||
597 | |||
598 | // add -L libs to libdir | ||
599 | QStringList &libs = project->variables()["QMAKE_LIBS"]; | ||
600 | for ( QStringList::Iterator libit = libs.begin(); libit != libs.end(); ) { | ||
601 | if ( (*libit).startsWith( "-L" ) ) { | ||
602 | project->variables()["QMAKE_LIBDIR"] += (*libit).mid(2); | ||
603 | libit = libs.remove( libit ); | ||
604 | } else { | ||
605 | ++libit; | ||
606 | } | ||
607 | } | ||
608 | |||
609 | project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ', | ||
610 | "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH"); | ||
611 | QStringList &l = project->variables()["QMAKE_FILETAGS"]; | ||
612 | QStringList::Iterator it; | ||
613 | for(it = l.begin(); it != l.end(); ++it) { | ||
614 | QStringList &gdmf = project->variables()[(*it)]; | ||
615 | for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner) | ||
616 | (*inner) = Option::fixPathToTargetOS((*inner), FALSE); | ||
617 | } | ||
618 | |||
619 | if ( project->isActiveConfig("dll") ) { | ||
620 | QString destDir = ""; | ||
621 | if (!project->first("DESTDIR").isEmpty()) | ||
622 | destDir = project->first("DESTDIR") + Option::dir_sep; | ||
623 | project->variables()["QMAKE_LFLAGS"].append(QString("-Wl,--out-implib,") + | ||
624 | destDir + "lib" + project->first("TARGET") + ".a"); | ||
625 | } | ||
626 | |||
627 | if ( !project->variables()["DEF_FILE"].isEmpty() ) | ||
628 | project->variables()["QMAKE_LFLAGS"].append(QString("-Wl,") + project->first("DEF_FILE")); | ||
629 | // if(!project->isActiveConfig("incremental")) | ||
630 | //project->variables()["QMAKE_LFLAGS"].append(QString("/incremental:no")); | ||
631 | |||
632 | #if 0 | ||
633 | if ( !project->variables()["VERSION"].isEmpty() ) { | ||
634 | QString version = project->variables()["VERSION"][0]; | ||
635 | int firstDot = version.find( "." ); | ||
636 | QString major = version.left( firstDot ); | ||
637 | QString minor = version.right( version.length() - firstDot - 1 ); | ||
638 | minor.replace( ".", "" ); | ||
639 | project->variables()["QMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor ); | ||
640 | } | ||
641 | #endif | ||
642 | |||
643 | if ( !project->variables()["RC_FILE"].isEmpty()) { | ||
644 | if ( !project->variables()["RES_FILE"].isEmpty()) { | ||
645 | fprintf(stderr, "Both .rc and .res file specified.\n"); | ||
646 | fprintf(stderr, "Please specify one of them, not both."); | ||
647 | exit(666); | ||
648 | } | ||
649 | project->variables()["RES_FILE"] = project->variables()["RC_FILE"]; | ||
650 | project->variables()["RES_FILE"].first().replace(".rc",".o"); | ||
651 | project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"]; | ||
652 | project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"]; | ||
653 | } | ||
654 | |||
655 | if ( !project->variables()["RES_FILE"].isEmpty()) | ||
656 | project->variables()["QMAKE_LIBS"] += project->variables()["RES_FILE"]; | ||
657 | |||
658 | MakefileGenerator::init(); | ||
659 | |||
660 | if ( !project->variables()["VERSION"].isEmpty()) { | ||
661 | QStringList l = QStringList::split('.', project->first("VERSION")); | ||
662 | project->variables()["VER_MAJ"].append(l[0]); | ||
663 | project->variables()["VER_MIN"].append(l[1]); | ||
664 | } | ||
665 | |||
666 | if(project->isActiveConfig("dll")) { | ||
667 | project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") +"lib" + project->first("TARGET") + ".a"); | ||
668 | } | ||
669 | |||
670 | QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"]; | ||
671 | for(it = quc.begin(); it != quc.end(); ++it) { | ||
672 | QString tmp_out = project->variables()[(*it) + ".output"].first(); | ||
673 | if(tmp_out.isEmpty()) | ||
674 | continue; | ||
675 | QStringList &tmp = project->variables()[(*it) + ".input"]; | ||
676 | for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) { | ||
677 | QStringList &inputs = project->variables()[(*it2)]; | ||
678 | for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) { | ||
679 | QFileInfo fi(Option::fixPathToLocalOS((*input))); | ||
680 | QString in = Option::fixPathToTargetOS((*input), FALSE), | ||
681 | out = tmp_out; | ||
682 | out.replace("${QMAKE_FILE_BASE}", fi.baseName()); | ||
683 | out.replace("${QMAKE_FILE_NAME}", fi.fileName()); | ||
684 | if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1) | ||
685 | project->variables()["OBJCOMP"] += out; | ||
686 | } | ||
687 | } | ||
688 | } | ||
689 | } | ||
690 | |||
691 | void | ||
692 | MingwMakefileGenerator::writeSubDirs(QTextStream &t) | ||
693 | { | ||
694 | QString qs ; | ||
695 | QTextStream ts (&qs, IO_WriteOnly) ; | ||
696 | Win32MakefileGenerator::writeSubDirs( ts ) ; | ||
697 | QRegExp rx("(\\n\\tcd [^\\n\\t]+)(\\n\\t.+)\\n\\t@cd ..") ; | ||
698 | rx.setMinimal(TRUE); | ||
699 | int pos = 0 ; | ||
700 | while ( -1 != (pos = rx.search( qs, pos))) | ||
701 | { | ||
702 | QString qsMatch = rx.cap(2); | ||
703 | qsMatch.replace("\n\t"," && \\\n\t"); | ||
704 | qs.replace(pos+rx.cap(1).length(), rx.cap(2).length(), qsMatch ); | ||
705 | pos += (rx.cap(1).length()+qsMatch.length()); | ||
706 | } | ||
707 | t << qs ; | ||
708 | } | ||
diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h index c00bf1b..d971e3a 100644 --- a/qmake/generators/win32/mingw_make.h +++ b/qmake/generators/win32/mingw_make.h | |||
@@ -1,58 +1,61 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of ________ class. | 4 | ** Definition of MingwMakefileGenerator class. |
5 | ** | 5 | ** |
6 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. | 6 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** This file is part of the network module of the Qt GUI Toolkit. | 8 | ** This file is part of qmake. |
9 | ** | 9 | ** |
10 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
11 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
12 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
13 | ** | 13 | ** |
14 | ** This file may be distributed and/or modified under the terms of the | 14 | ** This file may be distributed and/or modified under the terms of the |
15 | ** GNU General Public License version 2 as published by the Free Software | 15 | ** GNU General Public License version 2 as published by the Free Software |
16 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
17 | ** packaging of this file. | 17 | ** packaging of this file. |
18 | ** | 18 | ** |
19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
20 | ** file in accordance with the Qt Commercial License Agreement provided | 20 | ** file in accordance with the Qt Commercial License Agreement provided |
21 | ** with the Software. | 21 | ** with the Software. |
22 | ** | 22 | ** |
23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
25 | ** | 25 | ** |
26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
27 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
30 | ** | 30 | ** |
31 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
32 | ** not clear to you. | 32 | ** not clear to you. |
33 | ** | 33 | ** |
34 | **********************************************************************/ | 34 | **********************************************************************/ |
35 | #ifndef __MINGW_MAKE_H__ | 35 | |
36 | #define __MINGW_MAKE_H__ | 36 | #ifndef __MINGW_MAKE_H__ |
37 | 37 | #define __MINGW_MAKE_H__ | |
38 | #include "winmakefile.h" | 38 | |
39 | 39 | #include "winmakefile.h" | |
40 | class MingwMakefileGenerator : public Win32MakefileGenerator | 40 | |
41 | { | 41 | class MingwMakefileGenerator : public Win32MakefileGenerator |
42 | bool init_flag; | 42 | { |
43 | void writeMingwParts(QTextStream &); | 43 | bool init_flag; |
44 | void writeSubDirs(QTextStream &t) ; | 44 | void writeMingwParts(QTextStream &); |
45 | 45 | void writeSubDirs(QTextStream &t) ; | |
46 | bool writeMakefile(QTextStream &); | 46 | |
47 | void init(); | 47 | bool writeMakefile(QTextStream &); |
48 | 48 | void init(); | |
49 | public: | 49 | |
50 | MingwMakefileGenerator(QMakeProject *p); | 50 | virtual bool findLibraries(); |
51 | ~MingwMakefileGenerator(); | 51 | |
52 | 52 | public: | |
53 | }; | 53 | MingwMakefileGenerator(QMakeProject *p); |
54 | 54 | ~MingwMakefileGenerator(); | |
55 | inline MingwMakefileGenerator::~MingwMakefileGenerator() | 55 | |
56 | { } | 56 | }; |
57 | 57 | ||
58 | #endif /* __MINGW_MAKE_H__ */ | 58 | inline MingwMakefileGenerator::~MingwMakefileGenerator() |
59 | { } | ||
60 | |||
61 | #endif /* __MINGW_MAKE_H__ */ | ||
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp index 3fa0496..d2abac6 100644 --- a/qmake/generators/win32/msvc_dsp.cpp +++ b/qmake/generators/win32/msvc_dsp.cpp | |||
@@ -1,998 +1,1136 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of ________ class. | 4 | ** Implementation of DspMakefileGenerator class. |
5 | ** | 5 | ** |
6 | ** Created : 970521 | 6 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. | 8 | ** This file is part of qmake. |
9 | ** | ||
10 | ** This file is part of the network module of the Qt GUI Toolkit. | ||
11 | ** | 9 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 13 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 14 | ** This file may be distributed and/or modified under the terms of the |
17 | ** GNU General Public License version 2 as published by the Free Software | 15 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 17 | ** packaging of this file. |
20 | ** | 18 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
22 | ** file in accordance with the Qt Commercial License Agreement provided | 20 | ** file in accordance with the Qt Commercial License Agreement provided |
23 | ** with the Software. | 21 | ** with the Software. |
24 | ** | 22 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 25 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 30 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 32 | ** not clear to you. |
35 | ** | 33 | ** |
36 | **********************************************************************/ | 34 | **********************************************************************/ |
37 | 35 | ||
38 | #include "msvc_dsp.h" | 36 | #include "msvc_dsp.h" |
39 | #include "option.h" | 37 | #include "option.h" |
40 | #include <qdir.h> | 38 | #include <qdir.h> |
41 | #include <qregexp.h> | 39 | #include <qregexp.h> |
42 | #include <stdlib.h> | 40 | #include <stdlib.h> |
43 | #include <time.h> | 41 | #include <time.h> |
44 | 42 | ||
45 | DspMakefileGenerator::DspMakefileGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE) | 43 | DspMakefileGenerator::DspMakefileGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE) |
46 | { | 44 | { |
47 | 45 | ||
48 | } | 46 | } |
49 | 47 | ||
50 | bool | 48 | bool |
51 | DspMakefileGenerator::writeMakefile(QTextStream &t) | 49 | DspMakefileGenerator::writeMakefile(QTextStream &t) |
52 | { | 50 | { |
53 | if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { | 51 | if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { |
54 | /* for now just dump, I need to generated an empty dsp or something.. */ | 52 | /* for now just dump, I need to generated an empty dsp or something.. */ |
55 | fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n", | 53 | fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n", |
56 | var("QMAKE_FAILED_REQUIREMENTS").latin1()); | 54 | var("QMAKE_FAILED_REQUIREMENTS").latin1()); |
57 | return TRUE; | 55 | return TRUE; |
58 | } | 56 | } |
59 | 57 | ||
60 | if(project->first("TEMPLATE") == "vcapp" || | 58 | if(project->first("TEMPLATE") == "vcapp" || |
61 | project->first("TEMPLATE") == "vclib") { | 59 | project->first("TEMPLATE") == "vclib") { |
62 | return writeDspParts(t); | 60 | return writeDspParts(t); |
63 | } | 61 | } |
64 | else if(project->first("TEMPLATE") == "subdirs") { | 62 | else if(project->first("TEMPLATE") == "subdirs") { |
65 | writeHeader(t); | 63 | writeHeader(t); |
66 | writeSubDirs(t); | 64 | writeSubDirs(t); |
67 | return TRUE; | 65 | return TRUE; |
68 | } | 66 | } |
69 | return FALSE; | 67 | return FALSE; |
70 | } | 68 | } |
71 | 69 | ||
72 | bool | 70 | bool |
73 | DspMakefileGenerator::writeDspParts(QTextStream &t) | 71 | DspMakefileGenerator::writeDspParts(QTextStream &t) |
74 | { | 72 | { |
75 | QString dspfile; | 73 | QString dspfile; |
76 | if ( !project->variables()["DSP_TEMPLATE"].isEmpty() ) { | 74 | if ( !project->variables()["DSP_TEMPLATE"].isEmpty() ) { |
77 | dspfile = project->first("DSP_TEMPLATE"); | 75 | dspfile = project->first("DSP_TEMPLATE"); |
78 | } else { | 76 | } else { |
79 | dspfile = project->first("MSVCDSP_TEMPLATE"); | 77 | dspfile = project->first("MSVCDSP_TEMPLATE"); |
80 | } | 78 | } |
79 | if (dspfile.startsWith("\"") && dspfile.endsWith("\"")) | ||
80 | dspfile = dspfile.mid(1, dspfile.length() - 2); | ||
81 | QString dspfile_loc = findTemplate(dspfile); | 81 | QString dspfile_loc = findTemplate(dspfile); |
82 | 82 | ||
83 | QFile file(dspfile_loc); | 83 | QFile file(dspfile_loc); |
84 | if(!file.open(IO_ReadOnly)) { | 84 | if(!file.open(IO_ReadOnly)) { |
85 | fprintf(stderr, "Cannot open dsp file: %s\n", dspfile.latin1()); | 85 | fprintf(stderr, "Cannot open dsp file: %s\n", dspfile.latin1()); |
86 | return FALSE; | 86 | return FALSE; |
87 | } | 87 | } |
88 | QTextStream dsp(&file); | 88 | QTextStream dsp(&file); |
89 | 89 | ||
90 | QString platform = "Win32"; | ||
91 | if ( !project->variables()["QMAKE_PLATFORM"].isEmpty() ) | ||
92 | platform = varGlue("QMAKE_PLATFORM", "", " ", ""); | ||
93 | |||
94 | // Setup PCH variables | ||
95 | precompH = project->first("PRECOMPILED_HEADER"); | ||
96 | QString namePCH = QFileInfo(precompH).fileName(); | ||
97 | usePCH = !precompH.isEmpty() && project->isActiveConfig("precompile_header"); | ||
98 | if (usePCH) { | ||
99 | // Created files | ||
100 | QString origTarget = project->first("QMAKE_ORIG_TARGET"); | ||
101 | origTarget.replace(QRegExp("-"), "_"); | ||
102 | precompObj = "\"$(IntDir)\\" + origTarget + Option::obj_ext + "\""; | ||
103 | precompPch = "\"$(IntDir)\\" + origTarget + ".pch\""; | ||
104 | // Add PRECOMPILED_HEADER to HEADERS | ||
105 | if (!project->variables()["HEADERS"].contains(precompH)) | ||
106 | project->variables()["HEADERS"] += precompH; | ||
107 | // Add precompile compiler options | ||
108 | project->variables()["PRECOMPILED_FLAGS_REL"] = "/Yu\"" + namePCH + "\" /FI\"" + namePCH + "\" "; | ||
109 | project->variables()["PRECOMPILED_FLAGS_DEB"] = "/Yu\"" + namePCH + "\" /FI\"" + namePCH + "\" "; | ||
110 | // Return to variable pool | ||
111 | project->variables()["PRECOMPILED_OBJECT"] = precompObj; | ||
112 | project->variables()["PRECOMPILED_PCH"] = precompPch; | ||
113 | } | ||
90 | int rep; | 114 | int rep; |
91 | QString line; | 115 | QString line; |
92 | while ( !dsp.eof() ) { | 116 | while ( !dsp.eof() ) { |
93 | line = dsp.readLine(); | 117 | line = dsp.readLine(); |
94 | while((rep = line.find(QRegExp("\\$\\$[a-zA-Z0-9_-]*"))) != -1) { | 118 | while((rep = line.find(QRegExp("\\$\\$[a-zA-Z0-9_-]*"))) != -1) { |
95 | QString torep = line.mid(rep, line.find(QRegExp("[^\\$a-zA-Z0-9_-]"), rep) - rep); | 119 | QString torep = line.mid(rep, line.find(QRegExp("[^\\$a-zA-Z0-9_-]"), rep) - rep); |
96 | QString variable = torep.right(torep.length()-2); | 120 | QString variable = torep.right(torep.length()-2); |
97 | 121 | ||
98 | t << line.left(rep); //output the left side | 122 | t << line.left(rep); //output the left side |
99 | line = line.right(line.length() - (rep + torep.length())); //now past the variable | 123 | line = line.right(line.length() - (rep + torep.length())); //now past the variable |
100 | if(variable == "MSVCDSP_SOURCES") { | 124 | if(variable == "MSVCDSP_SOURCES") { |
101 | if(project->variables()["SOURCES"].isEmpty()) | 125 | if(project->variables()["SOURCES"].isEmpty()) |
102 | continue; | 126 | continue; |
103 | 127 | ||
104 | QString mocpath = var( "QMAKE_MOC" ); | 128 | QString mocpath = var( "QMAKE_MOC" ); |
105 | mocpath = mocpath.replace( QRegExp( "\\..*$" ), "" ) + " "; | 129 | mocpath = mocpath.replace( QRegExp( "\\..*$" ), "" ) + " "; |
106 | 130 | ||
107 | QStringList list = project->variables()["SOURCES"] + project->variables()["DEF_FILE"]; | 131 | QStringList list = project->variables()["SOURCES"] + project->variables()["DEF_FILE"]; |
108 | if(!project->isActiveConfig("flat")) | 132 | if(!project->isActiveConfig("flat")) |
109 | list.sort(); | 133 | list.sort(); |
110 | QStringList::Iterator it; | 134 | QStringList::Iterator it; |
111 | for( it = list.begin(); it != list.end(); ++it) { | 135 | for( it = list.begin(); it != list.end(); ++it) { |
112 | beginGroupForFile((*it), t); | 136 | beginGroupForFile((*it), t); |
113 | t << "# Begin Source File\n\nSOURCE=" << (*it) << endl; | 137 | t << "# Begin Source File\n\nSOURCE=" << (*it) << endl; |
114 | if ( project->isActiveConfig("moc") && (*it).endsWith(Option::moc_ext)) { | 138 | if (usePCH && (*it).endsWith(".c")) |
139 | t << "# SUBTRACT CPP /FI\"" << namePCH << "\" /Yu\"" << namePCH << "\" /Fp" << endl; | ||
140 | if ( project->isActiveConfig("moc") && (*it).endsWith(Option::cpp_moc_ext)) { | ||
115 | QString base = (*it); | 141 | QString base = (*it); |
116 | base.replace(QRegExp("\\..*$"), "").upper(); | 142 | base.replace(QRegExp("\\..*$"), "").upper(); |
117 | base.replace(QRegExp("[^a-zA-Z]"), "_"); | 143 | base.replace(QRegExp("[^a-zA-Z]"), "_"); |
118 | 144 | ||
119 | QString build = "\n\n# Begin Custom Build - Moc'ing " + findMocSource((*it)) + | 145 | QString build = "\n\n# Begin Custom Build - Moc'ing " + findMocSource((*it)) + |
120 | "...\n" "InputPath=.\\" + (*it) + "\n\n" "\"" + (*it) + "\"" | 146 | "...\n" "InputPath=.\\" + (*it) + "\n\n" "\"" + (*it) + "\"" |
121 | " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n" | 147 | " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n" |
122 | "\t" + mocpath + findMocSource((*it)) + " -o " + | 148 | "\t" + mocpath + findMocSource((*it)) + " -o " + |
123 | (*it) + "\n\n" "# End Custom Build\n\n"; | 149 | (*it) + "\n\n" "# End Custom Build\n\n"; |
124 | 150 | ||
125 | t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(QTDIR)\\bin\\moc.exe\"" << endl << endl; | 151 | t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(QTDIR)\\bin\\moc.exe\"" << endl << endl; |
126 | 152 | ||
127 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Release\"" << build | 153 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build |
128 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Debug\"" | 154 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\"" |
129 | << build << "!ENDIF " << endl << endl; | 155 | << build << "!ENDIF " << endl << endl; |
130 | } | 156 | } |
131 | t << "# End Source File" << endl; | 157 | t << "# End Source File" << endl; |
132 | } | 158 | } |
133 | endGroups(t); | 159 | endGroups(t); |
134 | } else if(variable == "MSVCDSP_IMAGES") { | 160 | } else if(variable == "MSVCDSP_IMAGES") { |
135 | if(project->variables()["IMAGES"].isEmpty()) | 161 | if(project->variables()["IMAGES"].isEmpty()) |
136 | continue; | 162 | continue; |
137 | t << "# Begin Source File\n\nSOURCE=" << project->first("QMAKE_IMAGE_COLLECTION") << endl; | 163 | t << "# Begin Source File\n\nSOURCE=" << project->first("QMAKE_IMAGE_COLLECTION") << endl; |
138 | t << "# End Source File" << endl; | 164 | t << "# End Source File" << endl; |
139 | } else if(variable == "MSVCDSP_HEADERS") { | 165 | } else if(variable == "MSVCDSP_HEADERS") { |
140 | if(project->variables()["HEADERS"].isEmpty()) | 166 | if(project->variables()["HEADERS"].isEmpty()) |
141 | continue; | 167 | continue; |
142 | 168 | ||
143 | QStringList list = project->variables()["HEADERS"]; | 169 | QStringList list = project->variables()["HEADERS"]; |
144 | if(!project->isActiveConfig("flat")) | 170 | if(!project->isActiveConfig("flat")) |
145 | list.sort(); | 171 | list.sort(); |
146 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { | 172 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { |
147 | // beginGroupForFile((*it), t); | 173 | // beginGroupForFile((*it), t); |
148 | t << "# Begin Source File\n\nSOURCE=" << (*it) << endl << endl; | 174 | t << "# Begin Source File\n\nSOURCE=" << (*it) << endl << endl; |
149 | if ( project->isActiveConfig("moc") && !findMocDestination((*it)).isEmpty()) { | 175 | QString compilePCH; |
150 | QString base = (*it); | 176 | QStringList customDependencies; |
177 | QString createMOC; | ||
178 | QString buildCmdsR, buildCmdsD; | ||
179 | QString buildCmds = "\nBuildCmds= \\\n"; | ||
180 | // Create unique baseID | ||
181 | QString base = (*it); | ||
182 | { | ||
151 | base.replace(QRegExp("\\..*$"), "").upper(); | 183 | base.replace(QRegExp("\\..*$"), "").upper(); |
152 | base.replace(QRegExp("[^a-zA-Z]"), "_"); | 184 | base.replace(QRegExp("[^a-zA-Z]"), "_"); |
185 | } | ||
186 | if (usePCH && precompH.endsWith(*it)) { | ||
187 | QString basicBuildCmd = QString("\tcl.exe /TP /W3 /FD /c /D \"WIN32\" /Yc /Fp\"%1\" /Fo\"%2\" %3 %4 %5 %6 %7 %8 %9 /D \"") | ||
188 | .arg(precompPch) | ||
189 | .arg(precompObj) | ||
190 | .arg(var("MSVCDSP_INCPATH")) | ||
191 | .arg(var("MSVCDSP_DEFINES")) | ||
192 | .arg(var("MSVCDSP_CXXFLAGS")); | ||
193 | buildCmdsR = basicBuildCmd | ||
194 | .arg("/D \"NDEBUG\"") | ||
195 | .arg(var("QMAKE_CXXFLAGS_RELEASE")) | ||
196 | .arg(var("MSVCDSP_MTDEF")) | ||
197 | .arg(var("MSVCDSP_RELDEFS")); | ||
198 | buildCmdsD = basicBuildCmd | ||
199 | .arg("/D \"_DEBUG\" /Od") | ||
200 | .arg(var("QMAKE_CXXFLAGS_DEBUG")) | ||
201 | .arg(var("MSVCDSP_MTDEFD")) | ||
202 | .arg(var("MSVCDSP_DEBUG_OPT")); | ||
203 | if (project->first("TEMPLATE") == "vcapp") {// App | ||
204 | buildCmdsR += var("MSVCDSP_WINCONDEF"); | ||
205 | buildCmdsD += var("MSVCDSP_WINCONDEF"); | ||
206 | } else if (project->isActiveConfig("dll")) {// Dll | ||
207 | buildCmdsR += "_WINDOWS\" /D \"_USRDLL"; | ||
208 | buildCmdsD += "_WINDOWS\" /D \"_USRDLL"; | ||
209 | } else { // Lib | ||
210 | buildCmdsR += "_LIB"; | ||
211 | buildCmdsD += "_LIB"; | ||
212 | } | ||
213 | buildCmdsR += "\" /Fd\"$(IntDir)\\\\\" " + (*it) + " \\\n"; | ||
214 | buildCmdsD += "\" /Fd\"$(IntDir)\\\\\" " + (*it) + " \\\n"; | ||
215 | |||
216 | compilePCH = precompPch + " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n $(BuildCmds)\n\n"; | ||
153 | 217 | ||
218 | QStringList &tmp = findDependencies(precompH); | ||
219 | if(!tmp.isEmpty()) // Got Deps for PCH | ||
220 | customDependencies += tmp; | ||
221 | } | ||
222 | if (project->isActiveConfig("moc") && !findMocDestination((*it)).isEmpty()) { | ||
154 | QString mocpath = var( "QMAKE_MOC" ); | 223 | QString mocpath = var( "QMAKE_MOC" ); |
155 | mocpath = mocpath.replace( QRegExp( "\\..*$" ), "" ) + " "; | 224 | mocpath = mocpath.replace( QRegExp( "\\..*$" ), "" ) + " "; |
156 | 225 | buildCmds += "\t" + mocpath + (*it) + " -o " + findMocDestination((*it)) + " \\\n"; | |
157 | QString build = "\n\n# Begin Custom Build - Moc'ing " + (*it) + | 226 | createMOC = "\"" + findMocDestination((*it)) +"\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n $(BuildCmds)\n\n"; |
158 | "...\n" "InputPath=.\\" + (*it) + "\n\n" "\"" + findMocDestination((*it)) + | 227 | customDependencies += "\"$(QTDIR)\\bin\\moc.exe\""; |
159 | "\"" " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n" | 228 | } |
160 | "\t" + mocpath + (*it) + " -o " + | 229 | if (!createMOC.isEmpty() || !compilePCH.isEmpty()) { |
161 | findMocDestination((*it)) + "\n\n" "# End Custom Build\n\n"; | 230 | bool doMOC = !createMOC.isEmpty(); |
162 | 231 | bool doPCH = !compilePCH.isEmpty(); | |
163 | t << "USERDEP_" << base << "=\"$(QTDIR)\\bin\\moc.exe\"" << endl << endl; | 232 | QString build = "\n\n# Begin Custom Build - "+ |
164 | 233 | QString(doMOC?"Moc'ing ":"") + | |
165 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Release\"" << build | 234 | QString((doMOC&&doPCH)?" and ":"") + |
166 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Debug\"" | 235 | QString(doPCH?"Creating PCH cpp from ":"") + |
167 | << build << "!ENDIF " << endl << endl; | 236 | (*it) + "...\nInputPath=.\\" + (*it) + "\n\n" + |
237 | buildCmds + "%1\n" + | ||
238 | createMOC + | ||
239 | compilePCH + | ||
240 | "# End Custom Build\n\n"; | ||
241 | |||
242 | t << "USERDEP_" << base << "=" << valGlue(customDependencies, "\"", "\" \"", "\"") << endl << endl; | ||
243 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build.arg(buildCmdsR) | ||
244 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\"" << build.arg(buildCmdsD) | ||
245 | << "!ENDIF " << endl << endl; | ||
168 | } | 246 | } |
169 | t << "# End Source File" << endl; | 247 | t << "# End Source File" << endl; |
170 | } | 248 | } |
171 | // endGroups(t); | 249 | // endGroups(t); |
172 | } else if(variable == "MSVCDSP_FORMSOURCES" || variable == "MSVCDSP_FORMHEADERS") { | 250 | } else if(variable == "MSVCDSP_FORMSOURCES" || variable == "MSVCDSP_FORMHEADERS") { |
173 | if(project->variables()["FORMS"].isEmpty()) | 251 | if(project->variables()["FORMS"].isEmpty()) |
174 | continue; | 252 | continue; |
175 | 253 | ||
176 | QString uiSourcesDir; | 254 | QString uiSourcesDir; |
177 | QString uiHeadersDir; | 255 | QString uiHeadersDir; |
178 | if(!project->variables()["UI_DIR"].isEmpty()) { | 256 | if(!project->variables()["UI_DIR"].isEmpty()) { |
179 | uiSourcesDir = project->first("UI_DIR"); | 257 | uiSourcesDir = project->first("UI_DIR"); |
180 | uiHeadersDir = project->first("UI_DIR"); | 258 | uiHeadersDir = project->first("UI_DIR"); |
181 | } else { | 259 | } else { |
182 | if ( !project->variables()["UI_SOURCES_DIR"].isEmpty() ) | 260 | if ( !project->variables()["UI_SOURCES_DIR"].isEmpty() ) |
183 | uiSourcesDir = project->first("UI_SOURCES_DIR"); | 261 | uiSourcesDir = project->first("UI_SOURCES_DIR"); |
184 | else | 262 | else |
185 | uiSourcesDir = ""; | 263 | uiSourcesDir = ""; |
186 | if ( !project->variables()["UI_HEADERS_DIR"].isEmpty() ) | 264 | if ( !project->variables()["UI_HEADERS_DIR"].isEmpty() ) |
187 | uiHeadersDir = project->first("UI_HEADERS_DIR"); | 265 | uiHeadersDir = project->first("UI_HEADERS_DIR"); |
188 | else | 266 | else |
189 | uiHeadersDir = ""; | 267 | uiHeadersDir = ""; |
190 | } | 268 | } |
191 | 269 | ||
192 | QStringList list = project->variables()["FORMS"]; | 270 | QStringList list = project->variables()["FORMS"]; |
193 | if(!project->isActiveConfig("flat")) | 271 | if(!project->isActiveConfig("flat")) |
194 | list.sort(); | 272 | list.sort(); |
195 | QString ext = variable == "MSVCDSP_FORMSOURCES" ? ".cpp" : ".h"; | 273 | QString ext = variable == "MSVCDSP_FORMSOURCES" ? ".cpp" : ".h"; |
196 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { | 274 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { |
197 | QString base = (*it); | 275 | QString base = (*it); |
198 | int dot = base.findRev("."); | 276 | int dot = base.findRev("."); |
199 | base.replace( dot, base.length() - dot, ext ); | 277 | base.replace( dot, base.length() - dot, ext ); |
200 | QString fname = base; | 278 | QString fname = base; |
201 | 279 | ||
202 | int lbs = fname.findRev( "\\" ); | 280 | int lbs = fname.findRev( "\\" ); |
203 | QString fpath; | 281 | QString fpath; |
204 | if ( lbs != -1 ) | 282 | if ( lbs != -1 ) |
205 | fpath = fname.left( lbs + 1 ); | 283 | fpath = fname.left( lbs + 1 ); |
206 | fname = fname.right( fname.length() - lbs - 1 ); | 284 | fname = fname.right( fname.length() - lbs - 1 ); |
207 | 285 | ||
208 | if ( ext == ".cpp" && !uiSourcesDir.isEmpty() ) | 286 | if ( ext == ".cpp" && !uiSourcesDir.isEmpty() ) |
209 | fname.prepend(uiSourcesDir); | 287 | fname.prepend(uiSourcesDir); |
210 | else if ( ext == ".h" && !uiHeadersDir.isEmpty() ) | 288 | else if ( ext == ".h" && !uiHeadersDir.isEmpty() ) |
211 | fname.prepend(uiHeadersDir); | 289 | fname.prepend(uiHeadersDir); |
212 | else | 290 | else |
213 | fname = base; | 291 | fname = base; |
214 | // beginGroupForFile(fname, t); | 292 | // beginGroupForFile(fname, t); |
215 | t << "# Begin Source File\n\nSOURCE=" << fname | 293 | t << "# Begin Source File\n\nSOURCE=" << fname |
216 | << "\n# End Source File" << endl; | 294 | << "\n# End Source File" << endl; |
217 | } | 295 | } |
218 | // endGroups(t); | 296 | // endGroups(t); |
219 | } else if(variable == "MSVCDSP_TRANSLATIONS" ) { | 297 | } else if(variable == "MSVCDSP_TRANSLATIONS" ) { |
220 | if(project->variables()["TRANSLATIONS"].isEmpty()) | 298 | if(project->variables()["TRANSLATIONS"].isEmpty()) |
221 | continue; | 299 | continue; |
222 | 300 | ||
223 | t << "# Begin Group \"Translations\"\n"; | 301 | t << "# Begin Group \"Translations\"\n"; |
224 | t << "# Prop Default_Filter \"ts\"\n"; | 302 | t << "# Prop Default_Filter \"ts\"\n"; |
225 | 303 | ||
226 | QStringList list = project->variables()["TRANSLATIONS"]; | 304 | QStringList list = project->variables()["TRANSLATIONS"]; |
227 | if(!project->isActiveConfig("flat")) | 305 | if(!project->isActiveConfig("flat")) |
228 | list.sort(); | 306 | list.sort(); |
229 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { | 307 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { |
230 | QString sify = *it; | 308 | QString sify = *it; |
231 | sify.replace('/', '\\' ); | 309 | sify.replace('/', '\\' ); |
232 | QString base = (*it); | 310 | QString base = (*it); |
233 | base.replace(QRegExp("\\..*$"), "").upper(); | 311 | base.replace(QRegExp("\\..*$"), "").upper(); |
234 | base.replace(QRegExp("[^a-zA-Z]"), "_"); | 312 | base.replace(QRegExp("[^a-zA-Z]"), "_"); |
235 | 313 | ||
236 | // beginGroupForFile(sify, t); | 314 | // beginGroupForFile(sify, t); |
237 | t << "# Begin Source File\n\nSOURCE=" << sify << endl; | 315 | t << "# Begin Source File\n\nSOURCE=" << sify << endl; |
238 | t << "\n# End Source File" << endl; | 316 | t << "\n# End Source File" << endl; |
239 | } | 317 | } |
240 | // endGroups(t); | 318 | // endGroups(t); |
241 | t << "\n# End Group\n"; | 319 | t << "\n# End Group\n"; |
242 | } else if (variable == "MSVCDSP_MOCSOURCES" && project->isActiveConfig("moc")) { | 320 | } else if (variable == "MSVCDSP_MOCSOURCES" && project->isActiveConfig("moc")) { |
243 | if ( project->variables()["SRCMOC"].isEmpty()) | 321 | if ( project->variables()["SRCMOC"].isEmpty()) |
244 | continue; | 322 | continue; |
245 | 323 | ||
246 | QString mocpath = var( "QMAKE_MOC" ); | 324 | QString mocpath = var( "QMAKE_MOC" ); |
247 | mocpath = mocpath.replace( QRegExp( "\\..*$" ), "" ) + " "; | 325 | mocpath = mocpath.replace( QRegExp( "\\..*$" ), "" ) + " "; |
248 | 326 | ||
249 | QStringList list = project->variables()["SRCMOC"]; | 327 | QStringList list = project->variables()["SRCMOC"]; |
250 | if(!project->isActiveConfig("flat")) | 328 | if(!project->isActiveConfig("flat")) |
251 | list.sort(); | 329 | list.sort(); |
252 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { | 330 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { |
253 | // beginGroupForFile((*it), t); | 331 | // beginGroupForFile((*it), t); |
254 | t << "# Begin Source File\n\nSOURCE=" << (*it) << endl; | 332 | t << "# Begin Source File\n\nSOURCE=" << (*it) << endl; |
255 | if ( project->isActiveConfig("moc") && (*it).endsWith(Option::moc_ext)) { | 333 | if ( project->isActiveConfig("moc") && (*it).endsWith(Option::cpp_moc_ext)) { |
256 | QString base = (*it); | 334 | QString base = (*it); |
257 | base.replace(QRegExp("\\..*$"), "").upper(); | 335 | base.replace(QRegExp("\\..*$"), "").upper(); |
258 | base.replace(QRegExp("[^a-zA-Z]"), "_"); | 336 | base.replace(QRegExp("[^a-zA-Z]"), "_"); |
259 | 337 | ||
260 | QString build = "\n\n# Begin Custom Build - Moc'ing " + findMocSource((*it)) + | 338 | QString build = "\n\n# Begin Custom Build - Moc'ing " + findMocSource((*it)) + |
261 | "...\n" "InputPath=.\\" + (*it) + "\n\n" "\"" + (*it) + "\"" | 339 | "...\n" "InputPath=.\\" + (*it) + "\n\n" "\"" + (*it) + "\"" |
262 | " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n" | 340 | " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n" |
263 | "\t" + mocpath + findMocSource((*it)) + " -o " + | 341 | "\t" + mocpath + findMocSource((*it)) + " -o " + |
264 | (*it) + "\n\n" "# End Custom Build\n\n"; | 342 | (*it) + "\n\n" "# End Custom Build\n\n"; |
265 | 343 | ||
266 | t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(QTDIR)\\bin\\moc.exe\"" << endl << endl; | 344 | t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(QTDIR)\\bin\\moc.exe\"" << endl << endl; |
267 | 345 | ||
268 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Release\"" << build | 346 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build |
269 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Debug\"" | 347 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\"" |
270 | << build << "!ENDIF " << endl << endl; | 348 | << build << "!ENDIF " << endl << endl; |
271 | } | 349 | } |
272 | t << "# End Source File" << endl; | 350 | t << "# End Source File" << endl; |
273 | } | 351 | } |
274 | // endGroups(t); | 352 | // endGroups(t); |
275 | } else if(variable == "MSVCDSP_PICTURES") { | 353 | } else if(variable == "MSVCDSP_PICTURES") { |
276 | if(project->variables()["IMAGES"].isEmpty()) | 354 | if(project->variables()["IMAGES"].isEmpty()) |
277 | continue; | 355 | continue; |
278 | 356 | ||
279 | t << "# Begin Group \"Images\"\n" | 357 | t << "# Begin Group \"Images\"\n" |
280 | << "# Prop Default_Filter \"png jpeg bmp xpm\"\n"; | 358 | << "# Prop Default_Filter \"png jpeg bmp xpm\"\n"; |
281 | 359 | ||
282 | QStringList list = project->variables()["IMAGES"]; | 360 | QStringList list = project->variables()["IMAGES"]; |
283 | if(!project->isActiveConfig("flat")) | 361 | if(!project->isActiveConfig("flat")) |
284 | list.sort(); | 362 | list.sort(); |
285 | QStringList::Iterator it; | 363 | QStringList::Iterator it; |
286 | 364 | ||
287 | // dump the image list to a file UIC can read. | 365 | // dump the image list to a file UIC can read. |
288 | QFile f( "images.tmp" ); | 366 | QFile f( "images.tmp" ); |
289 | f.open( IO_WriteOnly ); | 367 | f.open( IO_WriteOnly ); |
290 | QTextStream ts( &f ); | 368 | QTextStream ts( &f ); |
291 | for( it = list.begin(); it != list.end(); ++it ) | 369 | for( it = list.begin(); it != list.end(); ++it ) |
292 | ts << " " << *it; | 370 | ts << " " << *it; |
293 | f.close(); | 371 | f.close(); |
294 | 372 | ||
295 | // create an output step for images not more than once | 373 | // create an output step for images not more than once |
296 | bool imagesBuildDone = FALSE; | 374 | bool imagesBuildDone = FALSE; |
297 | for( it = list.begin(); it != list.end(); ++it ) { | 375 | for( it = list.begin(); it != list.end(); ++it ) { |
298 | // beginGroupForFile((*it), t); | 376 | // beginGroupForFile((*it), t); |
299 | t << "# Begin Source File\n\nSOURCE=" << (*it) << endl; | 377 | t << "# Begin Source File\n\nSOURCE=" << (*it) << endl; |
300 | 378 | ||
301 | QString base = (*it); | 379 | QString base = (*it); |
302 | QString uicpath = var("QMAKE_UIC"); | 380 | QString uicpath = var("QMAKE_UIC"); |
303 | uicpath = uicpath.replace(QRegExp("\\..*$"), "") + " "; | 381 | uicpath = uicpath.replace(QRegExp("\\..*$"), "") + " "; |
304 | 382 | ||
305 | if ( !imagesBuildDone ) { | 383 | if ( !imagesBuildDone ) { |
306 | imagesBuildDone = TRUE; | 384 | imagesBuildDone = TRUE; |
307 | QString build = "\n\n# Begin Custom Build - Creating image collection...\n" | 385 | QString build = "\n\n# Begin Custom Build - Creating image collection...\n" |
308 | "InputPath=.\\" + base + "\n\n"; | 386 | "InputPath=.\\" + base + "\n\n"; |
309 | 387 | ||
310 | build += "\"" + project->first("QMAKE_IMAGE_COLLECTION") + "\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n"; | 388 | build += "\"" + project->first("QMAKE_IMAGE_COLLECTION") + "\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n"; |
311 | build += "\t" + uicpath + "-embed " + project->first("QMAKE_ORIG_TARGET") + " -f images.tmp -o " | 389 | build += "\t" + uicpath + "-embed " + project->first("QMAKE_ORIG_TARGET") + " -f images.tmp -o " |
312 | + project->first("QMAKE_IMAGE_COLLECTION") + "\n\n"; | 390 | + project->first("QMAKE_IMAGE_COLLECTION") + "\n\n"; |
313 | build.append("# End Custom Build\n\n"); | 391 | build.append("# End Custom Build\n\n"); |
314 | 392 | ||
315 | t << "USERDEP_" << base << "="; | 393 | t << "USERDEP_" << base << "="; |
316 | QStringList::Iterator it2 = list.begin(); | 394 | QStringList::Iterator it2 = list.begin(); |
317 | while ( it2 != list.end() ) { | 395 | while ( it2 != list.end() ) { |
318 | t << "\"" << (*it2) << "\""; | 396 | t << "\"" << (*it2) << "\""; |
319 | it2++; | 397 | it2++; |
320 | if ( it2 != list.end() ) | 398 | if ( it2 != list.end() ) |
321 | t << "\\\n"; | 399 | t << "\\\n"; |
322 | } | 400 | } |
323 | t << endl << endl; | 401 | t << endl << endl; |
324 | 402 | ||
325 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Release\"" << build | 403 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Release\"" << build |
326 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Debug\"" << build | 404 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Debug\"" << build |
327 | << "!ENDIF \n\n" << endl; | 405 | << "!ENDIF \n\n" << endl; |
328 | } | 406 | } |
329 | 407 | ||
330 | t << "# End Source File" << endl; | 408 | t << "# End Source File" << endl; |
331 | } | 409 | } |
332 | // endGroups(t); | 410 | // endGroups(t); |
333 | t << "\n# End Group\n"; | 411 | t << "\n# End Group\n"; |
334 | } else if(variable == "MSVCDSP_FORMS") { | 412 | } else if(variable == "MSVCDSP_FORMS") { |
335 | if(project->variables()["FORMS"].isEmpty()) | 413 | if(project->variables()["FORMS"].isEmpty()) |
336 | continue; | 414 | continue; |
337 | 415 | ||
338 | t << "# Begin Group \"Forms\"\n" | 416 | t << "# Begin Group \"Forms\"\n" |
339 | << "# Prop Default_Filter \"ui\"\n"; | 417 | << "# Prop Default_Filter \"ui\"\n"; |
340 | 418 | ||
341 | QString uicpath = var("QMAKE_UIC"); | 419 | QString uicpath = var("QMAKE_UIC"); |
342 | uicpath = uicpath.replace(QRegExp("\\..*$"), "") + " "; | 420 | uicpath = uicpath.replace(QRegExp("\\..*$"), "") + " "; |
343 | QString mocpath = var( "QMAKE_MOC" ); | 421 | QString mocpath = var( "QMAKE_MOC" ); |
344 | mocpath = mocpath.replace( QRegExp( "\\..*$" ), "" ) + " "; | 422 | mocpath = mocpath.replace( QRegExp( "\\..*$" ), "" ) + " "; |
345 | 423 | ||
346 | QStringList list = project->variables()["FORMS"]; | 424 | QStringList list = project->variables()["FORMS"]; |
347 | if(!project->isActiveConfig("flat")) | 425 | if(!project->isActiveConfig("flat")) |
348 | list.sort(); | 426 | list.sort(); |
349 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { | 427 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { |
350 | QString base = (*it); | 428 | QString base = (*it); |
351 | // beginGroupForFile(base, t); | 429 | // beginGroupForFile(base, t); |
352 | t << "# Begin Source File\n\nSOURCE=" << base << endl; | 430 | t << "# Begin Source File\n\nSOURCE=" << base << endl; |
353 | 431 | ||
354 | QString fname = base; | 432 | QString fname = base; |
355 | fname.replace(".ui", ""); | 433 | fname.replace(".ui", ""); |
356 | int lbs = fname.findRev( "\\" ); | 434 | int lbs = fname.findRev( "\\" ); |
357 | QString fpath; | 435 | QString fpath; |
358 | if ( lbs != -1 ) | 436 | if ( lbs != -1 ) |
359 | fpath = fname.left( lbs + 1 ); | 437 | fpath = fname.left( lbs + 1 ); |
360 | fname = fname.right( fname.length() - lbs - 1 ); | 438 | fname = fname.right( fname.length() - lbs - 1 ); |
361 | 439 | ||
362 | QString mocFile; | 440 | QString mocFile; |
363 | if(!project->variables()["MOC_DIR"].isEmpty()) | 441 | if(!project->variables()["MOC_DIR"].isEmpty()) |
364 | mocFile = project->first("MOC_DIR"); | 442 | mocFile = project->first("MOC_DIR"); |
365 | else | 443 | else |
366 | mocFile = fpath; | 444 | mocFile = fpath; |
367 | 445 | ||
368 | QString uiSourcesDir; | 446 | QString uiSourcesDir; |
369 | QString uiHeadersDir; | 447 | QString uiHeadersDir; |
370 | if(!project->variables()["UI_DIR"].isEmpty()) { | 448 | if(!project->variables()["UI_DIR"].isEmpty()) { |
371 | uiSourcesDir = project->first("UI_DIR"); | 449 | uiSourcesDir = project->first("UI_DIR"); |
372 | uiHeadersDir = project->first("UI_DIR"); | 450 | uiHeadersDir = project->first("UI_DIR"); |
373 | } else { | 451 | } else { |
374 | if ( !project->variables()["UI_SOURCES_DIR"].isEmpty() ) | 452 | if ( !project->variables()["UI_SOURCES_DIR"].isEmpty() ) |
375 | uiSourcesDir = project->first("UI_SOURCES_DIR"); | 453 | uiSourcesDir = project->first("UI_SOURCES_DIR"); |
376 | else | 454 | else |
377 | uiSourcesDir = fpath; | 455 | uiSourcesDir = fpath; |
378 | if ( !project->variables()["UI_HEADERS_DIR"].isEmpty() ) | 456 | if ( !project->variables()["UI_HEADERS_DIR"].isEmpty() ) |
379 | uiHeadersDir = project->first("UI_HEADERS_DIR"); | 457 | uiHeadersDir = project->first("UI_HEADERS_DIR"); |
380 | else | 458 | else |
381 | uiHeadersDir = fpath; | 459 | uiHeadersDir = fpath; |
382 | } | 460 | } |
383 | 461 | ||
384 | t << "USERDEP_" << base << "=\"$(QTDIR)\\bin\\moc.exe\" \"$(QTDIR)\\bin\\uic.exe\"" << endl << endl; | 462 | t << "USERDEP_" << base << "=\"$(QTDIR)\\bin\\moc.exe\" \"$(QTDIR)\\bin\\uic.exe\"" << endl << endl; |
385 | 463 | ||
386 | QString build = "\n\n# Begin Custom Build - Uic'ing " + base + "...\n" | 464 | QString build = "\n\n# Begin Custom Build - Uic'ing " + base + "...\n" |
387 | "InputPath=.\\" + base + "\n\n" "BuildCmds= \\\n\t" + uicpath + base + | 465 | "InputPath=.\\" + base + "\n\n" "BuildCmds= \\\n\t" + uicpath + base + |
388 | " -o " + uiHeadersDir + fname + ".h \\\n" "\t" + uicpath + base + | 466 | " -o " + uiHeadersDir + fname + ".h \\\n" "\t" + uicpath + base + |
389 | " -i " + fname + ".h -o " + uiSourcesDir + fname + ".cpp \\\n" | 467 | " -i " + fname + ".h -o " + uiSourcesDir + fname + ".cpp \\\n" |
390 | "\t" + mocpath + uiHeadersDir + fname + ".h -o " + mocFile + "moc_" + fname + ".cpp \\\n"; | 468 | "\t" + mocpath + " " + uiHeadersDir + |
469 | fname + ".h -o " + mocFile + Option::h_moc_mod + fname + Option::h_moc_ext + " \\\n"; | ||
391 | 470 | ||
392 | build.append("\n\"" + uiHeadersDir + fname + ".h\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n" | 471 | build.append("\n\"" + uiHeadersDir + fname + ".h\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n" |
393 | "\t$(BuildCmds)\n\n" | 472 | "\t$(BuildCmds)\n\n" |
394 | "\"" + uiSourcesDir + fname + ".cpp\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n" | 473 | "\"" + uiSourcesDir + fname + ".cpp\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n" |
395 | "\t$(BuildCmds)\n\n" | 474 | "\t$(BuildCmds)\n\n" |
396 | "\"" + mocFile + "moc_" + fname + ".cpp\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n" | 475 | "\"" + mocFile + Option::h_moc_mod + fname + Option::h_moc_ext + "\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n" |
397 | "\t$(BuildCmds)\n\n"); | 476 | "\t$(BuildCmds)\n\n"); |
398 | 477 | ||
399 | build.append("# End Custom Build\n\n"); | 478 | build.append("# End Custom Build\n\n"); |
400 | 479 | ||
401 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Release\"" << build | 480 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build |
402 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Debug\"" << build | 481 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\"" << build |
403 | << "!ENDIF \n\n" << "# End Source File" << endl; | 482 | << "!ENDIF \n\n" << "# End Source File" << endl; |
404 | } | 483 | } |
405 | // endGroups(t); | 484 | // endGroups(t); |
406 | t << "\n# End Group\n"; | 485 | t << "\n# End Group\n"; |
407 | } else if(variable == "MSVCDSP_LEXSOURCES") { | 486 | } else if(variable == "MSVCDSP_LEXSOURCES") { |
408 | if(project->variables()["LEXSOURCES"].isEmpty()) | 487 | if(project->variables()["LEXSOURCES"].isEmpty()) |
409 | continue; | 488 | continue; |
410 | 489 | ||
411 | t << "# Begin Group \"Lexables\"\n" | 490 | t << "# Begin Group \"Lexables\"\n" |
412 | << "# Prop Default_Filter \"l\"\n"; | 491 | << "# Prop Default_Filter \"l\"\n"; |
413 | 492 | ||
414 | QString lexpath = var("QMAKE_LEX") + varGlue("QMAKE_LEXFLAGS", " ", " ", "") + " "; | 493 | QString lexpath = var("QMAKE_LEX") + varGlue("QMAKE_LEXFLAGS", " ", " ", "") + " "; |
415 | 494 | ||
416 | QStringList list = project->variables()["LEXSOURCES"]; | 495 | QStringList list = project->variables()["LEXSOURCES"]; |
417 | if(!project->isActiveConfig("flat")) | 496 | if(!project->isActiveConfig("flat")) |
418 | list.sort(); | 497 | list.sort(); |
419 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { | 498 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { |
420 | QString fname = (*it); | 499 | QString fname = (*it); |
421 | // beginGroupForFile(fname, t); | 500 | // beginGroupForFile(fname, t); |
422 | t << "# Begin Source File\n\nSOURCE=" << fname << endl; | 501 | t << "# Begin Source File\n\nSOURCE=" << fname << endl; |
423 | fname.replace(".l", Option::lex_mod + Option::cpp_ext.first()); | 502 | fname.replace(".l", Option::lex_mod + Option::cpp_ext.first()); |
424 | 503 | ||
425 | QString build = "\n\n# Begin Custom Build - Lex'ing " + (*it) + "...\n" | 504 | QString build = "\n\n# Begin Custom Build - Lex'ing " + (*it) + "...\n" |
426 | "InputPath=.\\" + (*it) + "\n\n" | 505 | "InputPath=.\\" + (*it) + "\n\n" |
427 | "\"" + fname + "\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n" | 506 | "\"" + fname + "\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n" |
428 | "\t" + lexpath + (*it) + "\\\n" | 507 | "\t" + lexpath + (*it) + "\\\n" |
429 | "\tdel " + fname + "\\\n" | 508 | "\tdel " + fname + "\\\n" |
430 | "\tcopy lex.yy.c " + fname + "\n\n" + | 509 | "\tcopy lex.yy.c " + fname + "\n\n" + |
431 | "# End Custom Build\n\n"; | 510 | "# End Custom Build\n\n"; |
432 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Release\"" << build | 511 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build |
433 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Debug\"" << build | 512 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\"" << build |
434 | << "!ENDIF \n\n" << build | 513 | << "!ENDIF \n\n" << build |
435 | 514 | ||
436 | << "# End Source File" << endl; | 515 | << "# End Source File" << endl; |
437 | } | 516 | } |
438 | // endGroups(t); | 517 | // endGroups(t); |
439 | t << "\n# End Group\n"; | 518 | t << "\n# End Group\n"; |
440 | } else if(variable == "MSVCDSP_YACCSOURCES") { | 519 | } else if(variable == "MSVCDSP_YACCSOURCES") { |
441 | if(project->variables()["YACCSOURCES"].isEmpty()) | 520 | if(project->variables()["YACCSOURCES"].isEmpty()) |
442 | continue; | 521 | continue; |
443 | 522 | ||
444 | t << "# Begin Group \"Yaccables\"\n" | 523 | t << "# Begin Group \"Yaccables\"\n" |
445 | << "# Prop Default_Filter \"y\"\n"; | 524 | << "# Prop Default_Filter \"y\"\n"; |
446 | 525 | ||
447 | QString yaccpath = var("QMAKE_YACC") + varGlue("QMAKE_YACCFLAGS", " ", " ", "") + " "; | 526 | QString yaccpath = var("QMAKE_YACC") + varGlue("QMAKE_YACCFLAGS", " ", " ", "") + " "; |
448 | 527 | ||
449 | QStringList list = project->variables()["YACCSOURCES"]; | 528 | QStringList list = project->variables()["YACCSOURCES"]; |
450 | if(!project->isActiveConfig("flat")) | 529 | if(!project->isActiveConfig("flat")) |
451 | list.sort(); | 530 | list.sort(); |
452 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { | 531 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { |
453 | QString fname = (*it); | 532 | QString fname = (*it); |
454 | // beginGroupForFile(fname, t); | 533 | // beginGroupForFile(fname, t); |
455 | t << "# Begin Source File\n\nSOURCE=" << fname << endl; | 534 | t << "# Begin Source File\n\nSOURCE=" << fname << endl; |
456 | fname.replace(".y", Option::yacc_mod); | 535 | fname.replace(".y", Option::yacc_mod); |
457 | 536 | ||
458 | QString build = "\n\n# Begin Custom Build - Yacc'ing " + (*it) + "...\n" | 537 | QString build = "\n\n# Begin Custom Build - Yacc'ing " + (*it) + "...\n" |
459 | "InputPath=.\\" + (*it) + "\n\n" | 538 | "InputPath=.\\" + (*it) + "\n\n" |
460 | "\"" + fname + Option::cpp_ext.first() + "\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n" | 539 | "\"" + fname + Option::cpp_ext.first() + "\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"" "\n" |
461 | "\t" + yaccpath + (*it) + "\\\n" | 540 | "\t" + yaccpath + (*it) + "\\\n" |
462 | "\tdel " + fname + Option::h_ext.first() + "\\\n" | 541 | "\tdel " + fname + Option::h_ext.first() + "\\\n" |
463 | "\tmove y.tab.h " + fname + Option::h_ext.first() + "\n\n" + | 542 | "\tmove y.tab.h " + fname + Option::h_ext.first() + "\n\n" + |
464 | "\tdel " + fname + Option::cpp_ext.first() + "\\\n" | 543 | "\tdel " + fname + Option::cpp_ext.first() + "\\\n" |
465 | "\tmove y.tab.c " + fname + Option::cpp_ext.first() + "\n\n" + | 544 | "\tmove y.tab.c " + fname + Option::cpp_ext.first() + "\n\n" + |
466 | "# End Custom Build\n\n"; | 545 | "# End Custom Build\n\n"; |
467 | 546 | ||
468 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Release\"" << build | 547 | t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build |
469 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - Win32 Debug\"" << build | 548 | << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\"" << build |
470 | << "!ENDIF \n\n" | 549 | << "!ENDIF \n\n" |
471 | << "# End Source File" << endl; | 550 | << "# End Source File" << endl; |
472 | } | 551 | } |
473 | // endGroups(t); | 552 | // endGroups(t); |
474 | t << "\n# End Group\n"; | 553 | t << "\n# End Group\n"; |
475 | } else if( variable == "MSVCDSP_CONFIGMODE" ) { | 554 | } else if( variable == "MSVCDSP_CONFIGMODE" ) { |
476 | if( project->isActiveConfig( "debug" ) ) | 555 | if( project->isActiveConfig( "debug" ) ) |
477 | t << "Debug"; | 556 | t << "Debug"; |
478 | else | 557 | else |
479 | t << "Release"; | 558 | t << "Release"; |
480 | } else if( variable == "MSVCDSP_IDLSOURCES" ) { | 559 | } else if( variable == "MSVCDSP_IDLSOURCES" ) { |
481 | QStringList list = project->variables()["MSVCDSP_IDLSOURCES"]; | 560 | QStringList list = project->variables()["MSVCDSP_IDLSOURCES"]; |
482 | if(!project->isActiveConfig("flat")) | 561 | if(!project->isActiveConfig("flat")) |
483 | list.sort(); | 562 | list.sort(); |
484 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { | 563 | for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { |
485 | t << "# Begin Source File" << endl << endl; | 564 | t << "# Begin Source File" << endl << endl; |
486 | t << "SOURCE=" << (*it) << endl; | 565 | t << "SOURCE=" << (*it) << endl; |
487 | t << "# PROP Exclude_From_Build 1" << endl; | 566 | t << "# PROP Exclude_From_Build 1" << endl; |
488 | t << "# End Source File" << endl << endl; | 567 | t << "# End Source File" << endl << endl; |
489 | } | 568 | } |
490 | } | 569 | } |
491 | else | 570 | else |
492 | t << var(variable); | 571 | t << var(variable); |
493 | } | 572 | } |
494 | t << line << endl; | 573 | t << line << endl; |
495 | } | 574 | } |
496 | t << endl; | 575 | t << endl; |
497 | file.close(); | 576 | file.close(); |
498 | return TRUE; | 577 | return TRUE; |
499 | } | 578 | } |
500 | 579 | ||
501 | 580 | ||
502 | 581 | ||
503 | void | 582 | void |
504 | DspMakefileGenerator::init() | 583 | DspMakefileGenerator::init() |
505 | { | 584 | { |
506 | if(init_flag) | 585 | if(init_flag) |
507 | return; | 586 | return; |
508 | QStringList::Iterator it; | 587 | QStringList::Iterator it; |
509 | init_flag = TRUE; | 588 | init_flag = TRUE; |
510 | 589 | ||
511 | const bool thread = project->isActiveConfig("thread"); | 590 | const bool thread = project->isActiveConfig("thread"); |
512 | 591 | ||
513 | if ( project->isActiveConfig("stl") ) { | 592 | if ( project->isActiveConfig("stl") ) { |
514 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"]; | 593 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"]; |
515 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"]; | 594 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"]; |
516 | } else { | 595 | } else { |
517 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"]; | 596 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"]; |
518 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"]; | 597 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"]; |
519 | } | 598 | } |
520 | if ( project->isActiveConfig("exceptions") ) { | 599 | if ( project->isActiveConfig("exceptions") ) { |
521 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"]; | 600 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"]; |
522 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"]; | 601 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"]; |
523 | } else { | 602 | } else { |
524 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"]; | 603 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"]; |
525 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"]; | 604 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"]; |
526 | } | 605 | } |
527 | if ( project->isActiveConfig("rtti") ) { | 606 | if ( project->isActiveConfig("rtti") ) { |
528 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"]; | 607 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"]; |
529 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"]; | 608 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"]; |
530 | } else { | 609 | } else { |
531 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"]; | 610 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"]; |
532 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"]; | 611 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"]; |
533 | } | 612 | } |
534 | 613 | ||
614 | |||
535 | /* this should probably not be here, but I'm using it to wrap the .t files */ | 615 | /* this should probably not be here, but I'm using it to wrap the .t files */ |
536 | if(project->first("TEMPLATE") == "vcapp" ) | 616 | if(project->first("TEMPLATE") == "vcapp" ) |
537 | project->variables()["QMAKE_APP_FLAG"].append("1"); | 617 | project->variables()["QMAKE_APP_FLAG"].append("1"); |
538 | else if(project->first("TEMPLATE") == "vclib") | 618 | else if(project->first("TEMPLATE") == "vclib") |
539 | project->variables()["QMAKE_LIB_FLAG"].append("1"); | 619 | project->variables()["QMAKE_LIB_FLAG"].append("1"); |
540 | if ( project->variables()["QMAKESPEC"].isEmpty() ) | 620 | if ( project->variables()["QMAKESPEC"].isEmpty() ) |
541 | project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); | 621 | project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); |
542 | 622 | ||
543 | bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); | 623 | bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); |
544 | project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; | 624 | project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; |
545 | 625 | ||
546 | QStringList &configs = project->variables()["CONFIG"]; | 626 | QStringList &configs = project->variables()["CONFIG"]; |
547 | if (project->isActiveConfig("shared")) | 627 | if (project->isActiveConfig("shared")) |
548 | project->variables()["DEFINES"].append("QT_DLL"); | 628 | project->variables()["DEFINES"].append("QT_DLL"); |
549 | if (project->isActiveConfig("qt_dll")) | 629 | if (project->isActiveConfig("qt_dll")) |
550 | if(configs.findIndex("qt") == -1) configs.append("qt"); | 630 | if(configs.findIndex("qt") == -1) configs.append("qt"); |
631 | if ( project->isActiveConfig("qtopia") ) { | ||
632 | if(configs.findIndex("qtopialib") == -1) | ||
633 | configs.append("qtopialib"); | ||
634 | if(configs.findIndex("qtopiainc") == -1) | ||
635 | configs.append("qtopiainc"); | ||
636 | } | ||
551 | if ( project->isActiveConfig("qt") ) { | 637 | if ( project->isActiveConfig("qt") ) { |
552 | if ( project->isActiveConfig( "plugin" ) ) { | 638 | if ( project->isActiveConfig( "plugin" ) ) { |
553 | project->variables()["CONFIG"].append("dll"); | 639 | project->variables()["CONFIG"].append("dll"); |
554 | project->variables()["DEFINES"].append("QT_PLUGIN"); | 640 | project->variables()["DEFINES"].append("QT_PLUGIN"); |
555 | } | 641 | } |
556 | if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) && | 642 | if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) && |
557 | ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 || | 643 | ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 || |
558 | project->variables()["DEFINES"].findIndex("QT_DLL") != -1) || | 644 | project->variables()["DEFINES"].findIndex("QT_DLL") != -1) || |
559 | (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) { | 645 | (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) { |
560 | project->variables()["QMAKE_QT_DLL"].append("1"); | 646 | project->variables()["QMAKE_QT_DLL"].append("1"); |
561 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) | 647 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) |
562 | project->variables()["CONFIG"].append("dll"); | 648 | project->variables()["CONFIG"].append("dll"); |
563 | } | 649 | } |
564 | } | 650 | } |
565 | if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { | 651 | if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { |
566 | project->variables()["CONFIG"].remove("staticlib"); | 652 | project->variables()["CONFIG"].remove("staticlib"); |
567 | project->variables()["QMAKE_APP_OR_DLL"].append("1"); | 653 | project->variables()["QMAKE_APP_OR_DLL"].append("1"); |
568 | } else { | 654 | } else { |
569 | project->variables()["CONFIG"].append("staticlib"); | 655 | project->variables()["CONFIG"].append("staticlib"); |
570 | } | 656 | } |
571 | 657 | ||
572 | if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") ) { | 658 | if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") ) { |
573 | project->variables()["CONFIG"].append("windows"); | 659 | project->variables()["CONFIG"].append("windows"); |
574 | } | 660 | } |
575 | if ( !project->variables()["VERSION"].isEmpty() ) { | 661 | if ( !project->variables()["VERSION"].isEmpty() ) { |
576 | QString version = project->variables()["VERSION"][0]; | 662 | QString version = project->variables()["VERSION"][0]; |
577 | int firstDot = version.find( "." ); | 663 | int firstDot = version.find( "." ); |
578 | QString major = version.left( firstDot ); | 664 | QString major = version.left( firstDot ); |
579 | QString minor = version.right( version.length() - firstDot - 1 ); | 665 | QString minor = version.right( version.length() - firstDot - 1 ); |
580 | minor.replace( ".", "" ); | 666 | minor.replace( ".", "" ); |
581 | project->variables()["MSVCDSP_VERSION"].append( "/VERSION:" + major + "." + minor ); | 667 | project->variables()["MSVCDSP_VERSION"].append( "/VERSION:" + major + "." + minor ); |
582 | } | 668 | } |
583 | 669 | ||
670 | if ( project->isActiveConfig("qtopiainc") ) | ||
671 | project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"]; | ||
672 | if ( project->isActiveConfig("qtopialib") ) { | ||
673 | if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA")) | ||
674 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QTOPIA"]; | ||
675 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"]; | ||
676 | } | ||
677 | |||
584 | if ( project->isActiveConfig("qt") ) { | 678 | if ( project->isActiveConfig("qt") ) { |
585 | project->variables()["CONFIG"].append("moc"); | 679 | project->variables()["CONFIG"].append("moc"); |
586 | project->variables()["INCLUDEPATH"] +=project->variables()["QMAKE_INCDIR_QT"]; | 680 | project->variables()["INCLUDEPATH"] +=project->variables()["QMAKE_INCDIR_QT"]; |
587 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"]; | 681 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"]; |
588 | 682 | ||
589 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { | 683 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { |
590 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { | 684 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { |
591 | project->variables()["DEFINES"].append("QT_MAKEDLL"); | 685 | project->variables()["DEFINES"].append("QT_MAKEDLL"); |
592 | project->variables()["QMAKE_LFLAGS"].append("/base:\"0x39D00000\""); | 686 | project->variables()["QMAKE_LFLAGS"].append("/base:\"0x39D00000\""); |
593 | } | 687 | } |
594 | } else { | 688 | } else { |
595 | if( thread ) | 689 | if( thread ) |
596 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; | 690 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; |
597 | else | 691 | else |
598 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; | 692 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; |
599 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { | 693 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { |
600 | int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt"); | 694 | int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt"); |
601 | if ( hver == -1 ) | 695 | if ( hver == -1 ) |
602 | hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt"); | 696 | hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt"); |
603 | if(hver != -1) { | 697 | if(hver != -1) { |
604 | QString ver; | 698 | QString ver; |
605 | ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (thread ? "-mt" : ""), hver); | 699 | ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (thread ? "-mt" : ""), hver); |
606 | QStringList &libs = project->variables()["QMAKE_LIBS"]; | 700 | QStringList &libs = project->variables()["QMAKE_LIBS"]; |
607 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) | 701 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) |
608 | (*libit).replace(QRegExp("qt(-mt)?\\.lib"), ver); | 702 | (*libit).replace(QRegExp("qt(-mt)?\\.lib"), ver); |
609 | } | 703 | } |
610 | } | 704 | } |
611 | if ( project->isActiveConfig( "activeqt" ) ) { | 705 | if ( project->isActiveConfig( "activeqt" ) ) { |
612 | project->variables().remove("QMAKE_LIBS_QT_ENTRY"); | 706 | project->variables().remove("QMAKE_LIBS_QT_ENTRY"); |
613 | project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib"; | 707 | project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib"; |
614 | if ( project->isActiveConfig( "dll" ) ) | 708 | if ( project->isActiveConfig( "dll" ) ) |
615 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; | 709 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; |
616 | } | 710 | } |
617 | if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { | 711 | if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { |
618 | project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"]; | 712 | project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"]; |
619 | } | 713 | } |
620 | } | 714 | } |
621 | } | 715 | } |
622 | 716 | ||
623 | if ( project->isActiveConfig("debug") ) { | 717 | if ( project->isActiveConfig("debug") ) { |
624 | if ( !project->first("OBJECTS_DIR").isEmpty() ) | 718 | if ( !project->first("OBJECTS_DIR").isEmpty() ) |
625 | project->variables()["MSVCDSP_OBJECTSDIRDEB"] = project->first("OBJECTS_DIR"); | 719 | project->variables()["MSVCDSP_OBJECTSDIRDEB"] = project->first("OBJECTS_DIR"); |
626 | else | 720 | else |
627 | project->variables()["MSVCDSP_OBJECTSDIRDEB"] = "Debug"; | 721 | project->variables()["MSVCDSP_OBJECTSDIRDEB"] = "Debug"; |
628 | project->variables()["MSVCDSP_OBJECTSDIRREL"] = "Release"; | 722 | project->variables()["MSVCDSP_OBJECTSDIRREL"] = "Release"; |
629 | if ( !project->first("DESTDIR").isEmpty() ) | 723 | if ( !project->first("DESTDIR").isEmpty() ) |
630 | project->variables()["MSVCDSP_TARGETDIRDEB"] = project->first("DESTDIR"); | 724 | project->variables()["MSVCDSP_TARGETDIRDEB"] = project->first("DESTDIR"); |
631 | else | 725 | else |
632 | project->variables()["MSVCDSP_TARGETDIRDEB"] = "Debug"; | 726 | project->variables()["MSVCDSP_TARGETDIRDEB"] = "Debug"; |
633 | project->variables()["MSVCDSP_TARGETDIRREL"] = "Release"; | 727 | project->variables()["MSVCDSP_TARGETDIRREL"] = "Release"; |
634 | } else { | 728 | } else { |
635 | if ( !project->first("OBJECTS_DIR").isEmpty() ) | 729 | if ( !project->first("OBJECTS_DIR").isEmpty() ) |
636 | project->variables()["MSVCDSP_OBJECTSDIRREL"] = project->first("OBJECTS_DIR"); | 730 | project->variables()["MSVCDSP_OBJECTSDIRREL"] = project->first("OBJECTS_DIR"); |
731 | else | ||
732 | project->variables()["MSVCDSP_OBJECTSDIRREL"] = "Release"; | ||
637 | project->variables()["MSVCDSP_OBJECTSDIRDEB"] = "Debug"; | 733 | project->variables()["MSVCDSP_OBJECTSDIRDEB"] = "Debug"; |
638 | if ( !project->first("DESTDIR").isEmpty() ) | 734 | if ( !project->first("DESTDIR").isEmpty() ) |
639 | project->variables()["MSVCDSP_TARGETDIRREL"] = project->first("DESTDIR"); | 735 | project->variables()["MSVCDSP_TARGETDIRREL"] = project->first("DESTDIR"); |
640 | else | 736 | else |
641 | project->variables()["MSVCDSP_TARGETDIRREL"] = "Release"; | 737 | project->variables()["MSVCDSP_TARGETDIRREL"] = "Release"; |
642 | project->variables()["MSVCDSP_TARGETDIRDEB"] = "Debug"; | 738 | project->variables()["MSVCDSP_TARGETDIRDEB"] = "Debug"; |
643 | } | 739 | } |
644 | 740 | ||
645 | if ( project->isActiveConfig("opengl") ) { | 741 | if ( project->isActiveConfig("opengl") ) { |
646 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"]; | 742 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"]; |
647 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"]; | 743 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"]; |
648 | } | 744 | } |
649 | if ( thread ) { | 745 | if ( thread ) { |
650 | if(project->isActiveConfig("qt")) | 746 | if(project->isActiveConfig("qt")) |
651 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" ); | 747 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" ); |
652 | if ( project->isActiveConfig("dll") || project->first("TARGET") == "qtmain" | 748 | if ( project->isActiveConfig("dll") || project->first("TARGET") == "qtmain" |
653 | || !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { | 749 | || !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { |
654 | project->variables()["MSVCDSP_MTDEFD"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"]; | 750 | project->variables()["MSVCDSP_MTDEFD"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"]; |
655 | project->variables()["MSVCDSP_MTDEF"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"]; | 751 | project->variables()["MSVCDSP_MTDEF"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"]; |
656 | } else { | 752 | } else { |
657 | // YES we want to use the DLL even in a static build | 753 | // YES we want to use the DLL even in a static build |
658 | project->variables()["MSVCDSP_MTDEFD"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"]; | 754 | project->variables()["MSVCDSP_MTDEFD"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"]; |
659 | project->variables()["MSVCDSP_MTDEF"] += project->variables()["QMAKE_CXXFLAGS_MT"]; | 755 | project->variables()["MSVCDSP_MTDEF"] += project->variables()["QMAKE_CXXFLAGS_MT"]; |
660 | } | 756 | } |
661 | if ( !project->variables()["DEFINES"].contains("QT_DLL") && is_qt | 757 | if ( !project->variables()["DEFINES"].contains("QT_DLL") && is_qt |
662 | && project->first("TARGET") != "qtmain" ) | 758 | && project->first("TARGET") != "qtmain" ) |
663 | project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:\"libc\""); | 759 | project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:\"libc\""); |
664 | } | 760 | } |
665 | 761 | ||
666 | if(project->isActiveConfig("qt")) { | 762 | if(project->isActiveConfig("qt")) { |
667 | if ( project->isActiveConfig("accessibility" ) ) | 763 | if ( project->isActiveConfig("accessibility" ) ) |
668 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); | 764 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); |
669 | if ( project->isActiveConfig("tablet") ) | 765 | if ( project->isActiveConfig("tablet") ) |
670 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT"); | 766 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT"); |
671 | } | 767 | } |
672 | if ( project->isActiveConfig("dll") ) { | 768 | if ( project->isActiveConfig("dll") ) { |
769 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE_DLL"]; | ||
770 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE_DLL"]; | ||
771 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"]; | ||
772 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"]; | ||
673 | if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { | 773 | if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { |
674 | QString ver_xyz(project->first("VERSION")); | 774 | QString ver_xyz(project->first("VERSION")); |
675 | ver_xyz.replace(".", ""); | 775 | ver_xyz.replace(".", ""); |
676 | project->variables()["TARGET_EXT"].append(ver_xyz + ".dll"); | 776 | project->variables()["TARGET_EXT"].append(ver_xyz + ".dll"); |
677 | } else { | 777 | } else { |
678 | project->variables()["TARGET_EXT"].append(".dll"); | 778 | project->variables()["TARGET_EXT"].append(".dll"); |
679 | } | 779 | } |
680 | } else { | 780 | } else { |
781 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"]; | ||
782 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE"]; | ||
783 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE"]; | ||
784 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS"]; | ||
681 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) | 785 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) |
682 | project->variables()["TARGET_EXT"].append(".exe"); | 786 | project->variables()["TARGET_EXT"].append(".exe"); |
683 | else | 787 | else |
684 | project->variables()["TARGET_EXT"].append(".lib"); | 788 | project->variables()["TARGET_EXT"].append(".lib"); |
685 | } | 789 | } |
686 | 790 | ||
791 | if ( project->isActiveConfig("windows") ) { | ||
792 | if ( project->isActiveConfig("console") ) { | ||
793 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; | ||
794 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; | ||
795 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; | ||
796 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; | ||
797 | } else { | ||
798 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"]; | ||
799 | } | ||
800 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"]; | ||
801 | } else { | ||
802 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; | ||
803 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; | ||
804 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; | ||
805 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; | ||
806 | } | ||
807 | |||
687 | project->variables()["MSVCDSP_VER"] = "6.00"; | 808 | project->variables()["MSVCDSP_VER"] = "6.00"; |
688 | project->variables()["MSVCDSP_DEBUG_OPT"] = "/GZ /ZI"; | 809 | project->variables()["MSVCDSP_DEBUG_OPT"] = "/GZ /ZI"; |
689 | 810 | ||
690 | if(!project->isActiveConfig("incremental")) { | 811 | if(!project->isActiveConfig("incremental")) { |
691 | project->variables()["QMAKE_LFLAGS"].append(QString("/incremental:no")); | 812 | project->variables()["QMAKE_LFLAGS"].append(QString("/incremental:no")); |
692 | if ( is_qt ) | 813 | if ( is_qt ) |
693 | project->variables()["MSVCDSP_DEBUG_OPT"] = "/GZ /Zi"; | 814 | project->variables()["MSVCDSP_DEBUG_OPT"] = "/GZ /Zi"; |
694 | } | 815 | } |
695 | 816 | ||
696 | QString msvcdsp_project; | 817 | QString msvcdsp_project; |
697 | if ( project->variables()["TARGET"].count() ) | 818 | if ( project->variables()["TARGET"].count() ) |
698 | msvcdsp_project = project->variables()["TARGET"].first(); | 819 | msvcdsp_project = project->variables()["TARGET"].first(); |
699 | 820 | ||
700 | QString targetfilename = project->variables()["TARGET"].first(); | 821 | QString targetfilename = project->variables()["TARGET"].first(); |
701 | project->variables()["TARGET"].first() += project->first("TARGET_EXT"); | 822 | project->variables()["TARGET"].first() += project->first("TARGET_EXT"); |
702 | if ( project->isActiveConfig("moc") ) | 823 | if ( project->isActiveConfig("moc") ) |
703 | setMocAware(TRUE); | 824 | setMocAware(TRUE); |
704 | 825 | ||
705 | project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"]; | 826 | project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"]; |
706 | project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ', | 827 | project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ', |
707 | "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH"); | 828 | "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH"); |
708 | QStringList &l = project->variables()["QMAKE_FILETAGS"]; | 829 | QStringList &l = project->variables()["QMAKE_FILETAGS"]; |
709 | for(it = l.begin(); it != l.end(); ++it) { | 830 | for(it = l.begin(); it != l.end(); ++it) { |
710 | QStringList &gdmf = project->variables()[(*it)]; | 831 | QStringList &gdmf = project->variables()[(*it)]; |
711 | for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner) | 832 | for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner) |
712 | (*inner) = Option::fixPathToTargetOS((*inner), FALSE); | 833 | (*inner) = Option::fixPathToTargetOS((*inner), FALSE); |
713 | } | 834 | } |
714 | 835 | ||
715 | MakefileGenerator::init(); | 836 | MakefileGenerator::init(); |
716 | if ( msvcdsp_project.isEmpty() ) | 837 | if ( msvcdsp_project.isEmpty() ) |
717 | msvcdsp_project = Option::output.name(); | 838 | msvcdsp_project = Option::output.name(); |
718 | 839 | ||
719 | msvcdsp_project = msvcdsp_project.right( msvcdsp_project.length() - msvcdsp_project.findRev( "\\" ) - 1 ); | 840 | msvcdsp_project = msvcdsp_project.right( msvcdsp_project.length() - msvcdsp_project.findRev( "\\" ) - 1 ); |
720 | msvcdsp_project = msvcdsp_project.left( msvcdsp_project.findRev( "." ) ); | 841 | msvcdsp_project = msvcdsp_project.left( msvcdsp_project.findRev( "." ) ); |
721 | msvcdsp_project.replace("-", ""); | 842 | msvcdsp_project.replace("-", ""); |
722 | 843 | ||
723 | project->variables()["MSVCDSP_PROJECT"].append(msvcdsp_project); | 844 | project->variables()["MSVCDSP_PROJECT"].append(msvcdsp_project); |
724 | QStringList &proj = project->variables()["MSVCDSP_PROJECT"]; | 845 | QStringList &proj = project->variables()["MSVCDSP_PROJECT"]; |
725 | 846 | ||
726 | for(it = proj.begin(); it != proj.end(); ++it) | 847 | for(it = proj.begin(); it != proj.end(); ++it) |
727 | (*it).replace(QRegExp("\\.[a-zA-Z0-9_]*$"), ""); | 848 | (*it).replace(QRegExp("\\.[a-zA-Z0-9_]*$"), ""); |
728 | 849 | ||
729 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { | 850 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { |
730 | project->variables()["MSVCDSP_TEMPLATE"].append("win32app" + project->first( "DSP_EXTENSION" ) ); | 851 | project->variables()["MSVCDSP_TEMPLATE"].append("win32app" + project->first( "DSP_EXTENSION" ) ); |
731 | if ( project->isActiveConfig("console") ) { | 852 | if ( project->isActiveConfig("console") ) { |
732 | project->variables()["MSVCDSP_CONSOLE"].append("Console"); | 853 | project->variables()["MSVCDSP_CONSOLE"].append("Console"); |
733 | project->variables()["MSVCDSP_WINCONDEF"].append("_CONSOLE"); | 854 | project->variables()["MSVCDSP_WINCONDEF"].append("_CONSOLE"); |
734 | project->variables()["MSVCDSP_DSPTYPE"].append("0x0103"); | 855 | project->variables()["MSVCDSP_DSPTYPE"].append("0x0103"); |
735 | project->variables()["MSVCDSP_SUBSYSTEM"].append("console"); | ||
736 | } else { | 856 | } else { |
737 | project->variables()["MSVCDSP_CONSOLE"].clear(); | 857 | project->variables()["MSVCDSP_CONSOLE"].clear(); |
738 | project->variables()["MSVCDSP_WINCONDEF"].append("_WINDOWS"); | 858 | project->variables()["MSVCDSP_WINCONDEF"].append("_WINDOWS"); |
739 | project->variables()["MSVCDSP_DSPTYPE"].append("0x0101"); | 859 | project->variables()["MSVCDSP_DSPTYPE"].append("0x0101"); |
740 | project->variables()["MSVCDSP_SUBSYSTEM"].append("windows"); | ||
741 | } | 860 | } |
742 | } else { | 861 | } else { |
743 | if ( project->isActiveConfig("dll") ) { | 862 | if ( project->isActiveConfig("dll") ) { |
744 | project->variables()["MSVCDSP_TEMPLATE"].append("win32dll" + project->first( "DSP_EXTENSION" ) ); | 863 | project->variables()["MSVCDSP_TEMPLATE"].append("win32dll" + project->first( "DSP_EXTENSION" ) ); |
745 | } else { | 864 | } else { |
746 | project->variables()["MSVCDSP_TEMPLATE"].append("win32lib" + project->first( "DSP_EXTENSION" ) ); | 865 | project->variables()["MSVCDSP_TEMPLATE"].append("win32lib" + project->first( "DSP_EXTENSION" ) ); |
747 | } | 866 | } |
748 | } | 867 | } |
749 | 868 | ||
750 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"]; | 869 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"]; |
870 | |||
871 | processPrlFiles(); | ||
751 | 872 | ||
873 | // Update -lname to name.lib, | ||
874 | QStringList &libs2 = project->variables()["QMAKE_LIBS"]; | ||
875 | for ( QStringList::Iterator libit2 = libs2.begin(); libit2 != libs2.end(); ++libit2 ) { | ||
876 | if ( (*libit2).startsWith( "-l" ) ) { | ||
877 | (*libit2) = (*libit2).mid( 2 ) + ".lib"; | ||
878 | } else if ( (*libit2).startsWith( "-L" ) ) { | ||
879 | project->variables()["QMAKE_LIBDIR"] += (*libit2).mid(2); | ||
880 | libit2 = libs2.remove( libit2 ); | ||
881 | } | ||
882 | } | ||
883 | |||
752 | project->variables()["MSVCDSP_LFLAGS" ] += project->variables()["QMAKE_LFLAGS"]; | 884 | project->variables()["MSVCDSP_LFLAGS" ] += project->variables()["QMAKE_LFLAGS"]; |
753 | if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() ) | 885 | if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() ) |
754 | project->variables()["MSVCDSP_LFLAGS" ].append(varGlue("QMAKE_LIBDIR","/LIBPATH:\"","\" /LIBPATH:\"","\"")); | 886 | project->variables()["MSVCDSP_LFLAGS" ].append(varGlue("QMAKE_LIBDIR","/LIBPATH:\"","\" /LIBPATH:\"","\"")); |
755 | project->variables()["MSVCDSP_CXXFLAGS" ] += project->variables()["QMAKE_CXXFLAGS"]; | 887 | project->variables()["MSVCDSP_CXXFLAGS" ] += project->variables()["QMAKE_CXXFLAGS"]; |
756 | project->variables()["MSVCDSP_DEFINES"].append(varGlue("DEFINES","/D ","" " /D ","")); | 888 | project->variables()["MSVCDSP_DEFINES"].append(varGlue("DEFINES","/D ","" " /D ","")); |
757 | project->variables()["MSVCDSP_DEFINES"].append(varGlue("PRL_EXPORT_DEFINES","/D ","" " /D ","")); | 889 | project->variables()["MSVCDSP_DEFINES"].append(varGlue("PRL_EXPORT_DEFINES","/D ","" " /D ","")); |
758 | 890 | ||
759 | processPrlFiles(); | 891 | if (!project->variables()["RES_FILE"].isEmpty()) |
892 | project->variables()["QMAKE_LIBS"] += project->variables()["RES_FILE"]; | ||
893 | |||
760 | QStringList &libs = project->variables()["QMAKE_LIBS"]; | 894 | QStringList &libs = project->variables()["QMAKE_LIBS"]; |
761 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) { | 895 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) { |
762 | QString lib = (*libit); | 896 | QString lib = (*libit); |
763 | lib.replace(QRegExp("\""), ""); | 897 | lib.replace(QRegExp("\""), ""); |
764 | project->variables()["MSVCDSP_LIBS"].append(" \"" + lib + "\""); | 898 | project->variables()["MSVCDSP_LIBS"].append(" \"" + lib + "\""); |
765 | } | 899 | } |
766 | 900 | ||
767 | QStringList &incs = project->variables()["INCLUDEPATH"]; | 901 | QStringList &incs = project->variables()["INCLUDEPATH"]; |
768 | for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { | 902 | for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { |
769 | QString inc = (*incit); | 903 | QString inc = (*incit); |
770 | inc.replace("\"", ""); | 904 | inc.replace("\"", ""); |
905 | if(inc.endsWith("\\")) // Remove trailing \'s from paths | ||
906 | inc.truncate(inc.length()-1); | ||
771 | project->variables()["MSVCDSP_INCPATH"].append("/I \"" + inc + "\""); | 907 | project->variables()["MSVCDSP_INCPATH"].append("/I \"" + inc + "\""); |
772 | } | 908 | } |
773 | 909 | ||
774 | project->variables()["MSVCDSP_INCPATH"].append("/I \"" + specdir() + "\""); | 910 | project->variables()["MSVCDSP_INCPATH"].append("/I \"" + specdir() + "\""); |
775 | if ( project->isActiveConfig("qt") ) { | 911 | if ( project->isActiveConfig("qt") ) { |
776 | project->variables()["MSVCDSP_RELDEFS"].append("/D \"QT_NO_DEBUG\""); | 912 | project->variables()["MSVCDSP_RELDEFS"].append("/D \"QT_NO_DEBUG\""); |
777 | } else { | 913 | } else { |
778 | project->variables()["MSVCDSP_RELDEFS"].clear(); | 914 | project->variables()["MSVCDSP_RELDEFS"].clear(); |
779 | } | 915 | } |
780 | 916 | ||
781 | QString dest; | 917 | QString dest; |
782 | QString postLinkStep; | 918 | QString postLinkStep; |
783 | QString copyDllStep; | 919 | QString copyDllStep; |
784 | QString activeQtStepPreCopyDll; | 920 | QString activeQtStepPreCopyDll; |
785 | QString activeQtStepPostCopyDll; | 921 | QString activeQtStepPostCopyDll; |
786 | QString activeQtStepPreCopyDllDebug; | 922 | QString activeQtStepPreCopyDllDebug; |
787 | QString activeQtStepPostCopyDllDebug; | 923 | QString activeQtStepPostCopyDllDebug; |
788 | QString activeQtStepPreCopyDllRelease; | 924 | QString activeQtStepPreCopyDllRelease; |
789 | QString activeQtStepPostCopyDllRelease; | 925 | QString activeQtStepPostCopyDllRelease; |
790 | 926 | ||
791 | if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() ) | 927 | if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() ) |
792 | postLinkStep += var("QMAKE_POST_LINK"); | 928 | postLinkStep += var("QMAKE_POST_LINK"); |
793 | 929 | ||
794 | if ( !project->variables()["DESTDIR"].isEmpty() ) { | 930 | if ( !project->variables()["DESTDIR"].isEmpty() ) { |
795 | project->variables()["TARGET"].first().prepend(project->first("DESTDIR")); | 931 | project->variables()["TARGET"].first().prepend(project->first("DESTDIR")); |
796 | Option::fixPathToTargetOS(project->first("TARGET")); | 932 | Option::fixPathToTargetOS(project->first("TARGET")); |
797 | dest = project->first("TARGET"); | 933 | dest = project->first("TARGET"); |
798 | if ( project->first("TARGET").startsWith("$(QTDIR)") ) | 934 | if ( project->first("TARGET").startsWith("$(QTDIR)") ) |
799 | dest.replace( "$(QTDIR)", getenv("QTDIR") ); | 935 | dest.replace( "$(QTDIR)", getenv("QTDIR") ); |
800 | project->variables()["MSVCDSP_TARGET"].append( | 936 | project->variables()["MSVCDSP_TARGET"].append( |
801 | QString("/out:\"") + dest + "\""); | 937 | QString("/out:\"") + dest + "\""); |
802 | if ( project->isActiveConfig("dll") ) { | 938 | if ( project->isActiveConfig("dll") ) { |
803 | QString imp = dest; | 939 | QString imp = dest; |
804 | imp.replace(".dll", ".lib"); | 940 | imp.replace(".dll", ".lib"); |
805 | project->variables()["MSVCDSP_TARGET"].append(QString(" /implib:\"") + imp + "\""); | 941 | project->variables()["MSVCDSP_TARGET"].append(QString(" /implib:\"") + imp + "\""); |
806 | } | 942 | } |
807 | } | 943 | } |
808 | if ( project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty() ) { | 944 | if ( project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty() ) { |
809 | QStringList dlldirs = project->variables()["DLLDESTDIR"]; | 945 | QStringList dlldirs = project->variables()["DLLDESTDIR"]; |
810 | if ( dlldirs.count() ) | 946 | if ( dlldirs.count() ) |
811 | copyDllStep += "\t"; | 947 | copyDllStep += "\t"; |
812 | for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) { | 948 | for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) { |
813 | copyDllStep += "copy \"$(TargetPath)\" \"" + *dlldir + "\"\t"; | 949 | copyDllStep += "copy \"$(TargetPath)\" \"" + *dlldir + "\"\t"; |
814 | } | 950 | } |
815 | } | 951 | } |
816 | 952 | ||
817 | if ( project->isActiveConfig("activeqt") ) { | 953 | if ( project->isActiveConfig("activeqt") ) { |
818 | QString idl = project->variables()["QMAKE_IDL"].first(); | 954 | QString idl = project->variables()["QMAKE_IDL"].first(); |
819 | QString idc = project->variables()["QMAKE_IDC"].first(); | 955 | QString idc = project->variables()["QMAKE_IDC"].first(); |
820 | QString version = project->variables()["VERSION"].first(); | 956 | QString version = project->variables()["VERSION"].first(); |
821 | if ( version.isEmpty() ) | 957 | if ( version.isEmpty() ) |
822 | version = "1.0"; | 958 | version = "1.0"; |
823 | 959 | project->variables()["MSVCDSP_IDLSOURCES"].append( var("OBJECTS_DIR") + targetfilename + ".idl" ); | |
824 | project->variables()["MSVCDSP_IDLSOURCES"].append( "tmp\\" + targetfilename + ".idl" ); | ||
825 | project->variables()["MSVCDSP_IDLSOURCES"].append( "tmp\\" + targetfilename + ".tlb" ); | ||
826 | project->variables()["MSVCDSP_IDLSOURCES"].append( "tmp\\" + targetfilename + ".midl" ); | ||
827 | if ( project->isActiveConfig( "dll" ) ) { | 960 | if ( project->isActiveConfig( "dll" ) ) { |
828 | activeQtStepPreCopyDll += | 961 | activeQtStepPreCopyDll += |
829 | "\t" + idc + " %1 -idl tmp\\" + targetfilename + ".idl -version " + version + | 962 | "\t" + idc + " %1 -idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version + |
830 | "\t" + idl + " tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl" | 963 | "\t" + idl + " /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb" + |
831 | "\t" + idc + " %1 /tlb tmp\\" + targetfilename + ".tlb"; | 964 | "\t" + idc + " %2 /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"; |
832 | activeQtStepPostCopyDll += | 965 | activeQtStepPostCopyDll += |
833 | "\t" + idc + " %1 /regserver\n"; | 966 | "\t" + idc + " %1 /regserver\n"; |
834 | 967 | ||
835 | QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".dll"; | 968 | QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".dll"; |
836 | activeQtStepPreCopyDllRelease = activeQtStepPreCopyDll.arg(executable).arg(executable); | 969 | activeQtStepPreCopyDllRelease = activeQtStepPreCopyDll.arg(executable).arg(executable); |
837 | activeQtStepPostCopyDllRelease = activeQtStepPostCopyDll.arg(executable); | 970 | activeQtStepPostCopyDllRelease = activeQtStepPostCopyDll.arg(executable); |
838 | 971 | ||
839 | executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".dll"; | 972 | executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".dll"; |
840 | activeQtStepPreCopyDllDebug = activeQtStepPreCopyDll.arg(executable).arg(executable); | 973 | activeQtStepPreCopyDllDebug = activeQtStepPreCopyDll.arg(executable).arg(executable); |
841 | activeQtStepPostCopyDllDebug = activeQtStepPostCopyDll.arg(executable); | 974 | activeQtStepPostCopyDllDebug = activeQtStepPostCopyDll.arg(executable); |
842 | } else { | 975 | } else { |
843 | activeQtStepPreCopyDll += | 976 | activeQtStepPreCopyDll += |
844 | "\t%1 -dumpidl tmp\\" + targetfilename + ".idl -version " + version + | 977 | "\t%1 -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version + |
845 | "\t" + idl + " tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl" | 978 | "\t" + idl + " /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb" + |
846 | "\t" + idc + " %1 /tlb tmp\\" + targetfilename + ".tlb"; | 979 | "\t" + idc + " %2 /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"; |
847 | activeQtStepPostCopyDll += | 980 | activeQtStepPostCopyDll += |
848 | "\t%1 -regserver\n"; | 981 | "\t%1 -regserver\n"; |
849 | QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".exe"; | 982 | QString executable = project->variables()["MSVCDSP_TARGETDIRREL"].first() + "\\" + targetfilename + ".exe"; |
850 | activeQtStepPreCopyDllRelease = activeQtStepPreCopyDll.arg(executable).arg(executable); | 983 | activeQtStepPreCopyDllRelease = activeQtStepPreCopyDll.arg(executable).arg(executable); |
851 | activeQtStepPostCopyDllRelease = activeQtStepPostCopyDll.arg(executable); | 984 | activeQtStepPostCopyDllRelease = activeQtStepPostCopyDll.arg(executable); |
852 | 985 | ||
853 | executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".exe"; | 986 | executable = project->variables()["MSVCDSP_TARGETDIRDEB"].first() + "\\" + targetfilename + ".exe"; |
854 | activeQtStepPreCopyDllDebug = activeQtStepPreCopyDll.arg(executable).arg(executable); | 987 | activeQtStepPreCopyDllDebug = activeQtStepPreCopyDll.arg(executable).arg(executable); |
855 | activeQtStepPostCopyDllDebug = activeQtStepPostCopyDll.arg(executable); | 988 | activeQtStepPostCopyDllDebug = activeQtStepPostCopyDll.arg(executable); |
856 | } | 989 | } |
857 | 990 | ||
858 | } | 991 | } |
859 | 992 | ||
860 | 993 | ||
861 | if ( !postLinkStep.isEmpty() || !copyDllStep.isEmpty() || !activeQtStepPreCopyDllDebug.isEmpty() || !activeQtStepPreCopyDllRelease.isEmpty() ) { | 994 | if ( !postLinkStep.isEmpty() || !copyDllStep.isEmpty() || !activeQtStepPreCopyDllDebug.isEmpty() || !activeQtStepPreCopyDllRelease.isEmpty() ) { |
862 | project->variables()["MSVCDSP_POST_LINK_DBG"].append( | 995 | project->variables()["MSVCDSP_POST_LINK_DBG"].append( |
863 | "# Begin Special Build Tool\n" | 996 | "# Begin Special Build Tool\n" |
864 | "SOURCE=$(InputPath)\n" | 997 | "SOURCE=$(InputPath)\n" |
865 | "PostBuild_Desc=Post Build Step\n" | 998 | "PostBuild_Desc=Post Build Step\n" |
866 | "PostBuild_Cmds=" + postLinkStep + activeQtStepPreCopyDllDebug + copyDllStep + activeQtStepPostCopyDllDebug + "\n" | 999 | "PostBuild_Cmds=" + postLinkStep + activeQtStepPreCopyDllDebug + copyDllStep + activeQtStepPostCopyDllDebug + "\n" |
867 | "# End Special Build Tool\n" ); | 1000 | "# End Special Build Tool\n" ); |
868 | project->variables()["MSVCDSP_POST_LINK_REL"].append( | 1001 | project->variables()["MSVCDSP_POST_LINK_REL"].append( |
869 | "# Begin Special Build Tool\n" | 1002 | "# Begin Special Build Tool\n" |
870 | "SOURCE=$(InputPath)\n" | 1003 | "SOURCE=$(InputPath)\n" |
871 | "PostBuild_Desc=Post Build Step\n" | 1004 | "PostBuild_Desc=Post Build Step\n" |
872 | "PostBuild_Cmds=" + postLinkStep + activeQtStepPreCopyDllRelease + copyDllStep + activeQtStepPostCopyDllRelease + "\n" | 1005 | "PostBuild_Cmds=" + postLinkStep + activeQtStepPreCopyDllRelease + copyDllStep + activeQtStepPostCopyDllRelease + "\n" |
873 | "# End Special Build Tool\n" ); | 1006 | "# End Special Build Tool\n" ); |
874 | } | 1007 | } |
875 | 1008 | ||
876 | if ( !project->variables()["SOURCES"].isEmpty() || !project->variables()["RC_FILE"].isEmpty() ) { | 1009 | if ( !project->variables()["SOURCES"].isEmpty() || !project->variables()["RC_FILE"].isEmpty() ) { |
877 | project->variables()["SOURCES"] += project->variables()["RC_FILE"]; | 1010 | project->variables()["SOURCES"] += project->variables()["RC_FILE"]; |
878 | } | 1011 | } |
879 | QStringList &list = project->variables()["FORMS"]; | 1012 | QStringList &list = project->variables()["FORMS"]; |
880 | for( it = list.begin(); it != list.end(); ++it ) { | 1013 | for( it = list.begin(); it != list.end(); ++it ) { |
881 | if ( QFile::exists( *it + ".h" ) ) | 1014 | if ( QFile::exists( *it + ".h" ) ) |
882 | project->variables()["SOURCES"].append( *it + ".h" ); | 1015 | project->variables()["SOURCES"].append( *it + ".h" ); |
883 | } | 1016 | } |
884 | project->variables()["QMAKE_INTERNAL_PRL_LIBS"] << "MSVCDSP_LIBS"; | 1017 | project->variables()["QMAKE_INTERNAL_PRL_LIBS"] << "MSVCDSP_LIBS"; |
885 | } | 1018 | } |
886 | 1019 | ||
887 | 1020 | ||
888 | QString | 1021 | QString |
889 | DspMakefileGenerator::findTemplate(const QString &file) | 1022 | DspMakefileGenerator::findTemplate(const QString &file) |
890 | { | 1023 | { |
891 | QString ret; | 1024 | QString ret; |
892 | if(!QFile::exists((ret = file)) && | 1025 | if(!QFile::exists((ret = file)) && |
893 | !QFile::exists((ret = QString(Option::mkfile::qmakespec + "/" + file))) && | 1026 | !QFile::exists((ret = QString(Option::mkfile::qmakespec + "/" + file))) && |
894 | !QFile::exists((ret = QString(getenv("QTDIR")) + "/mkspecs/win32-msvc/" + file)) && | 1027 | !QFile::exists((ret = QString(getenv("QTDIR")) + "/mkspecs/win32-msvc/" + file)) && |
895 | !QFile::exists((ret = (QString(getenv("HOME")) + "/.tmake/" + file)))) | 1028 | !QFile::exists((ret = (QString(getenv("HOME")) + "/.tmake/" + file)))) |
896 | return ""; | 1029 | return ""; |
897 | return ret; | 1030 | return ret; |
898 | } | 1031 | } |
899 | 1032 | ||
900 | 1033 | ||
901 | void | 1034 | void |
902 | DspMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l) | 1035 | DspMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l) |
903 | { | 1036 | { |
904 | if(var == "QMAKE_PRL_DEFINES") { | 1037 | if(var == "QMAKE_PRL_DEFINES") { |
905 | QStringList &out = project->variables()["MSVCDSP_DEFINES"]; | 1038 | QStringList &out = project->variables()["MSVCDSP_DEFINES"]; |
906 | for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { | 1039 | for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { |
907 | if(out.findIndex((*it)) == -1) | 1040 | if(out.findIndex((*it)) == -1) |
908 | out.append((" /D \"" + *it + "\"")); | 1041 | out.append((" /D \"" + *it + "\"")); |
909 | } | 1042 | } |
910 | } else { | 1043 | } else { |
911 | MakefileGenerator::processPrlVariable(var, l); | 1044 | MakefileGenerator::processPrlVariable(var, l); |
912 | } | 1045 | } |
913 | } | 1046 | } |
914 | 1047 | ||
915 | 1048 | ||
916 | void | 1049 | void |
917 | DspMakefileGenerator::beginGroupForFile(QString file, QTextStream &t, | 1050 | DspMakefileGenerator::beginGroupForFile(QString file, QTextStream &t, |
918 | const QString& filter) | 1051 | const QString& filter) |
919 | { | 1052 | { |
920 | if(project->isActiveConfig("flat")) | 1053 | if(project->isActiveConfig("flat")) |
921 | return; | 1054 | return; |
922 | |||
923 | fileFixify(file, QDir::currentDirPath(), QDir::currentDirPath(), TRUE); | 1055 | fileFixify(file, QDir::currentDirPath(), QDir::currentDirPath(), TRUE); |
924 | file = file.section(Option::dir_sep, 0, -2); | 1056 | file = file.section(Option::dir_sep, 0, -2); |
925 | if(file.right(Option::dir_sep.length()) != Option::dir_sep) | 1057 | if(file.right(Option::dir_sep.length()) != Option::dir_sep) |
926 | file += Option::dir_sep; | 1058 | file += Option::dir_sep; |
927 | if(file == currentGroup) | 1059 | if(file == currentGroup) |
928 | return; | 1060 | return; |
929 | 1061 | ||
930 | if(file.isEmpty() || !QDir::isRelativePath(file)) { | 1062 | if(file.isEmpty() || !QDir::isRelativePath(file)) { |
931 | endGroups(t); | 1063 | endGroups(t); |
932 | return; | 1064 | return; |
933 | } | 1065 | } |
934 | if(file.startsWith(currentGroup)) | 1066 | |
935 | file = file.mid(currentGroup.length()); | 1067 | QString tempFile = file; |
1068 | if(tempFile.startsWith(currentGroup)) | ||
1069 | tempFile = tempFile.mid(currentGroup.length()); | ||
936 | int dirSep = currentGroup.findRev( Option::dir_sep ); | 1070 | int dirSep = currentGroup.findRev( Option::dir_sep ); |
937 | while( !file.startsWith( currentGroup ) && dirSep != -1 ) { | 1071 | |
1072 | while( !tempFile.startsWith( currentGroup ) && dirSep != -1 ) { | ||
938 | currentGroup.truncate( dirSep ); | 1073 | currentGroup.truncate( dirSep ); |
939 | dirSep = currentGroup.findRev( Option::dir_sep ); | 1074 | dirSep = currentGroup.findRev( Option::dir_sep ); |
940 | if ( !file.startsWith( currentGroup ) && dirSep != -1 ) | 1075 | if ( !tempFile.startsWith( currentGroup ) && dirSep != -1 ) |
941 | t << "\n# End Group\n"; | 1076 | t << "\n# End Group\n"; |
942 | } | 1077 | } |
943 | if ( !file.startsWith( currentGroup ) ) { | 1078 | if ( !file.startsWith( currentGroup ) ) { |
944 | t << "\n# End Group\n"; | 1079 | t << "\n# End Group\n"; |
945 | currentGroup = ""; | 1080 | currentGroup = ""; |
946 | } | 1081 | } |
1082 | |||
947 | QStringList dirs = QStringList::split(Option::dir_sep, file.right( file.length() - currentGroup.length() ) ); | 1083 | QStringList dirs = QStringList::split(Option::dir_sep, file.right( file.length() - currentGroup.length() ) ); |
948 | for(QStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) { | 1084 | for(QStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) { |
949 | t << "# Begin Group \"" << (*dir_it) << "\"\n" | 1085 | t << "# Begin Group \"" << (*dir_it) << "\"\n" |
950 | << "# Prop Default_Filter \"" << filter << "\"\n"; | 1086 | << "# Prop Default_Filter \"" << filter << "\"\n"; |
951 | } | 1087 | } |
952 | currentGroup = file; | 1088 | currentGroup = file; |
953 | } | 1089 | } |
954 | 1090 | ||
955 | 1091 | ||
956 | void | 1092 | void |
957 | DspMakefileGenerator::endGroups(QTextStream &t) | 1093 | DspMakefileGenerator::endGroups(QTextStream &t) |
958 | { | 1094 | { |
959 | if(project->isActiveConfig("flat")) | 1095 | if(project->isActiveConfig("flat")) |
960 | return; | 1096 | return; |
961 | else if(currentGroup.isEmpty()) | 1097 | else if(currentGroup.isEmpty()) |
962 | return; | 1098 | return; |
963 | 1099 | ||
964 | QStringList dirs = QStringList::split(Option::dir_sep, currentGroup); | 1100 | QStringList dirs = QStringList::split(Option::dir_sep, currentGroup); |
965 | for(QStringList::Iterator dir_it = dirs.end(); dir_it != dirs.begin(); --dir_it) { | 1101 | for(QStringList::Iterator dir_it = dirs.end(); dir_it != dirs.begin(); --dir_it) { |
966 | t << "\n# End Group\n"; | 1102 | t << "\n# End Group\n"; |
967 | } | 1103 | } |
968 | currentGroup = ""; | 1104 | currentGroup = ""; |
969 | } | 1105 | } |
970 | 1106 | ||
971 | bool | 1107 | bool |
972 | DspMakefileGenerator::openOutput(QFile &file) const | 1108 | DspMakefileGenerator::openOutput(QFile &file) const |
973 | { | 1109 | { |
974 | QString outdir; | 1110 | QString outdir; |
975 | if(!file.name().isEmpty()) { | 1111 | if(!file.name().isEmpty()) { |
1112 | if(QDir::isRelativePath(file.name())) | ||
1113 | file.setName(Option::output_dir + file.name()); //pwd when qmake was run | ||
976 | QFileInfo fi(file); | 1114 | QFileInfo fi(file); |
977 | if(fi.isDir()) | 1115 | if(fi.isDir()) |
978 | outdir = file.name() + QDir::separator(); | 1116 | outdir = file.name() + QDir::separator(); |
979 | } | 1117 | } |
980 | if(!outdir.isEmpty() || file.name().isEmpty()) | 1118 | if(!outdir.isEmpty() || file.name().isEmpty()) |
981 | file.setName(outdir + project->first("TARGET") + project->first("DSP_EXTENSION")); | 1119 | file.setName(outdir + project->first("TARGET") + project->first("DSP_EXTENSION")); |
982 | if(QDir::isRelativePath(file.name())) { | 1120 | if(QDir::isRelativePath(file.name())) { |
983 | QString ofile; | 1121 | QString ofile; |
984 | ofile = file.name(); | 1122 | ofile = file.name(); |
985 | int slashfind = ofile.findRev('\\'); | 1123 | int slashfind = ofile.findRev('\\'); |
986 | if (slashfind == -1) { | 1124 | if (slashfind == -1) { |
987 | ofile = ofile.replace(QRegExp("-"), "_"); | 1125 | ofile = ofile.replace(QRegExp("-"), "_"); |
988 | } else { | 1126 | } else { |
989 | int hypenfind = ofile.find('-', slashfind); | 1127 | int hypenfind = ofile.find('-', slashfind); |
990 | while (hypenfind != -1 && slashfind < hypenfind) { | 1128 | while (hypenfind != -1 && slashfind < hypenfind) { |
991 | ofile = ofile.replace(hypenfind, 1, "_"); | 1129 | ofile = ofile.replace(hypenfind, 1, "_"); |
992 | hypenfind = ofile.find('-', hypenfind + 1); | 1130 | hypenfind = ofile.find('-', hypenfind + 1); |
993 | } | 1131 | } |
994 | } | 1132 | } |
995 | file.setName(Option::fixPathToLocalOS(QDir::currentDirPath() + Option::dir_sep + ofile)); | 1133 | file.setName(Option::fixPathToLocalOS(QDir::currentDirPath() + Option::dir_sep + ofile)); |
996 | } | 1134 | } |
997 | return Win32MakefileGenerator::openOutput(file); | 1135 | return Win32MakefileGenerator::openOutput(file); |
998 | } | 1136 | } |
diff --git a/qmake/generators/win32/msvc_dsp.h b/qmake/generators/win32/msvc_dsp.h index 3a7d18e..0e86539 100644 --- a/qmake/generators/win32/msvc_dsp.h +++ b/qmake/generators/win32/msvc_dsp.h | |||
@@ -1,73 +1,76 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of ________ class. | 4 | ** Definition of DspMakefileGenerator class. |
5 | ** | 5 | ** |
6 | ** Created : 970521 | 6 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. | 8 | ** This file is part of qmake. |
9 | ** | ||
10 | ** This file is part of the network module of the Qt GUI Toolkit. | ||
11 | ** | 9 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 13 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 14 | ** This file may be distributed and/or modified under the terms of the |
17 | ** GNU General Public License version 2 as published by the Free Software | 15 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 17 | ** packaging of this file. |
20 | ** | 18 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
22 | ** file in accordance with the Qt Commercial License Agreement provided | 20 | ** file in accordance with the Qt Commercial License Agreement provided |
23 | ** with the Software. | 21 | ** with the Software. |
24 | ** | 22 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 25 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 30 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 32 | ** not clear to you. |
35 | ** | 33 | ** |
36 | **********************************************************************/ | 34 | **********************************************************************/ |
35 | |||
37 | #ifndef __MSVC_DSP_H__ | 36 | #ifndef __MSVC_DSP_H__ |
38 | #define __MSVC_DSP_H__ | 37 | #define __MSVC_DSP_H__ |
39 | 38 | ||
40 | #include "winmakefile.h" | 39 | #include "winmakefile.h" |
41 | #include <qvaluestack.h> | 40 | #include <qvaluestack.h> |
42 | 41 | ||
43 | class DspMakefileGenerator : public Win32MakefileGenerator | 42 | class DspMakefileGenerator : public Win32MakefileGenerator |
44 | { | 43 | { |
45 | QString currentGroup; | 44 | QString currentGroup; |
46 | void beginGroupForFile(QString file, QTextStream &, const QString& filter=""); | 45 | void beginGroupForFile(QString file, QTextStream &, const QString& filter=""); |
47 | void endGroups(QTextStream &); | 46 | void endGroups(QTextStream &); |
48 | 47 | ||
49 | bool init_flag; | 48 | bool init_flag; |
50 | bool writeDspParts(QTextStream &); | 49 | bool writeDspParts(QTextStream &); |
51 | 50 | ||
52 | bool writeMakefile(QTextStream &); | 51 | bool writeMakefile(QTextStream &); |
53 | QString findTemplate(const QString &file); | 52 | QString findTemplate(const QString &file); |
54 | void init(); | 53 | void init(); |
55 | 54 | ||
56 | public: | 55 | public: |
57 | DspMakefileGenerator(QMakeProject *p); | 56 | DspMakefileGenerator(QMakeProject *p); |
58 | ~DspMakefileGenerator(); | 57 | ~DspMakefileGenerator(); |
59 | 58 | ||
60 | bool openOutput(QFile &file) const; | 59 | bool openOutput(QFile &file) const; |
61 | 60 | ||
62 | protected: | 61 | protected: |
63 | virtual void processPrlVariable(const QString &, const QStringList &); | 62 | virtual void processPrlVariable(const QString &, const QStringList &); |
64 | virtual bool findLibraries(); | 63 | virtual bool findLibraries(); |
64 | |||
65 | QString precompH, | ||
66 | precompObj, precompPch; | ||
67 | bool usePCH; | ||
65 | }; | 68 | }; |
66 | 69 | ||
67 | inline DspMakefileGenerator::~DspMakefileGenerator() | 70 | inline DspMakefileGenerator::~DspMakefileGenerator() |
68 | { } | 71 | { } |
69 | 72 | ||
70 | inline bool DspMakefileGenerator::findLibraries() | 73 | inline bool DspMakefileGenerator::findLibraries() |
71 | { return Win32MakefileGenerator::findLibraries("MSVCDSP_LIBS"); } | 74 | { return Win32MakefileGenerator::findLibraries("MSVCDSP_LIBS"); } |
72 | 75 | ||
73 | #endif /* __MSVC_DSP_H__ */ | 76 | #endif /* __MSVC_DSP_H__ */ |
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index ecef34d..528cb19 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp | |||
@@ -1,562 +1,787 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of ________ class. | 4 | ** Implementation of NmakeMakefileGenerator class. |
5 | ** | 5 | ** |
6 | ** Created : 970521 | 6 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. | 8 | ** This file is part of qmake. |
9 | ** | ||
10 | ** This file is part of the network module of the Qt GUI Toolkit. | ||
11 | ** | 9 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 13 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 14 | ** This file may be distributed and/or modified under the terms of the |
17 | ** GNU General Public License version 2 as published by the Free Software | 15 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 17 | ** packaging of this file. |
20 | ** | 18 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
22 | ** file in accordance with the Qt Commercial License Agreement provided | 20 | ** file in accordance with the Qt Commercial License Agreement provided |
23 | ** with the Software. | 21 | ** with the Software. |
24 | ** | 22 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 25 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 30 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 32 | ** not clear to you. |
35 | ** | 33 | ** |
36 | **********************************************************************/ | 34 | **********************************************************************/ |
37 | 35 | ||
38 | #include "msvc_nmake.h" | 36 | #include "msvc_nmake.h" |
39 | #include "option.h" | 37 | #include "option.h" |
40 | #include <qregexp.h> | 38 | #include <qregexp.h> |
41 | #include <qdict.h> | 39 | #include <qdict.h> |
42 | #include <qdir.h> | 40 | #include <qdir.h> |
43 | #include <stdlib.h> | 41 | #include <stdlib.h> |
44 | #include <time.h> | 42 | #include <time.h> |
45 | 43 | ||
46 | |||
47 | NmakeMakefileGenerator::NmakeMakefileGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE) | 44 | NmakeMakefileGenerator::NmakeMakefileGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE) |
48 | { | 45 | { |
49 | 46 | ||
50 | } | 47 | } |
51 | 48 | ||
52 | bool | 49 | bool |
53 | NmakeMakefileGenerator::writeMakefile(QTextStream &t) | 50 | NmakeMakefileGenerator::writeMakefile(QTextStream &t) |
54 | { | 51 | { |
55 | writeHeader(t); | 52 | writeHeader(t); |
56 | if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { | 53 | if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { |
54 | { //write the extra unix targets.. | ||
55 | QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"]; | ||
56 | for(QStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it) | ||
57 | t << *it << " "; | ||
58 | } | ||
57 | t << "all clean:" << "\n\t" | 59 | t << "all clean:" << "\n\t" |
58 | << "@echo \"Some of the required modules (" | 60 | << "@echo \"Some of the required modules (" |
59 | << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t" | 61 | << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t" |
60 | << "@echo \"Skipped.\"" << endl << endl; | 62 | << "@echo \"Skipped.\"" << endl << endl; |
61 | writeMakeQmake(t); | 63 | writeMakeQmake(t); |
62 | return TRUE; | 64 | return TRUE; |
63 | } | 65 | } |
64 | 66 | ||
65 | if(project->first("TEMPLATE") == "app" || | 67 | if(project->first("TEMPLATE") == "app" || |
66 | project->first("TEMPLATE") == "lib") { | 68 | project->first("TEMPLATE") == "lib") { |
67 | writeNmakeParts(t); | 69 | writeNmakeParts(t); |
68 | return MakefileGenerator::writeMakefile(t); | 70 | return MakefileGenerator::writeMakefile(t); |
69 | } | 71 | } |
70 | else if(project->first("TEMPLATE") == "subdirs") { | 72 | else if(project->first("TEMPLATE") == "subdirs") { |
71 | writeSubDirs(t); | 73 | writeSubDirs(t); |
72 | return TRUE; | 74 | return TRUE; |
73 | } | 75 | } |
74 | return FALSE; | 76 | return FALSE; |
75 | } | 77 | } |
76 | 78 | ||
79 | QStringList | ||
80 | &NmakeMakefileGenerator::findDependencies(const QString &file) | ||
81 | { | ||
82 | QStringList &aList = MakefileGenerator::findDependencies(file); | ||
83 | // Note: The QMAKE_IMAGE_COLLECTION file have all images | ||
84 | // as dependency, so don't add precompiled header then | ||
85 | if (file == project->first("QMAKE_IMAGE_COLLECTION")) | ||
86 | return aList; | ||
87 | for(QStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) { | ||
88 | if(file.endsWith(*it)) { | ||
89 | if(!aList.contains(precompH)) | ||
90 | aList += precompH; | ||
91 | break; | ||
92 | } | ||
93 | } | ||
94 | return aList; | ||
95 | } | ||
96 | |||
77 | void | 97 | void |
78 | NmakeMakefileGenerator::writeNmakeParts(QTextStream &t) | 98 | NmakeMakefileGenerator::writeNmakeParts(QTextStream &t) |
79 | { | 99 | { |
80 | t << "####### Compiler, tools and options" << endl << endl; | 100 | t << "####### Compiler, tools and options" << endl << endl; |
81 | t << "CC =" << var("QMAKE_CC") << endl; | 101 | t << "CC =" << var("QMAKE_CC") << endl; |
82 | t << "CXX =" << var("QMAKE_CXX") << endl; | 102 | t << "CXX =" << var("QMAKE_CXX") << endl; |
83 | t << "LEX = " << var("QMAKE_LEX") << endl; | 103 | t << "LEX = " << var("QMAKE_LEX") << endl; |
84 | t << "YACC = " << var("QMAKE_YACC") << endl; | 104 | t << "YACC = " << var("QMAKE_YACC") << endl; |
85 | t << "CFLAGS =" << var("QMAKE_CFLAGS") << " " | 105 | t << "CFLAGS =" << var("QMAKE_CFLAGS") << " " |
86 | << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " " | 106 | << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " " |
87 | << varGlue("DEFINES","-D"," -D","") << endl; | 107 | << varGlue("DEFINES","-D"," -D","") << endl; |
88 | t << "CXXFLAGS =" << var("QMAKE_CXXFLAGS") << " " | 108 | t << "CXXFLAGS =" << var("QMAKE_CXXFLAGS") << " " |
89 | << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " " | 109 | << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " " |
90 | << varGlue("DEFINES","-D"," -D","") << endl; | 110 | << varGlue("DEFINES","-D"," -D","") << endl; |
91 | t << "LEXFLAGS=" << var("QMAKE_LEXFLAGS") << endl; | 111 | t << "LEXFLAGS=" << var("QMAKE_LEXFLAGS") << endl; |
92 | t << "YACCFLAGS=" << var("QMAKE_YACCFLAGS") << endl; | 112 | t << "YACCFLAGS=" << var("QMAKE_YACCFLAGS") << endl; |
93 | 113 | ||
94 | t << "INCPATH ="; | 114 | t << "INCPATH ="; |
95 | QStringList &incs = project->variables()["INCLUDEPATH"]; | 115 | QStringList &incs = project->variables()["INCLUDEPATH"]; |
96 | for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { | 116 | for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { |
97 | QString inc = (*incit); | 117 | QString inc = (*incit); |
98 | inc.replace(QRegExp("\\\\$"), "\\\\"); | 118 | if (inc.endsWith("\\")) |
99 | inc.replace("\"", ""); | 119 | inc.truncate(inc.length()-1); |
100 | t << " -I\"" << inc << "\""; | 120 | t << " -I\"" << inc << "\""; |
101 | } | 121 | } |
102 | t << " -I\"" << specdir() << "\"" | 122 | t << " -I\"" << specdir() << "\"" |
103 | << endl; | 123 | << endl; |
104 | if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) { | 124 | if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) { |
105 | t << "LINK =" << var("QMAKE_LINK") << endl; | 125 | t << "LINK =" << var("QMAKE_LINK") << endl; |
106 | t << "LFLAGS =" << var("QMAKE_LFLAGS"); | 126 | t << "LFLAGS =" << var("QMAKE_LFLAGS"); |
107 | if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() ) | 127 | if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() ) |
108 | t << " " << varGlue("QMAKE_LIBDIR","/LIBPATH:\"","\" /LIBPATH:\"","\""); | 128 | t << " " << varGlue("QMAKE_LIBDIR","/LIBPATH:\"","\" /LIBPATH:\"","\""); |
109 | t << endl; | 129 | t << endl; |
110 | t << "LIBS ="; | 130 | t << "LIBS ="; |
111 | QStringList &libs = project->variables()["QMAKE_LIBS"]; | 131 | QStringList &libs = project->variables()["QMAKE_LIBS"]; |
112 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) { | 132 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) { |
113 | QString lib = (*libit); | 133 | QString lib = (*libit); |
114 | lib.replace(QRegExp("\\\\$"), "\\\\"); | 134 | if (lib.endsWith("\\")) |
115 | lib.replace(QRegExp("\""), ""); | 135 | lib.truncate(lib.length()-1); |
116 | t << " \"" << lib << "\""; | 136 | t << " \"" << lib << "\""; |
117 | } | 137 | } |
118 | t << endl; | 138 | t << endl; |
119 | } | 139 | } |
120 | else { | 140 | else { |
121 | t << "LIB =" << var("QMAKE_LIB") << endl; | 141 | t << "LIB =" << var("QMAKE_LIB") << endl; |
122 | } | 142 | } |
123 | t << "MOC =" << (project->isEmpty("QMAKE_MOC") ? QString("moc") : | 143 | t << "MOC =" << (project->isEmpty("QMAKE_MOC") ? QString("moc") : |
124 | Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl; | 144 | Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl; |
125 | t << "UIC =" << (project->isEmpty("QMAKE_UIC") ? QString("uic") : | 145 | t << "UIC =" << (project->isEmpty("QMAKE_UIC") ? QString("uic") : |
126 | Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl; | 146 | Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl; |
127 | t << "QMAKE =" << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : | 147 | t << "QMAKE =" << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : |
128 | Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl; | 148 | Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl; |
129 | t << "IDC =" << (project->isEmpty("QMAKE_IDC") ? QString("idc") : | 149 | t << "IDC =" << (project->isEmpty("QMAKE_IDC") ? QString("idc") : |
130 | Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl; | 150 | Option::fixPathToTargetOS(var("QMAKE_IDC"), FALSE)) << endl; |
131 | t << "IDL =" << (project->isEmpty("QMAKE_IDL") ? QString("midl") : | 151 | t << "IDL =" << (project->isEmpty("QMAKE_IDL") ? QString("midl") : |
132 | Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl; | 152 | Option::fixPathToTargetOS(var("QMAKE_IDL"), FALSE)) << endl; |
133 | t << "ZIP =" << var("QMAKE_ZIP") << endl; | 153 | t << "ZIP =" << var("QMAKE_ZIP") << endl; |
134 | t << "COPY_FILE= " << var("QMAKE_COPY") << endl; | 154 | t << "COPY_FILE= " << var("QMAKE_COPY") << endl; |
135 | t << "COPY_DIR= " << var("QMAKE_COPY") << endl; | 155 | t << "COPY_DIR= " << var("QMAKE_COPY") << endl; |
136 | t << "DEL_FILE= " << var("QMAKE_DEL_FILE") << endl; | 156 | t << "DEL_FILE= " << var("QMAKE_DEL_FILE") << endl; |
137 | t << "DEL_DIR= " << var("QMAKE_DEL_DIR") << endl; | 157 | t << "DEL_DIR= " << var("QMAKE_DEL_DIR") << endl; |
138 | t << "MOVE = " << var("QMAKE_MOVE") << endl; | 158 | t << "MOVE = " << var("QMAKE_MOVE") << endl; |
139 | t << "CHK_DIR_EXISTS =" << var("QMAKE_CHK_DIR_EXISTS") << endl; | 159 | t << "CHK_DIR_EXISTS =" << var("QMAKE_CHK_DIR_EXISTS") << endl; |
140 | t << "MKDIR =" << var("QMAKE_MKDIR") << endl; | 160 | t << "MKDIR =" << var("QMAKE_MKDIR") << endl; |
161 | t << "INSTALL_FILE= " << var("QMAKE_INSTALL_FILE") << endl; | ||
162 | t << "INSTALL_DIR = " << var("QMAKE_INSTALL_DIR") << endl; | ||
141 | t << endl; | 163 | t << endl; |
142 | 164 | ||
143 | t << "####### Files" << endl << endl; | 165 | t << "####### Files" << endl << endl; |
144 | t << "HEADERS =" << varList("HEADERS") << endl; | 166 | t << "HEADERS =" << varList("HEADERS") << endl; |
145 | t << "SOURCES =" << varList("SOURCES") << endl; | 167 | t << "SOURCES =" << varList("SOURCES") << endl; |
146 | t << "OBJECTS =" << varList("OBJECTS") << endl; | 168 | t << "OBJECTS =" << varList("OBJECTS") << endl; |
147 | t << "FORMS =" << varList("FORMS") << endl; | 169 | t << "FORMS =" << varList("FORMS") << endl; |
148 | t << "UICDECLS =" << varList("UICDECLS") << endl; | 170 | t << "UICDECLS =" << varList("UICDECLS") << endl; |
149 | t << "UICIMPLS =" << varList("UICIMPLS") << endl; | 171 | t << "UICIMPLS =" << varList("UICIMPLS") << endl; |
150 | t << "SRCMOC =" << varList("SRCMOC") << endl; | 172 | t << "SRCMOC =" << varList("SRCMOC") << endl; |
151 | t << "OBJMOC =" << varList("OBJMOC") << endl; | 173 | t << "OBJMOC =" << varList("OBJMOC") << endl; |
174 | |||
175 | QString extraCompilerDeps; | ||
176 | if(!project->isEmpty("QMAKE_EXTRA_WIN_COMPILERS")) { | ||
177 | t << "OBJCOMP = " << varList("OBJCOMP") << endl; | ||
178 | extraCompilerDeps += " $(OBJCOMP) "; | ||
179 | |||
180 | QStringList &comps = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"]; | ||
181 | for(QStringList::Iterator compit = comps.begin(); compit != comps.end(); ++compit) { | ||
182 | QStringList &vars = project->variables()[(*compit) + ".variables"]; | ||
183 | for(QStringList::Iterator varit = vars.begin(); varit != vars.end(); ++varit) { | ||
184 | QStringList vals = project->variables()[(*varit)]; | ||
185 | if(!vals.isEmpty()) | ||
186 | t << "QMAKE_COMP_" << (*varit) << " = " << valList(vals) << endl; | ||
187 | } | ||
188 | } | ||
189 | } | ||
190 | |||
152 | t << "DIST =" << varList("DISTFILES") << endl; | 191 | t << "DIST =" << varList("DISTFILES") << endl; |
153 | t << "TARGET ="; | 192 | t << "TARGET ="; |
154 | if( !project->variables()[ "DESTDIR" ].isEmpty() ) | 193 | if( !project->variables()[ "DESTDIR" ].isEmpty() ) |
155 | t << varGlue("TARGET",project->first("DESTDIR"),"",project->first("TARGET_EXT")); | 194 | t << varGlue("TARGET",project->first("DESTDIR"),"",project->first("TARGET_EXT")); |
156 | else | 195 | else |
157 | t << project->variables()[ "TARGET" ].first() << project->variables()[ "TARGET_EXT" ].first(); | 196 | t << project->variables()[ "TARGET" ].first() << project->variables()[ "TARGET_EXT" ].first(); |
158 | t << endl; | 197 | t << endl; |
159 | t << endl; | 198 | t << endl; |
160 | 199 | ||
161 | t << "####### Implicit rules" << endl << endl; | 200 | t << "####### Implicit rules" << endl << endl; |
162 | t << ".SUFFIXES: .c"; | 201 | t << ".SUFFIXES: .c"; |
163 | QStringList::Iterator cppit; | 202 | QStringList::Iterator cppit; |
164 | for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) | 203 | for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) |
165 | t << " " << (*cppit); | 204 | t << " " << (*cppit); |
166 | t << endl << endl; | 205 | t << endl << endl; |
206 | |||
167 | if(!project->isActiveConfig("no_batch")) { | 207 | if(!project->isActiveConfig("no_batch")) { |
168 | // Batchmode doesn't use the non implicit rules QMAKE_RUN_CXX & QMAKE_RUN_CC | 208 | // Batchmode doesn't use the non implicit rules QMAKE_RUN_CXX & QMAKE_RUN_CC |
169 | project->variables().remove("QMAKE_RUN_CXX"); | 209 | project->variables().remove("QMAKE_RUN_CXX"); |
170 | project->variables().remove("QMAKE_RUN_CC"); | 210 | project->variables().remove("QMAKE_RUN_CC"); |
171 | 211 | ||
172 | QDict<void> source_directories; | 212 | QDict<void> source_directories; |
173 | source_directories.insert(".", (void*)1); | 213 | source_directories.insert(".", (void*)1); |
174 | if(!project->isEmpty("MOC_DIR")) | 214 | QString directories[] = { QString("MOC_DIR"), QString("UI_SOURCES_DIR"), QString("UI_DIR"), QString::null }; |
175 | source_directories.insert(project->first("MOC_DIR"), (void*)1); | 215 | for(int y = 0; !directories[y].isNull(); y++) { |
176 | if(!project->isEmpty("UI_SOURCES_DIR")) | 216 | QString dirTemp = project->first(directories[y]); |
177 | source_directories.insert(project->first("UI_SOURCES_DIR"), (void*)1); | 217 | if (dirTemp.endsWith("\\")) |
178 | else if(!project->isEmpty("UI_DIR")) | 218 | dirTemp.truncate(dirTemp.length()-1); |
179 | source_directories.insert(project->first("UI_DIR"), (void*)1); | 219 | if(!dirTemp.isEmpty()) |
220 | source_directories.insert(dirTemp, (void*)1); | ||
221 | } | ||
180 | QString srcs[] = { QString("SOURCES"), QString("UICIMPLS"), QString("SRCMOC"), QString::null }; | 222 | QString srcs[] = { QString("SOURCES"), QString("UICIMPLS"), QString("SRCMOC"), QString::null }; |
181 | for(int x = 0; !srcs[x].isNull(); x++) { | 223 | for(int x = 0; !srcs[x].isNull(); x++) { |
182 | QStringList &l = project->variables()[srcs[x]]; | 224 | QStringList &l = project->variables()[srcs[x]]; |
183 | for(QStringList::Iterator sit = l.begin(); sit != l.end(); ++sit) { | 225 | for(QStringList::Iterator sit = l.begin(); sit != l.end(); ++sit) { |
184 | QString sep = "\\"; | 226 | QString sep = "\\"; |
185 | if((*sit).find(sep) == -1) | 227 | if((*sit).find(sep) == -1) |
186 | sep = "/"; | 228 | sep = "/"; |
187 | QString dir = (*sit).section(sep, 0, -2); | 229 | QString dir = (*sit).section(sep, 0, -2); |
188 | if(!dir.isEmpty() && !source_directories[dir]) | 230 | if(!dir.isEmpty() && !source_directories[dir]) |
189 | source_directories.insert(dir, (void*)1); | 231 | source_directories.insert(dir, (void*)1); |
190 | } | 232 | } |
191 | } | 233 | } |
192 | 234 | ||
193 | for(QDictIterator<void> it(source_directories); it.current(); ++it) { | 235 | for(QDictIterator<void> it(source_directories); it.current(); ++it) { |
194 | if(it.currentKey().isEmpty()) | 236 | if(it.currentKey().isEmpty()) |
195 | continue; | 237 | continue; |
196 | for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) | 238 | for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) |
197 | t << "{" << it.currentKey() << "}" << (*cppit) << "{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t" | 239 | t << "{" << it.currentKey() << "}" << (*cppit) << "{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t" |
198 | << var("QMAKE_RUN_CXX_IMP_BATCH").replace( QRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl; | 240 | << var("QMAKE_RUN_CXX_IMP_BATCH").replace( QRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl; |
199 | t << "{" << it.currentKey() << "}" << ".c{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t" | 241 | t << "{" << it.currentKey() << "}" << ".c{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t" |
200 | << var("QMAKE_RUN_CC_IMP_BATCH").replace( QRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl; | 242 | << var("QMAKE_RUN_CC_IMP_BATCH").replace( QRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl; |
201 | } | 243 | } |
202 | } else { | 244 | } else { |
203 | for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) | 245 | for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) |
204 | t << (*cppit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl; | 246 | t << (*cppit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl; |
205 | t << ".c" << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl; | 247 | t << ".c" << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl; |
206 | } | 248 | } |
207 | 249 | ||
208 | t << "####### Build rules" << endl << endl; | 250 | t << "####### Build rules" << endl << endl; |
209 | t << "all: " << varGlue("ALL_DEPS",""," "," ") << "$(TARGET)" << endl << endl; | 251 | t << "all: " << fileFixify(Option::output.name()) << " " << varGlue("ALL_DEPS"," "," "," ") << "$(TARGET)" << endl << endl; |
210 | t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " | 252 | t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " |
211 | << var("POST_TARGETDEPS"); | 253 | << extraCompilerDeps << var("POST_TARGETDEPS"); |
212 | if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) { | 254 | if(!project->variables()["QMAKE_APP_OR_DLL"].isEmpty()) { |
213 | t << "\n\t" << "$(LINK) $(LFLAGS) /OUT:$(TARGET) @<< " << "\n\t " | 255 | t << "\n\t" << "$(LINK) $(LFLAGS) /OUT:$(TARGET) @<< " << "\n\t " |
214 | << "$(OBJECTS) $(OBJMOC) $(LIBS)"; | 256 | << "$(OBJECTS) $(OBJMOC) $(LIBS)"; |
215 | } else { | 257 | } else { |
216 | t << "\n\t" << "$(LIB) /OUT:$(TARGET) @<<" << "\n\t " | 258 | t << "\n\t" << "$(LIB) /OUT:$(TARGET) @<<" << "\n\t " |
217 | << "$(OBJECTS) $(OBJMOC)"; | 259 | << "$(OBJECTS) $(OBJMOC)"; |
218 | } | 260 | } |
261 | t << extraCompilerDeps; | ||
219 | t << endl << "<<" << endl; | 262 | t << endl << "<<" << endl; |
220 | if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() ) | 263 | if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() ) |
221 | t << "\t" << var( "QMAKE_POST_LINK" ) << endl; | 264 | t << "\t" << var( "QMAKE_POST_LINK" ) << endl; |
222 | if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) { | 265 | if(project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty()) { |
223 | QStringList dlldirs = project->variables()["DLLDESTDIR"]; | 266 | QStringList dlldirs = project->variables()["DLLDESTDIR"]; |
224 | for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) { | 267 | for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) { |
225 | t << "\n\t" << "-copy $(TARGET) " << *dlldir; | 268 | t << "\n\t" << "-$(COPY_FILE) \"$(TARGET)\" " << *dlldir; |
226 | } | 269 | } |
227 | } | 270 | } |
228 | QString targetfilename = project->variables()["TARGET"].first(); | 271 | QString targetfilename = project->variables()["TARGET"].first(); |
229 | if(project->isActiveConfig("activeqt")) { | 272 | if(project->isActiveConfig("activeqt")) { |
230 | QString version = project->variables()["VERSION"].first(); | 273 | QString version = project->variables()["VERSION"].first(); |
231 | if ( version.isEmpty() ) | 274 | if ( version.isEmpty() ) |
232 | version = "1.0"; | 275 | version = "1.0"; |
233 | 276 | ||
234 | if ( project->isActiveConfig("dll")) { | 277 | if ( project->isActiveConfig("dll")) { |
235 | t << "\n\t" << ("-$(IDC) $(TARGET) /idl tmp\\" + targetfilename + ".idl -version " + version); | 278 | t << "\n\t" << ("-$(IDC) $(TARGET) /idl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); |
236 | t << "\n\t" << ("-$(IDL) tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl"); | 279 | t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
237 | t << "\n\t" << ("-$(IDC) $(TARGET) /tlb tmp\\" + targetfilename + ".tlb"); | 280 | t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
238 | t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" ); | 281 | t << "\n\t" << ("-$(IDC) $(TARGET) /regserver" ); |
239 | } else { | 282 | } else { |
240 | t << "\n\t" << ("-$(TARGET) -dumpidl tmp\\" + targetfilename + ".idl -version " + version); | 283 | t << "\n\t" << ("-$(TARGET) -dumpidl " + var("OBJECTS_DIR") + targetfilename + ".idl -version " + version); |
241 | t << "\n\t" << ("-$(IDL) tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl"); | 284 | t << "\n\t" << ("-$(IDL) /nologo " + var("OBJECTS_DIR") + targetfilename + ".idl /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
242 | t << "\n\t" << ("-$(IDC) $(TARGET) /tlb tmp\\" + targetfilename + ".tlb"); | 285 | t << "\n\t" << ("-$(IDC) $(TARGET) /tlb " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
243 | t << "\n\t" << "-$(TARGET) -regserver"; | 286 | t << "\n\t" << "-$(TARGET) -regserver"; |
244 | } | 287 | } |
245 | } | 288 | } |
246 | t << endl << endl; | 289 | t << endl << endl; |
247 | 290 | ||
248 | if(!project->variables()["RC_FILE"].isEmpty()) { | 291 | if(!project->variables()["RC_FILE"].isEmpty()) { |
249 | t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t" | 292 | t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t" |
250 | << var("QMAKE_RC") << " " << var("RC_FILE") << endl << endl; | 293 | << var("QMAKE_RC") << " " << var("RC_FILE") << endl << endl; |
251 | } | 294 | } |
252 | 295 | ||
253 | t << "mocables: $(SRCMOC)" << endl << endl; | 296 | t << "mocables: $(SRCMOC)" << endl |
297 | << "uicables: $(UICIMPLS) $(UICDECLS)" << endl << endl; | ||
254 | 298 | ||
255 | writeMakeQmake(t); | 299 | writeMakeQmake(t); |
256 | 300 | ||
301 | QStringList dist_files = Option::mkfile::project_files; | ||
302 | if(!project->isEmpty("QMAKE_INTERNAL_INCLUDED_FILES")) | ||
303 | dist_files += project->variables()["QMAKE_INTERNAL_INCLUDED_FILES"]; | ||
304 | if(!project->isEmpty("TRANSLATIONS")) | ||
305 | dist_files << var("TRANSLATIONS"); | ||
306 | if(!project->isEmpty("FORMS")) { | ||
307 | QStringList &forms = project->variables()["FORMS"]; | ||
308 | for(QStringList::Iterator formit = forms.begin(); formit != forms.end(); ++formit) { | ||
309 | QString ui_h = fileFixify((*formit) + Option::h_ext.first()); | ||
310 | if(QFile::exists(ui_h) ) | ||
311 | dist_files << ui_h; | ||
312 | } | ||
313 | } | ||
257 | t << "dist:" << "\n\t" | 314 | t << "dist:" << "\n\t" |
258 | << "$(ZIP) " << var("PROJECT") << ".zip " | 315 | << "$(ZIP) " << var("QMAKE_ORIG_TARGET") << ".zip " << "$(SOURCES) $(HEADERS) $(DIST) $(FORMS) " |
259 | << var("PROJECT") << ".pro $(SOURCES) $(HEADERS) $(DIST) $(FORMS)" << endl << endl; | 316 | << dist_files.join(" ") << " " << var("TRANSLATIONS") << " " << var("IMAGES") << endl << endl; |
260 | 317 | ||
261 | t << "clean:" | 318 | t << "uiclean:" |
262 | << varGlue("OBJECTS","\n\t-del ","\n\t-del ","") | 319 | << varGlue("UICDECLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") |
263 | << varGlue("SRCMOC" ,"\n\t-del ","\n\t-del ","") | 320 | << varGlue("UICIMPLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << endl; |
264 | << varGlue("OBJMOC" ,"\n\t-del ","\n\t-del ","") | 321 | |
265 | << varGlue("UICDECLS" ,"\n\t-del ","\n\t-del ","") | 322 | t << "mocclean:" |
266 | << varGlue("UICIMPLS" ,"\n\t-del ","\n\t-del ","") | 323 | << varGlue("SRCMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") |
267 | << varGlue("QMAKE_CLEAN","\n\t-del ","\n\t-del ","") | 324 | << varGlue("OBJMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << endl; |
268 | << varGlue("CLEAN_FILES","\n\t-del ","\n\t-del ",""); | 325 | |
269 | 326 | t << "clean: uiclean mocclean" | |
327 | << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") | ||
328 | << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","\n") | ||
329 | << varGlue("CLEAN_FILES","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","\n"); | ||
270 | if ( project->isActiveConfig("activeqt")) { | 330 | if ( project->isActiveConfig("activeqt")) { |
271 | t << ("\n\t-del tmp\\" + targetfilename + ".*"); | 331 | t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".idl"); |
272 | t << "\n\t-del tmp\\dump.*"; | 332 | t << ("\n\t-$(DEL_FILE) " + var("OBJECTS_DIR") + targetfilename + ".tlb"); |
273 | } | 333 | } |
274 | if(!project->isEmpty("IMAGES")) | 334 | if(!project->isEmpty("IMAGES")) |
275 | t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-del ", "\n\t-del ", ""); | 335 | t << varGlue("QMAKE_IMAGE_COLLECTION", "\n\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", ""); |
336 | t << endl; | ||
337 | |||
338 | // user defined targets | ||
276 | 339 | ||
277 | // blasted user defined targets | 340 | QStringList::Iterator it; |
278 | QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"]; | 341 | QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"]; |
279 | for(QStringList::Iterator it = qut.begin(); it != qut.end(); ++it) { | 342 | for(it = qut.begin(); it != qut.end(); ++it) { |
280 | QString targ = var((*it) + ".target"), | 343 | QString targ = var((*it) + ".target"), |
281 | cmd = var((*it) + ".commands"), deps; | 344 | cmd = var((*it) + ".commands"), deps; |
282 | if(targ.isEmpty()) | 345 | if(targ.isEmpty()) |
283 | targ = (*it); | 346 | targ = (*it); |
284 | QStringList &deplist = project->variables()[(*it) + ".depends"]; | 347 | QStringList &deplist = project->variables()[(*it) + ".depends"]; |
285 | for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) { | 348 | for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) { |
286 | QString dep = var((*dep_it) + ".target"); | 349 | QString dep = var((*dep_it) + ".target"); |
287 | if(dep.isEmpty()) | 350 | if(dep.isEmpty()) |
288 | dep = (*dep_it); | 351 | dep = (*dep_it); |
289 | deps += " " + dep; | 352 | deps += " " + dep; |
290 | } | 353 | } |
354 | if(!project->variables()["QMAKE_NOFORCE"].isEmpty() && | ||
355 | project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1) | ||
356 | deps += QString(" ") + "FORCE"; | ||
291 | t << "\n\n" << targ << ":" << deps << "\n\t" | 357 | t << "\n\n" << targ << ":" << deps << "\n\t" |
292 | << cmd; | 358 | << cmd; |
293 | } | 359 | } |
294 | |||
295 | t << endl << endl; | 360 | t << endl << endl; |
296 | 361 | ||
362 | QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"]; | ||
363 | for(it = quc.begin(); it != quc.end(); ++it) { | ||
364 | QString tmp_out = project->variables()[(*it) + ".output"].first(); | ||
365 | QString tmp_cmd = project->variables()[(*it) + ".commands"].join(" "); | ||
366 | QString tmp_dep = project->variables()[(*it) + ".depends"].join(" "); | ||
367 | QStringList &vars = project->variables()[(*it) + ".variables"]; | ||
368 | if(tmp_out.isEmpty() || tmp_cmd.isEmpty()) | ||
369 | continue; | ||
370 | QStringList &tmp = project->variables()[(*it) + ".input"]; | ||
371 | for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) { | ||
372 | QStringList &inputs = project->variables()[(*it2)]; | ||
373 | for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) { | ||
374 | QFileInfo fi(Option::fixPathToLocalOS((*input))); | ||
375 | QString in = Option::fixPathToTargetOS((*input), FALSE), | ||
376 | out = tmp_out, cmd = tmp_cmd, deps; | ||
377 | out.replace("${QMAKE_FILE_BASE}", fi.baseName()); | ||
378 | out.replace("${QMAKE_FILE_NAME}", fi.fileName()); | ||
379 | cmd.replace("${QMAKE_FILE_BASE}", fi.baseName()); | ||
380 | cmd.replace("${QMAKE_FILE_OUT}", out); | ||
381 | cmd.replace("${QMAKE_FILE_NAME}", fi.fileName()); | ||
382 | for(QStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3) | ||
383 | cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")"); | ||
384 | if(!tmp_dep.isEmpty()) { | ||
385 | char buff[256]; | ||
386 | QString dep_cmd = tmp_dep; | ||
387 | dep_cmd.replace("${QMAKE_FILE_NAME}", fi.fileName()); | ||
388 | if(FILE *proc = QT_POPEN(dep_cmd.latin1(), "r")) { | ||
389 | while(!feof(proc)) { | ||
390 | int read_in = int(fread(buff, 1, 255, proc)); | ||
391 | if(!read_in) | ||
392 | break; | ||
393 | int l = 0; | ||
394 | for(int i = 0; i < read_in; i++) { | ||
395 | if(buff[i] == '\n' || buff[i] == ' ') { | ||
396 | deps += " " + QCString(buff+l, (i - l) + 1); | ||
397 | l = i; | ||
398 | } | ||
399 | } | ||
400 | } | ||
401 | fclose(proc); | ||
402 | } | ||
403 | } | ||
404 | t << out << ": " << in << deps << "\n\t" | ||
405 | << cmd << endl << endl; | ||
406 | } | ||
407 | } | ||
408 | } | ||
409 | t << endl; | ||
410 | |||
411 | if(project->variables()["QMAKE_NOFORCE"].isEmpty()) | ||
412 | t << "FORCE:" << endl << endl; | ||
413 | |||
297 | t << "distclean: clean" | 414 | t << "distclean: clean" |
298 | << "\n\t-del $(TARGET)" | 415 | << "\n\t-$(DEL_FILE) $(TARGET)" |
299 | << endl << endl; | 416 | << endl << endl; |
417 | |||
418 | // precompiled header | ||
419 | if(usePCH) { | ||
420 | QString precompRule = QString("-c -Yc -Fp%1 -Fo%2").arg(precompPch).arg(precompObj); | ||
421 | t << precompObj << ": " << precompH << " " << findDependencies(precompH).join(" \\\n\t\t") | ||
422 | << "\n\t" << "$(CXX) " + precompRule +" $(CXXFLAGS) $(INCPATH) -TP " << precompH << endl << endl; | ||
423 | } | ||
300 | } | 424 | } |
301 | 425 | ||
426 | QString | ||
427 | NmakeMakefileGenerator::var(const QString &value) | ||
428 | { | ||
429 | if (usePCH) { | ||
430 | if ((value == "QMAKE_RUN_CXX_IMP_BATCH" | ||
431 | || value == "QMAKE_RUN_CXX_IMP" | ||
432 | || value == "QMAKE_RUN_CXX")) { | ||
433 | QFileInfo precompHInfo(precompH); | ||
434 | QString precompRule = QString("-c -FI%1 -Yu%2 -Fp%3") | ||
435 | .arg(precompHInfo.fileName()) | ||
436 | .arg(precompHInfo.fileName()) | ||
437 | .arg(precompPch); | ||
438 | QString p = MakefileGenerator::var(value); | ||
439 | p.replace("-c", precompRule); | ||
440 | // Cannot use -Gm with -FI & -Yu, as this gives an | ||
441 | // internal compiler error, on the newer compilers | ||
442 | p.remove("-Gm"); | ||
443 | return p; | ||
444 | } else if (value == "QMAKE_CXXFLAGS") { | ||
445 | // Remove internal compiler error option | ||
446 | return MakefileGenerator::var(value).remove("-Gm"); | ||
447 | } | ||
448 | } | ||
449 | |||
450 | // Normal val | ||
451 | return MakefileGenerator::var(value); | ||
452 | } | ||
302 | 453 | ||
303 | void | 454 | void |
304 | NmakeMakefileGenerator::init() | 455 | NmakeMakefileGenerator::init() |
305 | { | 456 | { |
306 | if(init_flag) | 457 | if(init_flag) |
307 | return; | 458 | return; |
308 | init_flag = TRUE; | 459 | init_flag = TRUE; |
309 | 460 | ||
310 | /* this should probably not be here, but I'm using it to wrap the .t files */ | 461 | /* this should probably not be here, but I'm using it to wrap the .t files */ |
311 | if(project->first("TEMPLATE") == "app") | 462 | if(project->first("TEMPLATE") == "app") |
312 | project->variables()["QMAKE_APP_FLAG"].append("1"); | 463 | project->variables()["QMAKE_APP_FLAG"].append("1"); |
313 | else if(project->first("TEMPLATE") == "lib") | 464 | else if(project->first("TEMPLATE") == "lib") |
314 | project->variables()["QMAKE_LIB_FLAG"].append("1"); | 465 | project->variables()["QMAKE_LIB_FLAG"].append("1"); |
315 | else if(project->first("TEMPLATE") == "subdirs") { | 466 | else if(project->first("TEMPLATE") == "subdirs") { |
316 | MakefileGenerator::init(); | 467 | MakefileGenerator::init(); |
317 | if(project->variables()["MAKEFILE"].isEmpty()) | 468 | if(project->variables()["MAKEFILE"].isEmpty()) |
318 | project->variables()["MAKEFILE"].append("Makefile"); | 469 | project->variables()["MAKEFILE"].append("Makefile"); |
319 | if(project->variables()["QMAKE"].isEmpty()) | 470 | if(project->variables()["QMAKE"].isEmpty()) |
320 | project->variables()["QMAKE"].append("qmake"); | 471 | project->variables()["QMAKE"].append("qmake"); |
321 | return; | 472 | return; |
322 | } | 473 | } |
323 | 474 | ||
475 | if(project->isEmpty("QMAKE_INSTALL_FILE")) | ||
476 | project->variables()["QMAKE_INSTALL_FILE"].append("$(COPY_FILE)"); | ||
477 | if(project->isEmpty("QMAKE_INSTALL_DIR")) | ||
478 | project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); | ||
479 | |||
324 | bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); | 480 | bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); |
325 | project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; | 481 | project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; |
326 | 482 | ||
327 | QString targetfilename = project->variables()["TARGET"].first(); | 483 | QString targetfilename = project->variables()["TARGET"].first(); |
328 | QStringList &configs = project->variables()["CONFIG"]; | 484 | QStringList &configs = project->variables()["CONFIG"]; |
329 | if (project->isActiveConfig("qt") && project->isActiveConfig("shared")) | 485 | if (project->isActiveConfig("qt") && project->isActiveConfig("shared")) |
330 | project->variables()["DEFINES"].append("QT_DLL"); | 486 | project->variables()["DEFINES"].append("QT_DLL"); |
331 | if (project->isActiveConfig("qt_dll")) | 487 | if (project->isActiveConfig("qt_dll")) |
332 | if(configs.findIndex("qt") == -1) configs.append("qt"); | 488 | if(configs.findIndex("qt") == -1) configs.append("qt"); |
489 | if ( project->isActiveConfig("qtopia") ) { | ||
490 | if(configs.findIndex("qtopialib") == -1) | ||
491 | configs.append("qtopialib"); | ||
492 | if(configs.findIndex("qtopiainc") == -1) | ||
493 | configs.append("qtopiainc"); | ||
494 | } | ||
333 | if ( project->isActiveConfig("qt") ) { | 495 | if ( project->isActiveConfig("qt") ) { |
334 | if ( project->isActiveConfig( "plugin" ) ) { | 496 | if ( project->isActiveConfig( "plugin" ) ) { |
335 | project->variables()["CONFIG"].append("dll"); | 497 | project->variables()["CONFIG"].append("dll"); |
336 | if(project->isActiveConfig("qt")) | 498 | if(project->isActiveConfig("qt")) |
337 | project->variables()["DEFINES"].append("QT_PLUGIN"); | 499 | project->variables()["DEFINES"].append("QT_PLUGIN"); |
338 | } | 500 | } |
339 | if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) && | 501 | if ( (project->variables()["DEFINES"].findIndex("QT_NODLL") == -1) && |
340 | ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 || | 502 | ((project->variables()["DEFINES"].findIndex("QT_MAKEDLL") != -1 || |
341 | project->variables()["DEFINES"].findIndex("QT_DLL") != -1) || | 503 | project->variables()["DEFINES"].findIndex("QT_DLL") != -1) || |
342 | (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) { | 504 | (getenv("QT_DLL") && !getenv("QT_NODLL"))) ) { |
343 | project->variables()["QMAKE_QT_DLL"].append("1"); | 505 | project->variables()["QMAKE_QT_DLL"].append("1"); |
344 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) | 506 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) |
345 | project->variables()["CONFIG"].append("dll"); | 507 | project->variables()["CONFIG"].append("dll"); |
346 | } | 508 | } |
347 | if ( project->isActiveConfig("thread") ) | 509 | if ( project->isActiveConfig("thread") ) |
348 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); | 510 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); |
349 | if ( project->isActiveConfig("accessibility" ) ) | 511 | if ( project->isActiveConfig("accessibility" ) ) |
350 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); | 512 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); |
351 | if ( project->isActiveConfig("tablet") ) | 513 | if ( project->isActiveConfig("tablet") ) |
352 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT"); | 514 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT"); |
353 | } | 515 | } |
354 | if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { | 516 | if ( project->isActiveConfig("dll") || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { |
355 | project->variables()["CONFIG"].remove("staticlib"); | 517 | project->variables()["CONFIG"].remove("staticlib"); |
356 | project->variables()["QMAKE_APP_OR_DLL"].append("1"); | 518 | project->variables()["QMAKE_APP_OR_DLL"].append("1"); |
357 | } else { | 519 | } else { |
358 | project->variables()["CONFIG"].append("staticlib"); | 520 | project->variables()["CONFIG"].append("staticlib"); |
359 | } | 521 | } |
360 | if ( project->isActiveConfig("warn_off") ) { | 522 | if ( project->isActiveConfig("warn_off") ) { |
361 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_OFF"]; | 523 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_OFF"]; |
362 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_OFF"]; | 524 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_OFF"]; |
363 | } else if ( project->isActiveConfig("warn_on") ) { | 525 | } else if ( project->isActiveConfig("warn_on") ) { |
364 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_ON"]; | 526 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_WARN_ON"]; |
365 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"]; | 527 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"]; |
366 | } | 528 | } |
367 | if ( project->isActiveConfig("debug") ) { | 529 | if ( project->isActiveConfig("debug") ) { |
368 | if ( project->isActiveConfig("thread") ) { | 530 | if ( project->isActiveConfig("thread") ) { |
369 | // use the DLL RT even here | 531 | // use the DLL RT even here |
370 | if ( project->variables()["DEFINES"].contains("QT_DLL") ) { | 532 | if ( project->variables()["DEFINES"].contains("QT_DLL") ) { |
371 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLLDBG"]; | 533 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLLDBG"]; |
372 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"]; | 534 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"]; |
373 | } else { | 535 | } else { |
374 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DBG"]; | 536 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DBG"]; |
375 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"]; | 537 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DBG"]; |
376 | } | 538 | } |
377 | } | 539 | } |
378 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_DEBUG"]; | 540 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_DEBUG"]; |
379 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_DEBUG"]; | 541 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_DEBUG"]; |
380 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_DEBUG"]; | 542 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_DEBUG"]; |
381 | } else { | 543 | } else { |
382 | if ( project->isActiveConfig("thread") ) { | 544 | if ( project->isActiveConfig("thread") ) { |
383 | if ( project->variables()["DEFINES"].contains("QT_DLL") ) { | 545 | if ( project->variables()["DEFINES"].contains("QT_DLL") ) { |
384 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLL"]; | 546 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT_DLL"]; |
385 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"]; | 547 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT_DLL"]; |
386 | } else { | 548 | } else { |
387 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT"]; | 549 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_MT"]; |
388 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT"]; | 550 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_MT"]; |
389 | } | 551 | } |
390 | } | 552 | } |
391 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RELEASE"]; | 553 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RELEASE"]; |
392 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RELEASE"]; | 554 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RELEASE"]; |
393 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_RELEASE"]; | 555 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_RELEASE"]; |
394 | } | 556 | } |
395 | if ( project->isActiveConfig("thread") && !project->variables()["DEFINES"].contains("QT_DLL") | 557 | if ( project->isActiveConfig("thread") && !project->variables()["DEFINES"].contains("QT_DLL") |
396 | && !is_qt && project->first("TARGET") != "qtmain") { | 558 | && !is_qt && project->first("TARGET") != "qtmain") { |
397 | project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:\"libc\""); | 559 | project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:\"libc\""); |
398 | } | 560 | } |
399 | 561 | ||
400 | if ( !project->variables()["QMAKE_INCDIR"].isEmpty()) | 562 | if ( !project->variables()["QMAKE_INCDIR"].isEmpty()) |
401 | project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"]; | 563 | project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"]; |
402 | if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") ) | 564 | if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") ) |
403 | project->variables()["CONFIG"].append("windows"); | 565 | project->variables()["CONFIG"].append("windows"); |
566 | if ( project->isActiveConfig("qtopiainc") ) | ||
567 | project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"]; | ||
568 | if ( project->isActiveConfig("qtopialib") ) { | ||
569 | if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA")) | ||
570 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QTOPIA"]; | ||
571 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"]; | ||
572 | } | ||
404 | if ( project->isActiveConfig("qt") ) { | 573 | if ( project->isActiveConfig("qt") ) { |
405 | project->variables()["CONFIG"].append("moc"); | 574 | project->variables()["CONFIG"].append("moc"); |
406 | project->variables()["INCLUDEPATH"] +=project->variables()["QMAKE_INCDIR_QT"]; | 575 | project->variables()["INCLUDEPATH"] +=project->variables()["QMAKE_INCDIR_QT"]; |
407 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"]; | 576 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"]; |
408 | if ( !project->isActiveConfig("debug") ) | 577 | if ( !project->isActiveConfig("debug") ) |
409 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG"); | 578 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG"); |
410 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { | 579 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { |
411 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) { | 580 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) { |
412 | project->variables()["DEFINES"].append("QT_MAKEDLL"); | 581 | project->variables()["DEFINES"].append("QT_MAKEDLL"); |
413 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_QT_DLL"]; | 582 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_QT_DLL"]; |
414 | } | 583 | } |
415 | } else { | 584 | } else { |
416 | if(project->isActiveConfig("thread")) | 585 | if(project->isActiveConfig("thread")) |
417 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; | 586 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; |
418 | else | 587 | else |
419 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; | 588 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; |
420 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { | 589 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { |
421 | int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt"); | 590 | int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt"); |
422 | if ( hver == -1 ) | 591 | if ( hver == -1 ) |
423 | hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt"); | 592 | hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt"); |
424 | if(hver != -1) { | 593 | if(hver != -1) { |
425 | QString ver; | 594 | QString ver; |
426 | ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver); | 595 | ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver); |
427 | QStringList &libs = project->variables()["QMAKE_LIBS"]; | 596 | QStringList &libs = project->variables()["QMAKE_LIBS"]; |
428 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) | 597 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) |
429 | (*libit).replace(QRegExp("qt(-mt)?\\.lib"), ver); | 598 | (*libit).replace(QRegExp("qt(-mt)?\\.lib"), ver); |
430 | } | 599 | } |
431 | } | 600 | } |
432 | if ( project->isActiveConfig( "activeqt" ) ) { | 601 | if ( project->isActiveConfig( "activeqt" ) ) { |
433 | project->variables().remove("QMAKE_LIBS_QT_ENTRY"); | 602 | project->variables().remove("QMAKE_LIBS_QT_ENTRY"); |
434 | project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib"; | 603 | project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib"; |
435 | if ( project->isActiveConfig( "dll" ) ) | 604 | if ( project->isActiveConfig( "dll" ) ) |
436 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; | 605 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; |
437 | } | 606 | } |
438 | if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { | 607 | if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { |
439 | project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"]; | 608 | project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"]; |
440 | } | 609 | } |
441 | } | 610 | } |
442 | } | 611 | } |
443 | if ( project->isActiveConfig("opengl") ) { | 612 | if ( project->isActiveConfig("opengl") ) { |
444 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"]; | 613 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"]; |
445 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"]; | 614 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"]; |
446 | } | 615 | } |
447 | if ( project->isActiveConfig("dll") ) { | 616 | if ( project->isActiveConfig("dll") ) { |
448 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE_DLL"]; | 617 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE_DLL"]; |
449 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE_DLL"]; | 618 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE_DLL"]; |
450 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"]; | 619 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"]; |
451 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"]; | 620 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"]; |
452 | if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty()) { | 621 | if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty()) { |
453 | project->variables()["TARGET_EXT"].append( | 622 | project->variables()["TARGET_EXT"].append( |
454 | QStringList::split('.',project->first("VERSION")).join("") + ".dll"); | 623 | QStringList::split('.',project->first("VERSION")).join("") + ".dll"); |
455 | } else { | 624 | } else { |
456 | project->variables()["TARGET_EXT"].append(".dll"); | 625 | project->variables()["TARGET_EXT"].append(".dll"); |
457 | } | 626 | } |
458 | } else { | 627 | } else { |
459 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"]; | 628 | project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"]; |
460 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE"]; | 629 | project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CXXFLAGS_CONSOLE"]; |
461 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE"]; | 630 | project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE"]; |
462 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS"]; | 631 | project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS"]; |
463 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty()) { | 632 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty()) { |
464 | project->variables()["TARGET_EXT"].append(".exe"); | 633 | project->variables()["TARGET_EXT"].append(".exe"); |
465 | } else { | 634 | } else { |
466 | project->variables()["TARGET_EXT"].append(".lib"); | 635 | project->variables()["TARGET_EXT"].append(".lib"); |
467 | } | 636 | } |
468 | } | 637 | } |
469 | if ( project->isActiveConfig("windows") ) { | 638 | if ( project->isActiveConfig("windows") ) { |
470 | if ( project->isActiveConfig("console") ) { | 639 | if ( project->isActiveConfig("console") ) { |
471 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; | 640 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; |
472 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; | 641 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; |
473 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; | 642 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; |
474 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; | 643 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; |
475 | } else { | 644 | } else { |
476 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"]; | 645 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"]; |
477 | } | 646 | } |
478 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"]; | 647 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"]; |
479 | } else { | 648 | } else { |
480 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; | 649 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"]; |
481 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; | 650 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_CONSOLE_ANY"]; |
482 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; | 651 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"]; |
483 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; | 652 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_CONSOLE"]; |
484 | } | 653 | } |
485 | if ( project->isActiveConfig("stl") ) { | 654 | if ( project->isActiveConfig("stl") ) { |
486 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"]; | 655 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"]; |
487 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"]; | 656 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"]; |
488 | } else { | 657 | } else { |
489 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"]; | 658 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"]; |
490 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"]; | 659 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"]; |
491 | } | 660 | } |
492 | if ( project->isActiveConfig("exceptions") ) { | 661 | if ( project->isActiveConfig("exceptions") ) { |
493 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"]; | 662 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"]; |
494 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"]; | 663 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"]; |
495 | } else { | 664 | } else { |
496 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"]; | 665 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"]; |
497 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"]; | 666 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"]; |
498 | } | 667 | } |
499 | if ( project->isActiveConfig("rtti") ) { | 668 | if ( project->isActiveConfig("rtti") ) { |
500 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"]; | 669 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"]; |
501 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"]; | 670 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"]; |
502 | } else { | 671 | } else { |
503 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"]; | 672 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"]; |
504 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"]; | 673 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"]; |
505 | } | 674 | } |
506 | 675 | ||
507 | 676 | ||
508 | if ( project->isActiveConfig("moc") ) | 677 | if ( project->isActiveConfig("moc") ) |
509 | setMocAware(TRUE); | 678 | setMocAware(TRUE); |
510 | project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"]; | 679 | project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"]; |
680 | |||
681 | QStringList &libList = project->variables()["QMAKE_LIBS"]; | ||
682 | for( QStringList::Iterator stIt = libList.begin(); stIt != libList.end(); ) { | ||
683 | QString s = *stIt; | ||
684 | if( s.startsWith( "-l" ) ) { | ||
685 | stIt = libList.remove( stIt ); | ||
686 | stIt = libList.insert( stIt, s.mid( 2 ) + ".lib" ); | ||
687 | } else if( s.startsWith( "-L" ) ) { | ||
688 | stIt = libList.remove( stIt ); | ||
689 | project->variables()["QMAKE_LIBDIR"].append(QDir::convertSeparators(s.mid( 2 ))); | ||
690 | } else { | ||
691 | stIt++; | ||
692 | } | ||
693 | } | ||
694 | |||
511 | project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ', | 695 | project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ', |
512 | "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH"); | 696 | "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH"); |
513 | QStringList &l = project->variables()["QMAKE_FILETAGS"]; | 697 | QStringList &l = project->variables()["QMAKE_FILETAGS"]; |
514 | for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) { | 698 | QStringList::Iterator it; |
699 | for(it = l.begin(); it != l.end(); ++it) { | ||
515 | QStringList &gdmf = project->variables()[(*it)]; | 700 | QStringList &gdmf = project->variables()[(*it)]; |
516 | for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner) | 701 | for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner) |
517 | (*inner) = Option::fixPathToTargetOS((*inner), FALSE); | 702 | (*inner) = Option::fixPathToTargetOS((*inner), FALSE); |
518 | } | 703 | } |
519 | 704 | ||
520 | if ( !project->variables()["DEF_FILE"].isEmpty() ) | 705 | if ( !project->variables()["DEF_FILE"].isEmpty() ) |
521 | project->variables()["QMAKE_LFLAGS"].append(QString("/DEF:") + project->first("DEF_FILE")); | 706 | project->variables()["QMAKE_LFLAGS"].append(QString("/DEF:") + project->first("DEF_FILE")); |
522 | if(!project->isActiveConfig("incremental")) | 707 | if(!project->isActiveConfig("incremental")) |
523 | project->variables()["QMAKE_LFLAGS"].append(QString("/incremental:no")); | 708 | project->variables()["QMAKE_LFLAGS"].append(QString("/incremental:no")); |
524 | 709 | ||
525 | if ( !project->variables()["VERSION"].isEmpty() ) { | 710 | if ( !project->variables()["VERSION"].isEmpty() ) { |
526 | QString version = project->variables()["VERSION"][0]; | 711 | QString version = project->variables()["VERSION"][0]; |
527 | int firstDot = version.find( "." ); | 712 | int firstDot = version.find( "." ); |
528 | QString major = version.left( firstDot ); | 713 | QString major = version.left( firstDot ); |
529 | QString minor = version.right( version.length() - firstDot - 1 ); | 714 | QString minor = version.right( version.length() - firstDot - 1 ); |
530 | minor.replace( ".", "" ); | 715 | minor.replace( ".", "" ); |
531 | project->variables()["QMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor ); | 716 | project->variables()["QMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor ); |
532 | } | 717 | } |
533 | if ( !project->variables()["RC_FILE"].isEmpty()) { | 718 | if ( !project->variables()["RC_FILE"].isEmpty()) { |
534 | if ( !project->variables()["RES_FILE"].isEmpty()) { | 719 | if ( !project->variables()["RES_FILE"].isEmpty()) { |
535 | fprintf(stderr, "Both .rc and .res file specified.\n"); | 720 | fprintf(stderr, "Both .rc and .res file specified.\n"); |
536 | fprintf(stderr, "Please specify one of them, not both."); | 721 | fprintf(stderr, "Please specify one of them, not both."); |
537 | exit(666); | 722 | exit(666); |
538 | } | 723 | } |
539 | project->variables()["RES_FILE"] = project->variables()["RC_FILE"]; | 724 | project->variables()["RES_FILE"] = project->variables()["RC_FILE"]; |
540 | project->variables()["RES_FILE"].first().replace(".rc",".res"); | 725 | project->variables()["RES_FILE"].first().replace(".rc",".res"); |
541 | project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"]; | 726 | project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"]; |
727 | project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"]; | ||
542 | } | 728 | } |
543 | if ( !project->variables()["RES_FILE"].isEmpty()) | 729 | if ( !project->variables()["RES_FILE"].isEmpty()) |
544 | project->variables()["QMAKE_LIBS"] += project->variables()["RES_FILE"]; | 730 | project->variables()["QMAKE_LIBS"] += project->variables()["RES_FILE"]; |
545 | 731 | ||
732 | // Base class init! | ||
546 | MakefileGenerator::init(); | 733 | MakefileGenerator::init(); |
734 | |||
735 | // Setup PCH variables | ||
736 | precompH = project->first("PRECOMPILED_HEADER"); | ||
737 | usePCH = !precompH.isEmpty() && project->isActiveConfig("precompile_header"); | ||
738 | if (usePCH) { | ||
739 | // Created files | ||
740 | precompObj = var("OBJECTS_DIR") + project->first("TARGET") + "_pch" + Option::obj_ext; | ||
741 | precompPch = var("OBJECTS_DIR") + project->first("TARGET") + "_pch.pch"; | ||
742 | // Add linking of precompObj (required for whole precompiled classes) | ||
743 | project->variables()["OBJECTS"] += precompObj; | ||
744 | // Add pch file to cleanup | ||
745 | project->variables()["QMAKE_CLEAN"] += precompPch; | ||
746 | // Return to variable pool | ||
747 | project->variables()["PRECOMPILED_OBJECT"] = precompObj; | ||
748 | project->variables()["PRECOMPILED_PCH"] = precompPch; | ||
749 | } | ||
750 | |||
547 | if ( !project->variables()["VERSION"].isEmpty()) { | 751 | if ( !project->variables()["VERSION"].isEmpty()) { |
548 | QStringList l = QStringList::split('.', project->first("VERSION")); | 752 | QStringList l = QStringList::split('.', project->first("VERSION")); |
549 | project->variables()["VER_MAJ"].append(l[0]); | 753 | project->variables()["VER_MAJ"].append(l[0]); |
550 | project->variables()["VER_MIN"].append(l[1]); | 754 | project->variables()["VER_MIN"].append(l[1]); |
551 | } | 755 | } |
552 | 756 | ||
553 | QString version = QStringList::split('.', project->first("VERSION")).join(""); | 757 | QString version = QStringList::split('.', project->first("VERSION")).join(""); |
554 | if(project->isActiveConfig("dll")) { | 758 | if(project->isActiveConfig("dll")) { |
555 | project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + version + ".exp"); | 759 | project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + version + ".exp"); |
556 | } | 760 | } |
557 | if(project->isActiveConfig("debug")) { | 761 | if(project->isActiveConfig("debug")) { |
558 | project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + version + ".pdb"); | 762 | project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + version + ".pdb"); |
559 | project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + version + ".ilk"); | 763 | project->variables()["QMAKE_CLEAN"].append(project->first("DESTDIR") + project->first("TARGET") + version + ".ilk"); |
560 | project->variables()["QMAKE_CLEAN"].append("vc*.pdb"); | 764 | project->variables()["QMAKE_CLEAN"].append("vc*.pdb"); |
765 | project->variables()["QMAKE_CLEAN"].append("vc*.idb"); | ||
766 | } | ||
767 | |||
768 | QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"]; | ||
769 | for(it = quc.begin(); it != quc.end(); ++it) { | ||
770 | QString tmp_out = project->variables()[(*it) + ".output"].first(); | ||
771 | if(tmp_out.isEmpty()) | ||
772 | continue; | ||
773 | QStringList &tmp = project->variables()[(*it) + ".input"]; | ||
774 | for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) { | ||
775 | QStringList &inputs = project->variables()[(*it2)]; | ||
776 | for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) { | ||
777 | QFileInfo fi(Option::fixPathToLocalOS((*input))); | ||
778 | QString in = Option::fixPathToTargetOS((*input), FALSE), | ||
779 | out = tmp_out; | ||
780 | out.replace("${QMAKE_FILE_BASE}", fi.baseName()); | ||
781 | out.replace("${QMAKE_FILE_NAME}", fi.fileName()); | ||
782 | if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1) | ||
783 | project->variables()["OBJCOMP"] += out; | ||
784 | } | ||
785 | } | ||
561 | } | 786 | } |
562 | } | 787 | } |
diff --git a/qmake/generators/win32/msvc_nmake.h b/qmake/generators/win32/msvc_nmake.h index 579fc35..f2996cd 100644 --- a/qmake/generators/win32/msvc_nmake.h +++ b/qmake/generators/win32/msvc_nmake.h | |||
@@ -1,59 +1,64 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of ________ class. | 4 | ** Definition of NmakeMakefileGenerator class. |
5 | ** | 5 | ** |
6 | ** Created : 970521 | 6 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. | 8 | ** This file is part of qmake. |
9 | ** | ||
10 | ** This file is part of the network module of the Qt GUI Toolkit. | ||
11 | ** | 9 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 13 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 14 | ** This file may be distributed and/or modified under the terms of the |
17 | ** GNU General Public License version 2 as published by the Free Software | 15 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 17 | ** packaging of this file. |
20 | ** | 18 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
22 | ** file in accordance with the Qt Commercial License Agreement provided | 20 | ** file in accordance with the Qt Commercial License Agreement provided |
23 | ** with the Software. | 21 | ** with the Software. |
24 | ** | 22 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 25 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 30 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 32 | ** not clear to you. |
35 | ** | 33 | ** |
36 | **********************************************************************/ | 34 | **********************************************************************/ |
35 | |||
37 | #ifndef __MSVC_NMAKE_H__ | 36 | #ifndef __MSVC_NMAKE_H__ |
38 | #define __MSVC_NMAKE_H__ | 37 | #define __MSVC_NMAKE_H__ |
39 | 38 | ||
40 | #include "winmakefile.h" | 39 | #include "winmakefile.h" |
41 | 40 | ||
42 | class NmakeMakefileGenerator : public Win32MakefileGenerator | 41 | class NmakeMakefileGenerator : public Win32MakefileGenerator |
43 | { | 42 | { |
44 | bool init_flag; | 43 | bool init_flag; |
45 | void writeNmakeParts(QTextStream &); | 44 | void writeNmakeParts(QTextStream &); |
46 | 45 | ||
47 | bool writeMakefile(QTextStream &); | 46 | bool writeMakefile(QTextStream &); |
48 | void init(); | 47 | void init(); |
49 | 48 | ||
49 | protected: | ||
50 | QStringList &findDependencies(const QString &file); | ||
51 | QString var(const QString &value); | ||
52 | QString precompH, precompObj, precompPch; | ||
53 | bool usePCH; | ||
54 | |||
50 | public: | 55 | public: |
51 | NmakeMakefileGenerator(QMakeProject *p); | 56 | NmakeMakefileGenerator(QMakeProject *p); |
52 | ~NmakeMakefileGenerator(); | 57 | ~NmakeMakefileGenerator(); |
53 | 58 | ||
54 | }; | 59 | }; |
55 | 60 | ||
56 | inline NmakeMakefileGenerator::~NmakeMakefileGenerator() | 61 | inline NmakeMakefileGenerator::~NmakeMakefileGenerator() |
57 | { } | 62 | { } |
58 | 63 | ||
59 | #endif /* __MSVC_NMAKE_H__ */ | 64 | #endif /* __MSVC_NMAKE_H__ */ |
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 7ffe4f7..a672c2d 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp | |||
@@ -1,150 +1,136 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of ________ class. | 4 | ** Implementation of VCProject class. |
5 | ** | 5 | ** |
6 | ** Copyright (C) 2002 Trolltech AS. All rights reserved. | 6 | ** Copyright (C) 2002-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** This file is part of the network module of the Qt GUI Toolkit. | 8 | ** This file is part of qmake. |
9 | ** | 9 | ** |
10 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
11 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
12 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
13 | ** | 13 | ** |
14 | ** This file may be distributed and/or modified under the terms of the | 14 | ** This file may be distributed and/or modified under the terms of the |
15 | ** GNU General Public License version 2 as published by the Free Software | 15 | ** GNU General Public License version 2 as published by the Free Software |
16 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
17 | ** packaging of this file. | 17 | ** packaging of this file. |
18 | ** | 18 | ** |
19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
20 | ** file in accordance with the Qt Commercial License Agreement provided | 20 | ** file in accordance with the Qt Commercial License Agreement provided |
21 | ** with the Software. | 21 | ** with the Software. |
22 | ** | 22 | ** |
23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
25 | ** | 25 | ** |
26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
27 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
30 | ** | 30 | ** |
31 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
32 | ** not clear to you. | 32 | ** not clear to you. |
33 | ** | 33 | ** |
34 | **********************************************************************/ | 34 | **********************************************************************/ |
35 | 35 | ||
36 | #include "msvc_objectmodel.h" | 36 | #include "msvc_objectmodel.h" |
37 | #include "msvc_vcproj.h" | 37 | #include "msvc_vcproj.h" |
38 | #include <qtextstream.h> | 38 | #include <qtextstream.h> |
39 | #include <qstringlist.h> | 39 | #include <qstringlist.h> |
40 | #include <quuid.h> | 40 | #include <qfileinfo.h> |
41 | |||
42 | #if defined(Q_OS_WIN32) | ||
43 | #include <objbase.h> | ||
44 | #ifndef GUID_DEFINED | ||
45 | #define GUID_DEFINED | ||
46 | typedef struct _GUID | ||
47 | { | ||
48 | ulong Data1; | ||
49 | ushort Data2; | ||
50 | ushort Data3; | ||
51 | uchar Data4[8]; | ||
52 | } GUID; | ||
53 | #endif | ||
54 | #endif | ||
55 | 41 | ||
56 | // XML Tags --------------------------------------------------------- | 42 | // XML Tags --------------------------------------------------------- |
57 | const char* _xmlInit = "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>"; | 43 | const char* _xmlInit = "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>"; |
58 | const char* _begConfiguration = "\n\t\t<Configuration"; | 44 | const char* _begConfiguration = "\n\t\t<Configuration"; |
59 | const char* _begConfigurations = "\n\t<Configurations>"; | 45 | const char* _begConfigurations = "\n\t<Configurations>"; |
60 | const char* _begFile = "\n\t\t\t<File"; | 46 | const char* _begFile = "\n\t\t\t<File"; |
61 | const char* _begFileConfiguration = "\n\t\t\t\t<FileConfiguration"; | 47 | const char* _begFileConfiguration = "\n\t\t\t\t<FileConfiguration"; |
62 | const char* _begFiles = "\n\t<Files>"; | 48 | const char* _begFiles = "\n\t<Files>"; |
63 | const char* _begFilter = "\n\t\t<Filter"; | 49 | const char* _begFilter = "\n\t\t<Filter"; |
64 | const char* _begGlobals = "\n\t<Globals>"; | 50 | const char* _begGlobals = "\n\t<Globals>"; |
65 | const char* _begPlatform = "\n\t\t<Platform"; | 51 | const char* _begPlatform = "\n\t\t<Platform"; |
66 | const char* _begPlatforms = "\n\t<Platforms>"; | 52 | const char* _begPlatforms = "\n\t<Platforms>"; |
67 | const char* _begTool3 = "\n\t\t\t<Tool"; | 53 | const char* _begTool3 = "\n\t\t\t<Tool"; |
68 | const char* _begTool5 = "\n\t\t\t\t\t<Tool"; | 54 | const char* _begTool5 = "\n\t\t\t\t\t<Tool"; |
69 | const char* _begVisualStudioProject = "\n<VisualStudioProject"; | 55 | const char* _begVisualStudioProject = "\n<VisualStudioProject"; |
70 | const char* _endConfiguration = "\n\t\t</Configuration>"; | 56 | const char* _endConfiguration = "\n\t\t</Configuration>"; |
71 | const char* _endConfigurations = "\n\t</Configurations>"; | 57 | const char* _endConfigurations = "\n\t</Configurations>"; |
72 | const char* _endFile = "\n\t\t\t</File>"; | 58 | const char* _endFile = "\n\t\t\t</File>"; |
73 | const char* _endFileConfiguration = "\n\t\t\t\t</FileConfiguration>"; | 59 | const char* _endFileConfiguration = "\n\t\t\t\t</FileConfiguration>"; |
74 | const char* _endFiles = "\n\t</Files>"; | 60 | const char* _endFiles = "\n\t</Files>"; |
75 | const char* _endFilter = "\n\t\t</Filter>"; | 61 | const char* _endFilter = "\n\t\t</Filter>"; |
76 | const char* _endGlobals = "\n\t</Globals>"; | 62 | const char* _endGlobals = "\n\t</Globals>"; |
77 | const char* _endPlatforms = "\n\t</Platforms>"; | 63 | const char* _endPlatforms = "\n\t</Platforms>"; |
78 | const char* _endVisualStudioProject = "\n</VisualStudioProject>"; | 64 | const char* _endVisualStudioProject = "\n</VisualStudioProject>"; |
79 | 65 | ||
80 | // XML Properties --------------------------------------------------- | 66 | // XML Properties --------------------------------------------------- |
81 | const char* _AddModuleNamesToAssembly = "\n\t\t\t\tAddModuleNamesToAssembly=\""; | 67 | const char* _AddModuleNamesToAssembly = "\n\t\t\t\tAddModuleNamesToAssembly=\""; |
82 | const char* _AdditionalDependencies4 = "\n\t\t\t\tAdditionalDependencies=\""; | 68 | const char* _AdditionalDependencies4 = "\n\t\t\t\tAdditionalDependencies=\""; |
83 | const char* _AdditionalDependencies6 = "\n\t\t\t\t\t\tAdditionalDependencies=\""; | 69 | const char* _AdditionalDependencies6 = "\n\t\t\t\t\t\tAdditionalDependencies=\""; |
84 | const char* _AdditionalIncludeDirectories = "\n\t\t\t\tAdditionalIncludeDirectories=\""; | 70 | const char* _AdditionalIncludeDirectories = "\n\t\t\t\tAdditionalIncludeDirectories=\""; |
85 | const char* _AdditionalLibraryDirectories = "\n\t\t\t\tAdditionalLibraryDirectories=\""; | 71 | const char* _AdditionalLibraryDirectories = "\n\t\t\t\tAdditionalLibraryDirectories=\""; |
86 | const char* _AdditionalOptions = "\n\t\t\t\tAdditionalOptions=\""; | 72 | const char* _AdditionalOptions = "\n\t\t\t\tAdditionalOptions=\""; |
87 | const char* _AdditionalUsingDirectories = "\n\t\t\t\tAdditionalUsingDirectories=\""; | 73 | const char* _AdditionalUsingDirectories = "\n\t\t\t\tAdditionalUsingDirectories=\""; |
88 | const char* _AssemblerListingLocation = "\n\t\t\t\tAssemblerListingLocation=\""; | 74 | const char* _AssemblerListingLocation = "\n\t\t\t\tAssemblerListingLocation=\""; |
89 | const char* _AssemblerOutput = "\n\t\t\t\tAssemblerOutput=\""; | 75 | const char* _AssemblerOutput = "\n\t\t\t\tAssemblerOutput=\""; |
90 | const char* _ATLMinimizesCRunTimeLibraryUsage= "\n\t\t\tATLMinimizesCRunTimeLibraryUsage=\""; | 76 | const char* _ATLMinimizesCRunTimeLibraryUsage= "\n\t\t\tATLMinimizesCRunTimeLibraryUsage=\""; |
91 | const char* _BaseAddress = "\n\t\t\t\tBaseAddress=\""; | 77 | const char* _BaseAddress = "\n\t\t\t\tBaseAddress=\""; |
92 | const char* _BasicRuntimeChecks = "\n\t\t\t\tBasicRuntimeChecks=\""; | 78 | const char* _BasicRuntimeChecks = "\n\t\t\t\tBasicRuntimeChecks=\""; |
93 | const char* _BrowseInformation = "\n\t\t\t\tBrowseInformation=\""; | 79 | const char* _BrowseInformation = "\n\t\t\t\tBrowseInformation=\""; |
94 | const char* _BrowseInformationFile = "\n\t\t\t\tBrowseInformationFile=\""; | 80 | const char* _BrowseInformationFile = "\n\t\t\t\tBrowseInformationFile=\""; |
95 | const char* _BufferSecurityCheck = "\n\t\t\t\tBufferSecurityCheck=\""; | 81 | const char* _BufferSecurityCheck = "\n\t\t\t\tBufferSecurityCheck=\""; |
96 | const char* _BuildBrowserInformation = "\n\t\t\tBuildBrowserInformation=\""; | 82 | const char* _BuildBrowserInformation = "\n\t\t\tBuildBrowserInformation=\""; |
97 | const char* _CPreprocessOptions = "\n\t\t\t\tCPreprocessOptions=\""; | 83 | const char* _CPreprocessOptions = "\n\t\t\t\tCPreprocessOptions=\""; |
98 | const char* _CallingConvention = "\n\t\t\t\tCallingConvention=\""; | 84 | const char* _CallingConvention = "\n\t\t\t\tCallingConvention=\""; |
99 | const char* _CharacterSet = "\n\t\t\tCharacterSet=\""; | 85 | const char* _CharacterSet = "\n\t\t\tCharacterSet=\""; |
100 | const char* _CommandLine4 = "\n\t\t\t\tCommandLine=\""; | 86 | const char* _CommandLine4 = "\n\t\t\t\tCommandLine=\""; |
101 | const char* _CommandLine6 = "\n\t\t\t\t\t\tCommandLine=\""; | 87 | const char* _CommandLine6 = "\n\t\t\t\t\t\tCommandLine=\""; |
102 | const char* _CompileAs = "\n\t\t\t\tCompileAs=\""; | 88 | const char* _CompileAs = "\n\t\t\t\tCompileAs=\""; |
103 | const char* _CompileAsManaged = "\n\t\t\t\tCompileAsManaged=\""; | 89 | const char* _CompileAsManaged = "\n\t\t\t\tCompileAsManaged=\""; |
104 | const char* _CompileOnly = "\n\t\t\t\tCompileOnly=\""; | 90 | const char* _CompileOnly = "\n\t\t\t\tCompileOnly=\""; |
105 | const char* _ConfigurationType = "\n\t\t\tConfigurationType=\""; | 91 | const char* _ConfigurationType = "\n\t\t\tConfigurationType=\""; |
106 | const char* _Culture = "\n\t\t\t\tCulture=\""; | 92 | const char* _Culture = "\n\t\t\t\tCulture=\""; |
107 | const char* _DLLDataFileName = "\n\t\t\t\tDLLDataFileName=\""; | 93 | const char* _DLLDataFileName = "\n\t\t\t\tDLLDataFileName=\""; |
108 | const char* _DebugInformationFormat = "\n\t\t\t\tDebugInformationFormat=\""; | 94 | const char* _DebugInformationFormat = "\n\t\t\t\tDebugInformationFormat=\""; |
109 | const char* _DefaultCharIsUnsigned = "\n\t\t\t\tDefaultCharIsUnsigned=\""; | 95 | const char* _DefaultCharIsUnsigned = "\n\t\t\t\tDefaultCharIsUnsigned=\""; |
110 | const char* _DefaultCharType = "\n\t\t\t\tDefaultCharType=\""; | 96 | const char* _DefaultCharType = "\n\t\t\t\tDefaultCharType=\""; |
111 | const char* _DelayLoadDLLs = "\n\t\t\t\tDelayLoadDLLs=\""; | 97 | const char* _DelayLoadDLLs = "\n\t\t\t\tDelayLoadDLLs=\""; |
112 | const char* _DeleteExtensionsOnClean = "\n\t\t\tDeleteExtensionsOnClean=\""; | 98 | const char* _DeleteExtensionsOnClean = "\n\t\t\tDeleteExtensionsOnClean=\""; |
113 | const char* _Description4 = "\n\t\t\t\tDescription=\""; | 99 | const char* _Description4 = "\n\t\t\t\tDescription=\""; |
114 | const char* _Description6 = "\n\t\t\t\t\t\tDescription=\""; | 100 | const char* _Description6 = "\n\t\t\t\t\t\tDescription=\""; |
115 | const char* _Detect64BitPortabilityProblems = "\n\t\t\t\tDetect64BitPortabilityProblems=\""; | 101 | const char* _Detect64BitPortabilityProblems = "\n\t\t\t\tDetect64BitPortabilityProblems=\""; |
116 | const char* _DisableLanguageExtensions = "\n\t\t\t\tDisableLanguageExtensions=\""; | 102 | const char* _DisableLanguageExtensions = "\n\t\t\t\tDisableLanguageExtensions=\""; |
117 | const char* _DisableSpecificWarnings = "\n\t\t\t\tDisableSpecificWarnings=\""; | 103 | const char* _DisableSpecificWarnings = "\n\t\t\t\tDisableSpecificWarnings=\""; |
118 | const char* _EnableCOMDATFolding = "\n\t\t\t\tEnableCOMDATFolding=\""; | 104 | const char* _EnableCOMDATFolding = "\n\t\t\t\tEnableCOMDATFolding=\""; |
119 | const char* _EnableErrorChecks = "\n\t\t\t\tEnableErrorChecks=\""; | 105 | const char* _EnableErrorChecks = "\n\t\t\t\tEnableErrorChecks=\""; |
120 | const char* _EnableFiberSafeOptimizations = "\n\t\t\t\tEnableFiberSafeOptimizations=\""; | 106 | const char* _EnableFiberSafeOptimizations = "\n\t\t\t\tEnableFiberSafeOptimizations=\""; |
121 | const char* _EnableFunctionLevelLinking = "\n\t\t\t\tEnableFunctionLevelLinking=\""; | 107 | const char* _EnableFunctionLevelLinking = "\n\t\t\t\tEnableFunctionLevelLinking=\""; |
122 | const char* _EnableIntrinsicFunctions = "\n\t\t\t\tEnableIntrinsicFunctions=\""; | 108 | const char* _EnableIntrinsicFunctions = "\n\t\t\t\tEnableIntrinsicFunctions=\""; |
123 | const char* _EntryPointSymbol = "\n\t\t\t\tEntryPointSymbol=\""; | 109 | const char* _EntryPointSymbol = "\n\t\t\t\tEntryPointSymbol=\""; |
124 | const char* _ErrorCheckAllocations = "\n\t\t\t\tErrorCheckAllocations=\""; | 110 | const char* _ErrorCheckAllocations = "\n\t\t\t\tErrorCheckAllocations=\""; |
125 | const char* _ErrorCheckBounds = "\n\t\t\t\tErrorCheckBounds=\""; | 111 | const char* _ErrorCheckBounds = "\n\t\t\t\tErrorCheckBounds=\""; |
126 | const char* _ErrorCheckEnumRange = "\n\t\t\t\tErrorCheckEnumRange=\""; | 112 | const char* _ErrorCheckEnumRange = "\n\t\t\t\tErrorCheckEnumRange=\""; |
127 | const char* _ErrorCheckRefPointers = "\n\t\t\t\tErrorCheckRefPointers=\""; | 113 | const char* _ErrorCheckRefPointers = "\n\t\t\t\tErrorCheckRefPointers=\""; |
128 | const char* _ErrorCheckStubData = "\n\t\t\t\tErrorCheckStubData=\""; | 114 | const char* _ErrorCheckStubData = "\n\t\t\t\tErrorCheckStubData=\""; |
129 | const char* _ExceptionHandling = "\n\t\t\t\tExceptionHandling=\""; | 115 | const char* _ExceptionHandling = "\n\t\t\t\tExceptionHandling=\""; |
130 | const char* _ExcludedFromBuild = "\n\t\t\t\tExcludedFromBuild=\""; | 116 | const char* _ExcludedFromBuild = "\n\t\t\t\tExcludedFromBuild=\""; |
131 | const char* _ExpandAttributedSource = "\n\t\t\t\tExpandAttributedSource=\""; | 117 | const char* _ExpandAttributedSource = "\n\t\t\t\tExpandAttributedSource=\""; |
132 | const char* _ExportNamedFunctions = "\n\t\t\t\tExportNamedFunctions=\""; | 118 | const char* _ExportNamedFunctions = "\n\t\t\t\tExportNamedFunctions=\""; |
133 | const char* _FavorSizeOrSpeed = "\n\t\t\t\tFavorSizeOrSpeed=\""; | 119 | const char* _FavorSizeOrSpeed = "\n\t\t\t\tFavorSizeOrSpeed=\""; |
134 | const char* _Filter = "\n\t\t\tFilter=\""; | 120 | const char* _Filter = "\n\t\t\tFilter=\""; |
135 | const char* _ForceConformanceInForLoopScope = "\n\t\t\t\tForceConformanceInForLoopScope=\""; | 121 | const char* _ForceConformanceInForLoopScope = "\n\t\t\t\tForceConformanceInForLoopScope=\""; |
136 | const char* _ForceSymbolReferences = "\n\t\t\t\tForceSymbolReferences=\""; | 122 | const char* _ForceSymbolReferences = "\n\t\t\t\tForceSymbolReferences=\""; |
137 | const char* _ForcedIncludeFiles = "\n\t\t\t\tForcedIncludeFiles=\""; | 123 | const char* _ForcedIncludeFiles = "\n\t\t\t\tForcedIncludeFiles=\""; |
138 | const char* _ForcedUsingFiles = "\n\t\t\t\tForcedUsingFiles=\""; | 124 | const char* _ForcedUsingFiles = "\n\t\t\t\tForcedUsingFiles=\""; |
139 | const char* _FullIncludePath = "\n\t\t\t\tFullIncludePath=\""; | 125 | const char* _FullIncludePath = "\n\t\t\t\tFullIncludePath=\""; |
140 | const char* _FunctionOrder = "\n\t\t\t\tFunctionOrder=\""; | 126 | const char* _FunctionOrder = "\n\t\t\t\tFunctionOrder=\""; |
141 | const char* _GenerateDebugInformation = "\n\t\t\t\tGenerateDebugInformation=\""; | 127 | const char* _GenerateDebugInformation = "\n\t\t\t\tGenerateDebugInformation=\""; |
142 | const char* _GenerateMapFile = "\n\t\t\t\tGenerateMapFile=\""; | 128 | const char* _GenerateMapFile = "\n\t\t\t\tGenerateMapFile=\""; |
143 | const char* _GeneratePreprocessedFile = "\n\t\t\t\tGeneratePreprocessedFile=\""; | 129 | const char* _GeneratePreprocessedFile = "\n\t\t\t\tGeneratePreprocessedFile=\""; |
144 | const char* _GenerateStublessProxies = "\n\t\t\t\tGenerateStublessProxies=\""; | 130 | const char* _GenerateStublessProxies = "\n\t\t\t\tGenerateStublessProxies=\""; |
145 | const char* _GenerateTypeLibrary = "\n\t\t\t\tGenerateTypeLibrary=\""; | 131 | const char* _GenerateTypeLibrary = "\n\t\t\t\tGenerateTypeLibrary=\""; |
146 | const char* _GlobalOptimizations = "\n\t\t\t\tGlobalOptimizations=\""; | 132 | const char* _GlobalOptimizations = "\n\t\t\t\tGlobalOptimizations=\""; |
147 | const char* _HeaderFileName = "\n\t\t\t\tHeaderFileName=\""; | 133 | const char* _HeaderFileName = "\n\t\t\t\tHeaderFileName=\""; |
148 | const char* _HeapCommitSize = "\n\t\t\t\tHeapCommitSize=\""; | 134 | const char* _HeapCommitSize = "\n\t\t\t\tHeapCommitSize=\""; |
149 | const char* _HeapReserveSize = "\n\t\t\t\tHeapReserveSize=\""; | 135 | const char* _HeapReserveSize = "\n\t\t\t\tHeapReserveSize=\""; |
150 | const char* _IgnoreAllDefaultLibraries = "\n\t\t\t\tIgnoreAllDefaultLibraries=\""; | 136 | const char* _IgnoreAllDefaultLibraries = "\n\t\t\t\tIgnoreAllDefaultLibraries=\""; |
@@ -188,502 +174,512 @@ const char* _OutputDirectory3 = "\n\t\t\tOutputDirectory=\""; | |||
188 | const char* _OutputDirectory4 = "\n\t\t\t\tOutputDirectory=\""; | 174 | const char* _OutputDirectory4 = "\n\t\t\t\tOutputDirectory=\""; |
189 | const char* _OutputFile = "\n\t\t\t\tOutputFile=\""; | 175 | const char* _OutputFile = "\n\t\t\t\tOutputFile=\""; |
190 | const char* _Outputs4 = "\n\t\t\t\tOutputs=\""; | 176 | const char* _Outputs4 = "\n\t\t\t\tOutputs=\""; |
191 | const char* _Outputs6 = "\n\t\t\t\t\t\tOutputs=\""; | 177 | const char* _Outputs6 = "\n\t\t\t\t\t\tOutputs=\""; |
192 | const char* _ParseFiles = "\n\t\t\tParseFiles=\""; | 178 | const char* _ParseFiles = "\n\t\t\tParseFiles=\""; |
193 | const char* _PrecompiledHeaderFile = "\n\t\t\t\tPrecompiledHeaderFile=\""; | 179 | const char* _PrecompiledHeaderFile = "\n\t\t\t\tPrecompiledHeaderFile=\""; |
194 | const char* _PrecompiledHeaderThrough = "\n\t\t\t\tPrecompiledHeaderThrough=\""; | 180 | const char* _PrecompiledHeaderThrough = "\n\t\t\t\tPrecompiledHeaderThrough=\""; |
195 | const char* _PreprocessorDefinitions = "\n\t\t\t\tPreprocessorDefinitions=\""; | 181 | const char* _PreprocessorDefinitions = "\n\t\t\t\tPreprocessorDefinitions=\""; |
196 | const char* _PrimaryOutput = "\n\t\t\tPrimaryOutput=\""; | 182 | const char* _PrimaryOutput = "\n\t\t\tPrimaryOutput=\""; |
197 | const char* _ProjectGUID = "\n\tProjectGUID=\""; | 183 | const char* _ProjectGUID = "\n\tProjectGUID=\""; |
198 | const char* _ProjectType = "\n\tProjectType=\"Visual C++\""; | 184 | const char* _ProjectType = "\n\tProjectType=\"Visual C++\""; |
199 | const char* _ProgramDatabase = "\n\t\t\tProgramDatabase=\""; | 185 | const char* _ProgramDatabase = "\n\t\t\tProgramDatabase=\""; |
200 | const char* _ProgramDataBaseFileName = "\n\t\t\t\tProgramDataBaseFileName=\""; | 186 | const char* _ProgramDataBaseFileName = "\n\t\t\t\tProgramDataBaseFileName=\""; |
201 | const char* _ProgramDatabaseFile = "\n\t\t\t\tProgramDatabaseFile=\""; | 187 | const char* _ProgramDatabaseFile = "\n\t\t\t\tProgramDatabaseFile=\""; |
202 | const char* _ProxyFileName = "\n\t\t\t\tProxyFileName=\""; | 188 | const char* _ProxyFileName = "\n\t\t\t\tProxyFileName=\""; |
203 | const char* _RedirectOutputAndErrors = "\n\t\t\t\tRedirectOutputAndErrors=\""; | 189 | const char* _RedirectOutputAndErrors = "\n\t\t\t\tRedirectOutputAndErrors=\""; |
204 | const char* _RegisterOutput = "\n\t\t\t\tRegisterOutput=\""; | 190 | const char* _RegisterOutput = "\n\t\t\t\tRegisterOutput=\""; |
205 | const char* _RelativePath = "\n\t\t\t\tRelativePath=\""; | 191 | const char* _RelativePath = "\n\t\t\t\tRelativePath=\""; |
206 | const char* _ResourceOnlyDLL = "\n\t\t\t\tResourceOnlyDLL=\""; | 192 | const char* _ResourceOnlyDLL = "\n\t\t\t\tResourceOnlyDLL=\""; |
207 | const char* _ResourceOutputFileName = "\n\t\t\t\tResourceOutputFileName=\""; | 193 | const char* _ResourceOutputFileName = "\n\t\t\t\tResourceOutputFileName=\""; |
208 | const char* _RuntimeLibrary = "\n\t\t\t\tRuntimeLibrary=\""; | 194 | const char* _RuntimeLibrary = "\n\t\t\t\tRuntimeLibrary=\""; |
209 | const char* _RuntimeTypeInfo = "\n\t\t\t\tRuntimeTypeInfo=\""; | 195 | const char* _RuntimeTypeInfo = "\n\t\t\t\tRuntimeTypeInfo=\""; |
210 | const char* _SccProjectName = "\n\tSccProjectName=\""; | 196 | const char* _SccProjectName = "\n\tSccProjectName=\""; |
211 | const char* _SccLocalPath = "\n\tSccLocalPath=\""; | 197 | const char* _SccLocalPath = "\n\tSccLocalPath=\""; |
212 | const char* _SetChecksum = "\n\t\t\t\tSetChecksum=\""; | 198 | const char* _SetChecksum = "\n\t\t\t\tSetChecksum=\""; |
213 | const char* _ShowIncludes = "\n\t\t\t\tShowIncludes=\""; | 199 | const char* _ShowIncludes = "\n\t\t\t\tShowIncludes=\""; |
214 | const char* _ShowProgress = "\n\t\t\t\tShowProgress=\""; | 200 | const char* _ShowProgress = "\n\t\t\t\tShowProgress=\""; |
215 | const char* _SmallerTypeCheck = "\n\t\t\t\tSmallerTypeCheck=\""; | 201 | const char* _SmallerTypeCheck = "\n\t\t\t\tSmallerTypeCheck=\""; |
216 | const char* _StackCommitSize = "\n\t\t\t\tStackCommitSize=\""; | 202 | const char* _StackCommitSize = "\n\t\t\t\tStackCommitSize=\""; |
217 | const char* _StackReserveSize = "\n\t\t\t\tStackReserveSize=\""; | 203 | const char* _StackReserveSize = "\n\t\t\t\tStackReserveSize=\""; |
218 | const char* _StringPooling = "\n\t\t\t\tStringPooling=\""; | 204 | const char* _StringPooling = "\n\t\t\t\tStringPooling=\""; |
219 | const char* _StripPrivateSymbols = "\n\t\t\t\tStripPrivateSymbols=\""; | 205 | const char* _StripPrivateSymbols = "\n\t\t\t\tStripPrivateSymbols=\""; |
220 | const char* _StructMemberAlignment = "\n\t\t\t\tStructMemberAlignment=\""; | 206 | const char* _StructMemberAlignment = "\n\t\t\t\tStructMemberAlignment=\""; |
221 | const char* _SubSystem = "\n\t\t\t\tSubSystem=\""; | 207 | const char* _SubSystem = "\n\t\t\t\tSubSystem=\""; |
222 | const char* _SupportUnloadOfDelayLoadedDLL = "\n\t\t\t\tSupportUnloadOfDelayLoadedDLL=\""; | 208 | const char* _SupportUnloadOfDelayLoadedDLL = "\n\t\t\t\tSupportUnloadOfDelayLoadedDLL=\""; |
223 | const char* _SuppressStartupBanner = "\n\t\t\t\tSuppressStartupBanner=\""; | 209 | const char* _SuppressStartupBanner = "\n\t\t\t\tSuppressStartupBanner=\""; |
224 | const char* _SwapRunFromCD = "\n\t\t\t\tSwapRunFromCD=\""; | 210 | const char* _SwapRunFromCD = "\n\t\t\t\tSwapRunFromCD=\""; |
225 | const char* _SwapRunFromNet = "\n\t\t\t\tSwapRunFromNet=\""; | 211 | const char* _SwapRunFromNet = "\n\t\t\t\tSwapRunFromNet=\""; |
226 | const char* _TargetEnvironment = "\n\t\t\t\tTargetEnvironment=\""; | 212 | const char* _TargetEnvironment = "\n\t\t\t\tTargetEnvironment=\""; |
227 | const char* _TargetMachine = "\n\t\t\t\tTargetMachine=\""; | 213 | const char* _TargetMachine = "\n\t\t\t\tTargetMachine=\""; |
228 | const char* _TerminalServerAware = "\n\t\t\t\tTerminalServerAware=\""; | 214 | const char* _TerminalServerAware = "\n\t\t\t\tTerminalServerAware=\""; |
229 | const char* _ToolName = "\n\t\t\t\tName=\""; | 215 | const char* _ToolName = "\n\t\t\t\tName=\""; |
230 | const char* _ToolPath = "\n\t\t\t\tPath=\""; | 216 | const char* _ToolPath = "\n\t\t\t\tPath=\""; |
231 | const char* _TreatWChar_tAsBuiltInType = "\n\t\t\t\tTreatWChar_tAsBuiltInType=\""; | 217 | const char* _TreatWChar_tAsBuiltInType = "\n\t\t\t\tTreatWChar_tAsBuiltInType=\""; |
232 | const char* _TurnOffAssemblyGeneration = "\n\t\t\t\tTurnOffAssemblyGeneration=\""; | 218 | const char* _TurnOffAssemblyGeneration = "\n\t\t\t\tTurnOffAssemblyGeneration=\""; |
233 | const char* _TypeLibraryFile = "\n\t\t\t\tTypeLibraryFile=\""; | 219 | const char* _TypeLibraryFile = "\n\t\t\t\tTypeLibraryFile=\""; |
234 | const char* _TypeLibraryName = "\n\t\t\t\tTypeLibraryName=\""; | 220 | const char* _TypeLibraryName = "\n\t\t\t\tTypeLibraryName=\""; |
235 | const char* _TypeLibraryResourceID = "\n\t\t\t\tTypeLibraryResourceID=\""; | 221 | const char* _TypeLibraryResourceID = "\n\t\t\t\tTypeLibraryResourceID=\""; |
236 | const char* _UndefineAllPreprocessorDefinitions = "\n\t\t\t\tUndefineAllPreprocessorDefinitions=\""; | 222 | const char* _UndefineAllPreprocessorDefinitions = "\n\t\t\t\tUndefineAllPreprocessorDefinitions=\""; |
237 | const char* _UndefinePreprocessorDefinitions = "\n\t\t\t\tUndefinePreprocessorDefinitions=\""; | 223 | const char* _UndefinePreprocessorDefinitions = "\n\t\t\t\tUndefinePreprocessorDefinitions=\""; |
238 | const char* _UseOfATL = "\n\t\t\tUseOfATL=\""; | 224 | const char* _UseOfATL = "\n\t\t\tUseOfATL=\""; |
239 | const char* _UseOfMfc = "\n\t\t\tUseOfMfc=\""; | 225 | const char* _UseOfMfc = "\n\t\t\tUseOfMfc=\""; |
240 | const char* _UsePrecompiledHeader = "\n\t\t\t\tUsePrecompiledHeader=\""; | 226 | const char* _UsePrecompiledHeader = "\n\t\t\t\tUsePrecompiledHeader=\""; |
241 | const char* _ValidateParameters = "\n\t\t\t\tValidateParameters=\""; | 227 | const char* _ValidateParameters = "\n\t\t\t\tValidateParameters=\""; |
242 | const char* _VCCLCompilerToolName = "\n\t\t\t\tName=\"VCCLCompilerTool\""; | 228 | const char* _VCCLCompilerToolName = "\n\t\t\t\tName=\"VCCLCompilerTool\""; |
243 | const char* _VCCustomBuildTool = "\n\t\t\t\t\t\tName=\"VCCustomBuildTool\""; | 229 | const char* _VCCustomBuildTool = "\n\t\t\t\t\t\tName=\"VCCustomBuildTool\""; |
244 | const char* _VCLinkerToolName = "\n\t\t\t\tName=\"VCLinkerTool\""; | 230 | const char* _VCLinkerToolName = "\n\t\t\t\tName=\"VCLinkerTool\""; |
245 | const char* _VCResourceCompilerToolName = "\n\t\t\t\tName=\"VCResourceCompilerTool\""; | 231 | const char* _VCResourceCompilerToolName = "\n\t\t\t\tName=\"VCResourceCompilerTool\""; |
246 | const char* _VCMIDLToolName = "\n\t\t\t\tName=\"VCMIDLTool\""; | 232 | const char* _VCMIDLToolName = "\n\t\t\t\tName=\"VCMIDLTool\""; |
247 | const char* _Version1 = "\n\tVersion=\""; | 233 | const char* _Version1 = "\n\tVersion=\""; |
248 | const char* _Version4 = "\n\t\t\t\tVersion=\""; | 234 | const char* _Version4 = "\n\t\t\t\tVersion=\""; |
249 | const char* _WarnAsError = "\n\t\t\t\tWarnAsError=\""; | 235 | const char* _WarnAsError = "\n\t\t\t\tWarnAsError=\""; |
250 | const char* _WarnLevel = "\n\t\t\t\tWarnLevel=\""; | 236 | const char* _WarnLevel = "\n\t\t\t\tWarnLevel=\""; |
251 | const char* _WarningLevel = "\n\t\t\t\tWarningLevel=\""; | 237 | const char* _WarningLevel = "\n\t\t\t\tWarningLevel=\""; |
252 | const char* _WholeProgramOptimization = "\n\t\t\t\tWholeProgramOptimization=\""; | 238 | const char* _WholeProgramOptimization = "\n\t\t\t\tWholeProgramOptimization=\""; |
253 | 239 | ||
254 | // Property name and value as Pairs --------------------------------- | 240 | // Property name and value as Pairs --------------------------------- |
255 | struct TPair { | 241 | struct TPair { |
256 | TPair( const char* n, const triState v ) : name(n), value(v) {}; | 242 | TPair( const char* n, const triState v ) : name(n), value(v) {}; |
257 | const char* name; | 243 | const char* name; |
258 | const triState value; | 244 | const triState value; |
259 | }; | 245 | }; |
260 | struct EPair { | 246 | struct EPair { |
261 | EPair( const char* n, const int v ) : name(n), value(v) {}; | 247 | EPair( const char* n, const int v ) : name(n), value(v) {}; |
262 | const char* name; | 248 | const char* name; |
263 | const int value; | 249 | const int value; |
264 | }; | 250 | }; |
265 | struct LPair { | 251 | struct LPair { |
266 | LPair( const char* n, const long v ) : name(n), value(v) {}; | 252 | LPair( const char* n, const long v ) : name(n), value(v) {}; |
267 | const char* name; | 253 | const char* name; |
268 | const long value; | 254 | const long value; |
269 | }; | 255 | }; |
270 | struct SPair { | 256 | struct SPair { |
271 | SPair( const char* n, const QString& v ) : name(n), value(v) {}; | 257 | SPair( const char* n, const QString& v ) : name(n), value(v) {}; |
272 | const char* name; | 258 | const char* name; |
273 | const QString& value; | 259 | const QString& value; |
274 | }; | 260 | }; |
275 | struct XPair { | 261 | struct XPair { |
276 | XPair( const char* n, const QStringList& v, const char* s = "," ) : name(n), value(v), sep(s) {}; | 262 | XPair( const char* n, const QStringList& v, const char* s = "," ) : name(n), value(v), sep(s) {}; |
277 | const char* name; | 263 | const char* name; |
278 | const QStringList& value; | 264 | const QStringList& value; |
279 | const char* sep; | 265 | const char* sep; |
280 | }; | 266 | }; |
281 | 267 | ||
282 | // void streamSPair( QTextStream &strm, const char *n, const QString &s ) | 268 | // void streamSPair( QTextStream &strm, const char *n, const QString &s ) |
283 | 269 | ||
284 | |||
285 | // Streaming operators for property Pairs --------------------------- | 270 | // Streaming operators for property Pairs --------------------------- |
286 | QTextStream &operator<<( QTextStream &strm, const TPair &prop ) | 271 | QTextStream &operator<<( QTextStream &strm, const TPair &prop ) |
287 | { | 272 | { |
288 | switch( prop.value ) { | 273 | switch( prop.value ) { |
289 | case _False: | 274 | case _False: |
290 | strm << prop.name << "FALSE\""; | 275 | strm << prop.name << "FALSE\""; |
291 | break; | 276 | break; |
292 | case _True: | 277 | case _True: |
293 | strm << prop.name << "TRUE\""; | 278 | strm << prop.name << "TRUE\""; |
294 | break; | 279 | break; |
295 | case unset: | 280 | case unset: |
296 | default: | 281 | default: |
297 | break; | 282 | break; |
298 | } | 283 | } |
299 | return strm; | 284 | return strm; |
300 | } | 285 | } |
301 | 286 | ||
302 | /* Be sure to check that each enum is not set to | 287 | /* Be sure to check that each enum is not set to |
303 | default before streaming it out. Defaults seem | 288 | default before streaming it out. Defaults seem |
304 | to not be in the XML file. | 289 | to not be in the XML file. |
305 | */ | 290 | */ |
306 | QTextStream &operator<<( QTextStream &strm, const EPair &prop ) | 291 | QTextStream &operator<<( QTextStream &strm, const EPair &prop ) |
307 | { | 292 | { |
308 | strm << prop.name << prop.value << "\""; | 293 | strm << prop.name << prop.value << "\""; |
309 | return strm; | 294 | return strm; |
310 | } | 295 | } |
311 | 296 | ||
312 | QTextStream &operator<<( QTextStream &strm, const LPair &prop ) | 297 | QTextStream &operator<<( QTextStream &strm, const LPair &prop ) |
313 | { | 298 | { |
314 | strm << prop.name << prop.value << "\""; | 299 | strm << prop.name << prop.value << "\""; |
315 | return strm; | 300 | return strm; |
316 | } | 301 | } |
317 | 302 | ||
318 | QTextStream &operator<<( QTextStream &strm, const SPair &prop ) | 303 | QTextStream &operator<<( QTextStream &strm, const SPair &prop ) |
319 | { | 304 | { |
320 | if ( !prop.value.isEmpty() ) | 305 | if ( !prop.value.isEmpty() ) |
321 | strm << prop.name << prop.value.latin1() << "\""; | 306 | strm << prop.name << QString(prop.value).remove("\"") << "\""; |
322 | return strm; | 307 | return strm; |
323 | } | 308 | } |
324 | 309 | ||
325 | QTextStream &operator<<( QTextStream &strm, const XPair &prop ) | 310 | QTextStream &operator<<( QTextStream &strm, const XPair &prop ) |
326 | { | 311 | { |
327 | if ( !prop.value.isEmpty() ) | 312 | if ( !prop.value.isEmpty() ) |
328 | strm << prop.name << prop.value.join(prop.sep).latin1() << "\""; | 313 | strm << prop.name << prop.value.join(prop.sep).latin1() << "\""; |
329 | return strm; | 314 | return strm; |
330 | } | 315 | } |
331 | 316 | ||
332 | // VCCLCompilerTool ------------------------------------------------- | 317 | // VCCLCompilerTool ------------------------------------------------- |
333 | VCCLCompilerTool::VCCLCompilerTool() | 318 | VCCLCompilerTool::VCCLCompilerTool() |
334 | :AssemblerOutput( asmListingNone ), | 319 | :AssemblerOutput( asmListingNone ), |
335 | BasicRuntimeChecks( runtimeBasicCheckNone ), | 320 | BasicRuntimeChecks( runtimeBasicCheckNone ), |
336 | BrowseInformation( brInfoNone ), | 321 | BrowseInformation( brInfoNone ), |
337 | BufferSecurityCheck( unset ), | 322 | BufferSecurityCheck( _False ), |
338 | CallingConvention( callConventionDefault ), | 323 | CallingConvention( callConventionDefault ), |
339 | CompileAs( compileAsDefault ), | 324 | CompileAs( compileAsDefault ), |
340 | CompileAsManaged( managedDefault ), | 325 | CompileAsManaged( managedDefault ), |
341 | CompileOnly( unset ), | 326 | CompileOnly( unset ), |
342 | DebugInformationFormat( debugDisabled ), | 327 | DebugInformationFormat( debugDisabled ), |
343 | DefaultCharIsUnsigned( unset ), | 328 | DefaultCharIsUnsigned( unset ), |
344 | Detect64BitPortabilityProblems( unset ), | 329 | Detect64BitPortabilityProblems( unset ), |
345 | DisableLanguageExtensions( unset ), | 330 | DisableLanguageExtensions( unset ), |
346 | EnableFiberSafeOptimizations( unset ), | 331 | EnableFiberSafeOptimizations( unset ), |
347 | EnableFunctionLevelLinking( unset ), | 332 | EnableFunctionLevelLinking( unset ), |
348 | EnableIntrinsicFunctions( unset ), | 333 | EnableIntrinsicFunctions( unset ), |
349 | ExceptionHandling( unset ), | 334 | ExceptionHandling( _False ), |
350 | ExpandAttributedSource( unset ), | 335 | ExpandAttributedSource( unset ), |
351 | FavorSizeOrSpeed( favorNone ), | 336 | FavorSizeOrSpeed( favorNone ), |
352 | ForceConformanceInForLoopScope( unset ), | 337 | ForceConformanceInForLoopScope( unset ), |
353 | GeneratePreprocessedFile( preprocessNo ), | 338 | GeneratePreprocessedFile( preprocessNo ), |
354 | GlobalOptimizations( unset ), | 339 | GlobalOptimizations( unset ), |
355 | IgnoreStandardIncludePath( unset ), | 340 | IgnoreStandardIncludePath( unset ), |
356 | ImproveFloatingPointConsistency( unset ), | 341 | ImproveFloatingPointConsistency( unset ), |
357 | InlineFunctionExpansion( expandOnlyInline ), | 342 | InlineFunctionExpansion( expandDefault ), |
358 | KeepComments( unset ), | 343 | KeepComments( unset ), |
359 | MinimalRebuild( unset ), | 344 | MinimalRebuild( unset ), |
360 | OmitFramePointers( unset ), | 345 | OmitFramePointers( unset ), |
361 | Optimization( optimizeDisabled ), | 346 | Optimization( optimizeCustom ), |
362 | OptimizeForProcessor( procOptimizeBlended ), | 347 | OptimizeForProcessor( procOptimizeBlended ), |
363 | OptimizeForWindowsApplication( unset ), | 348 | OptimizeForWindowsApplication( unset ), |
349 | ProgramDataBaseFileName( "" ), | ||
364 | RuntimeLibrary( rtMultiThreaded ), | 350 | RuntimeLibrary( rtMultiThreaded ), |
365 | RuntimeTypeInfo( unset ), | 351 | RuntimeTypeInfo( unset ), |
366 | ShowIncludes( unset ), | 352 | ShowIncludes( unset ), |
367 | SmallerTypeCheck( unset ), | 353 | SmallerTypeCheck( unset ), |
368 | StringPooling( unset ), | 354 | StringPooling( unset ), |
369 | StructMemberAlignment( alignNotSet ), | 355 | StructMemberAlignment( alignNotSet ), |
370 | SuppressStartupBanner( unset ), | 356 | SuppressStartupBanner( unset ), |
371 | TreatWChar_tAsBuiltInType( unset ), | 357 | TreatWChar_tAsBuiltInType( unset ), |
372 | TurnOffAssemblyGeneration( unset ), | 358 | TurnOffAssemblyGeneration( unset ), |
373 | UndefineAllPreprocessorDefinitions( unset ), | 359 | UndefineAllPreprocessorDefinitions( unset ), |
374 | UsePrecompiledHeader( pchGenerateAuto ), | 360 | UsePrecompiledHeader( pchNone ), |
375 | WarnAsError( unset ), | 361 | WarnAsError( unset ), |
376 | WarningLevel( warningLevel_0 ), | 362 | WarningLevel( warningLevel_0 ), |
377 | WholeProgramOptimization( unset ) | 363 | WholeProgramOptimization( unset ) |
378 | { | 364 | { |
379 | } | 365 | } |
380 | 366 | ||
381 | QTextStream &operator<<( QTextStream &strm, const VCCLCompilerTool &tool ) | 367 | QTextStream &operator<<( QTextStream &strm, const VCCLCompilerTool &tool ) |
382 | { | 368 | { |
383 | strm << _begTool3; | 369 | strm << _begTool3; |
384 | strm << _VCCLCompilerToolName; | 370 | strm << _VCCLCompilerToolName; |
385 | strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories ); | 371 | strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories ); |
386 | strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " ); | 372 | strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " ); |
387 | strm << XPair( _AdditionalUsingDirectories, tool.AdditionalUsingDirectories ); | 373 | strm << XPair( _AdditionalUsingDirectories, tool.AdditionalUsingDirectories ); |
388 | strm << SPair( _AssemblerListingLocation, tool.AssemblerListingLocation ); | 374 | strm << SPair( _AssemblerListingLocation, tool.AssemblerListingLocation ); |
389 | if ( tool.AssemblerOutput != asmListingNone ) strm << EPair( _AssemblerOutput, tool.AssemblerOutput ); | 375 | if ( tool.AssemblerOutput != asmListingNone ) strm << EPair( _AssemblerOutput, tool.AssemblerOutput ); |
390 | if ( tool.BasicRuntimeChecks != runtimeBasicCheckNone ) strm << EPair( _BasicRuntimeChecks, tool.BasicRuntimeChecks ); | 376 | if ( tool.BasicRuntimeChecks != runtimeBasicCheckNone ) strm << EPair( _BasicRuntimeChecks, tool.BasicRuntimeChecks ); |
391 | if ( tool.BrowseInformation != brInfoNone ) strm << EPair( _BrowseInformation, tool.BrowseInformation ); | 377 | if ( tool.BrowseInformation != brInfoNone ) strm << EPair( _BrowseInformation, tool.BrowseInformation ); |
392 | strm << SPair( _BrowseInformationFile, tool.BrowseInformationFile ); | 378 | strm << SPair( _BrowseInformationFile, tool.BrowseInformationFile ); |
393 | strm << TPair( _BufferSecurityCheck, tool.BufferSecurityCheck ); | 379 | strm << TPair( _BufferSecurityCheck, tool.BufferSecurityCheck ); |
394 | if ( tool.CallingConvention != callConventionDefault ) strm << EPair( _CallingConvention, tool.CallingConvention ); | 380 | if ( tool.CallingConvention != callConventionDefault ) strm << EPair( _CallingConvention, tool.CallingConvention ); |
395 | if ( tool.CompileAs != compileAsDefault ) strm << EPair( _CompileAs, tool.CompileAs ); | 381 | if ( tool.CompileAs != compileAsDefault ) strm << EPair( _CompileAs, tool.CompileAs ); |
396 | if ( tool.CompileAsManaged != managedDefault ) strm << EPair( _CompileAsManaged, tool.CompileAsManaged ); | 382 | if ( tool.CompileAsManaged != managedDefault ) strm << EPair( _CompileAsManaged, tool.CompileAsManaged ); |
397 | strm << TPair( _CompileOnly, tool.CompileOnly ); | 383 | strm << TPair( _CompileOnly, tool.CompileOnly ); |
398 | strm << EPair( _DebugInformationFormat, tool.DebugInformationFormat ); | 384 | if ( tool.DebugInformationFormat != debugUnknown ) strm << EPair( _DebugInformationFormat, tool.DebugInformationFormat ); |
399 | strm << TPair( _DefaultCharIsUnsigned, tool.DefaultCharIsUnsigned ); | 385 | strm << TPair( _DefaultCharIsUnsigned, tool.DefaultCharIsUnsigned ); |
400 | strm << TPair( _Detect64BitPortabilityProblems, tool.Detect64BitPortabilityProblems ); | 386 | strm << TPair( _Detect64BitPortabilityProblems, tool.Detect64BitPortabilityProblems ); |
401 | strm << TPair( _DisableLanguageExtensions, tool.DisableLanguageExtensions ); | 387 | strm << TPair( _DisableLanguageExtensions, tool.DisableLanguageExtensions ); |
402 | strm << XPair( _DisableSpecificWarnings, tool.DisableSpecificWarnings ); | 388 | strm << XPair( _DisableSpecificWarnings, tool.DisableSpecificWarnings ); |
403 | strm << TPair( _EnableFiberSafeOptimizations, tool.EnableFiberSafeOptimizations ); | 389 | strm << TPair( _EnableFiberSafeOptimizations, tool.EnableFiberSafeOptimizations ); |
404 | strm << TPair( _EnableFunctionLevelLinking, tool.EnableFunctionLevelLinking ); | 390 | strm << TPair( _EnableFunctionLevelLinking, tool.EnableFunctionLevelLinking ); |
405 | strm << TPair( _EnableIntrinsicFunctions, tool.EnableIntrinsicFunctions ); | 391 | strm << TPair( _EnableIntrinsicFunctions, tool.EnableIntrinsicFunctions ); |
406 | strm << TPair( _ExceptionHandling, tool.ExceptionHandling ); | 392 | strm << TPair( _ExceptionHandling, tool.ExceptionHandling ); |
407 | strm << TPair( _ExpandAttributedSource, tool.ExpandAttributedSource ); | 393 | strm << TPair( _ExpandAttributedSource, tool.ExpandAttributedSource ); |
408 | if ( tool.FavorSizeOrSpeed != favorNone ) strm << EPair( _FavorSizeOrSpeed, tool.FavorSizeOrSpeed ); | 394 | if ( tool.FavorSizeOrSpeed != favorNone ) strm << EPair( _FavorSizeOrSpeed, tool.FavorSizeOrSpeed ); |
409 | strm << TPair( _ForceConformanceInForLoopScope, tool.ForceConformanceInForLoopScope ); | 395 | strm << TPair( _ForceConformanceInForLoopScope, tool.ForceConformanceInForLoopScope ); |
410 | strm << XPair( _ForcedIncludeFiles, tool.ForcedIncludeFiles ); | 396 | strm << XPair( _ForcedIncludeFiles, tool.ForcedIncludeFiles ); |
411 | strm << XPair( _ForcedUsingFiles, tool.ForcedUsingFiles ); | 397 | strm << XPair( _ForcedUsingFiles, tool.ForcedUsingFiles ); |
412 | strm << EPair( _GeneratePreprocessedFile, tool.GeneratePreprocessedFile ); | 398 | if ( tool.GeneratePreprocessedFile != preprocessUnknown)strm << EPair( _GeneratePreprocessedFile, tool.GeneratePreprocessedFile ); |
413 | strm << TPair( _GlobalOptimizations, tool.GlobalOptimizations ); | 399 | strm << TPair( _GlobalOptimizations, tool.GlobalOptimizations ); |
414 | strm << TPair( _IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath ); | 400 | strm << TPair( _IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath ); |
415 | strm << TPair( _ImproveFloatingPointConsistency, tool.ImproveFloatingPointConsistency ); | 401 | strm << TPair( _ImproveFloatingPointConsistency, tool.ImproveFloatingPointConsistency ); |
416 | strm << EPair( _InlineFunctionExpansion, tool.InlineFunctionExpansion ); | 402 | if ( tool.InlineFunctionExpansion != expandDefault ) strm << EPair( _InlineFunctionExpansion, tool.InlineFunctionExpansion ); |
417 | strm << TPair( _KeepComments, tool.KeepComments ); | 403 | strm << TPair( _KeepComments, tool.KeepComments ); |
418 | strm << TPair( _MinimalRebuild, tool.MinimalRebuild ); | 404 | strm << TPair( _MinimalRebuild, tool.MinimalRebuild ); |
419 | strm << SPair( _ObjectFile, tool.ObjectFile ); | 405 | strm << SPair( _ObjectFile, tool.ObjectFile ); |
420 | strm << TPair( _OmitFramePointers, tool.OmitFramePointers ); | 406 | strm << TPair( _OmitFramePointers, tool.OmitFramePointers ); |
421 | strm << EPair( _Optimization, tool.Optimization ); | 407 | if ( tool.Optimization != optimizeDefault ) strm << EPair( _Optimization, tool.Optimization ); |
422 | if ( tool.OptimizeForProcessor != procOptimizeBlended ) strm << EPair( _OptimizeForProcessor, tool.OptimizeForProcessor ); | 408 | if ( tool.OptimizeForProcessor != procOptimizeBlended ) strm << EPair( _OptimizeForProcessor, tool.OptimizeForProcessor ); |
423 | strm << TPair( _OptimizeForWindowsApplication, tool.OptimizeForWindowsApplication ); | 409 | strm << TPair( _OptimizeForWindowsApplication, tool.OptimizeForWindowsApplication ); |
424 | strm << SPair( _OutputFile, tool.OutputFile ); | 410 | strm << SPair( _OutputFile, tool.OutputFile ); |
425 | strm << SPair( _PrecompiledHeaderFile, tool.PrecompiledHeaderFile ); | 411 | strm << SPair( _PrecompiledHeaderFile, tool.PrecompiledHeaderFile ); |
426 | strm << SPair( _PrecompiledHeaderThrough, tool.PrecompiledHeaderThrough ); | 412 | strm << SPair( _PrecompiledHeaderThrough, tool.PrecompiledHeaderThrough ); |
427 | strm << XPair( _PreprocessorDefinitions, tool.PreprocessorDefinitions ); | 413 | strm << XPair( _PreprocessorDefinitions, tool.PreprocessorDefinitions ); |
428 | strm << SPair( _ProgramDataBaseFileName, tool.ProgramDataBaseFileName ); | 414 | if ( !tool.ProgramDataBaseFileName.isNull() ) strm << _ProgramDataBaseFileName << tool.ProgramDataBaseFileName.latin1() << "\""; |
429 | strm << EPair( _RuntimeLibrary, tool.RuntimeLibrary ); | 415 | if ( tool.RuntimeLibrary != rtUnknown ) strm << EPair( _RuntimeLibrary, tool.RuntimeLibrary ); |
430 | strm << TPair( _RuntimeTypeInfo, tool.RuntimeTypeInfo ); | 416 | strm << TPair( _RuntimeTypeInfo, tool.RuntimeTypeInfo ); |
431 | strm << TPair( _ShowIncludes, tool.ShowIncludes ); | 417 | strm << TPair( _ShowIncludes, tool.ShowIncludes ); |
432 | strm << TPair( _SmallerTypeCheck, tool.SmallerTypeCheck ); | 418 | strm << TPair( _SmallerTypeCheck, tool.SmallerTypeCheck ); |
433 | strm << TPair( _StringPooling, tool.StringPooling ); | 419 | strm << TPair( _StringPooling, tool.StringPooling ); |
434 | if ( tool.StructMemberAlignment != alignNotSet ) strm << EPair( _StructMemberAlignment, tool.StructMemberAlignment ); | 420 | if ( tool.StructMemberAlignment != alignNotSet ) strm << EPair( _StructMemberAlignment, tool.StructMemberAlignment ); |
435 | strm << TPair( _SuppressStartupBanner, tool.SuppressStartupBanner ); | 421 | strm << TPair( _SuppressStartupBanner, tool.SuppressStartupBanner ); |
436 | strm << TPair( _TreatWChar_tAsBuiltInType, tool.TreatWChar_tAsBuiltInType ); | 422 | strm << TPair( _TreatWChar_tAsBuiltInType, tool.TreatWChar_tAsBuiltInType ); |
437 | strm << TPair( _TurnOffAssemblyGeneration, tool.TurnOffAssemblyGeneration ); | 423 | strm << TPair( _TurnOffAssemblyGeneration, tool.TurnOffAssemblyGeneration ); |
438 | strm << TPair( _UndefineAllPreprocessorDefinitions, tool.UndefineAllPreprocessorDefinitions ); | 424 | strm << TPair( _UndefineAllPreprocessorDefinitions, tool.UndefineAllPreprocessorDefinitions ); |
439 | strm << XPair( _UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions ); | 425 | strm << XPair( _UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions ); |
440 | if ( !tool.PrecompiledHeaderFile.isEmpty() || | 426 | if ( !tool.PrecompiledHeaderFile.isEmpty() || |
441 | !tool.PrecompiledHeaderThrough.isEmpty() ) | 427 | !tool.PrecompiledHeaderThrough.isEmpty() ) |
442 | strm << EPair( _UsePrecompiledHeader, tool.UsePrecompiledHeader ); | 428 | strm << EPair( _UsePrecompiledHeader, tool.UsePrecompiledHeader ); |
443 | strm << TPair( _WarnAsError, tool.WarnAsError ); | 429 | strm << TPair( _WarnAsError, tool.WarnAsError ); |
444 | strm << EPair( _WarningLevel, tool.WarningLevel ); | 430 | if ( tool.WarningLevel != warningLevelUnknown ) strm << EPair( _WarningLevel, tool.WarningLevel ); |
445 | strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization ); | 431 | strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization ); |
446 | strm << "/>"; | 432 | strm << "/>"; |
447 | return strm; | 433 | return strm; |
448 | } | 434 | } |
449 | 435 | ||
450 | bool VCCLCompilerTool::parseOption( const char* option ) | 436 | bool VCCLCompilerTool::parseOption( const char* option ) |
451 | { | 437 | { |
452 | // skip index 0 ('/' or '-') | 438 | // skip index 0 ('/' or '-') |
453 | char first = option[1]; | 439 | char first = option[1]; |
454 | char second = option[2]; | 440 | char second = option[2]; |
455 | char third = option[3]; | 441 | char third = option[3]; |
456 | char fourth = option[4]; | 442 | char fourth = option[4]; |
457 | bool found = TRUE; | 443 | bool found = TRUE; |
458 | 444 | ||
459 | switch ( first ) { | 445 | switch ( first ) { |
460 | case '?': | 446 | case '?': |
461 | case 'h': | 447 | case 'h': |
462 | qWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" ); | 448 | qWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" ); |
463 | found = FALSE; | 449 | found = FALSE; |
464 | break; | 450 | break; |
465 | case '@': | 451 | case '@': |
466 | qWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" ); | 452 | qWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" ); |
467 | found = FALSE; | 453 | found = FALSE; |
468 | break; | 454 | break; |
469 | case 'l': | 455 | case 'l': |
470 | qWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" ); | 456 | qWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" ); |
471 | found = FALSE; | 457 | found = FALSE; |
472 | break; | 458 | break; |
473 | case 'A': | 459 | case 'A': |
474 | if ( second != 'I' ) { | 460 | if ( second != 'I' ) { |
475 | found = FALSE; break; | 461 | found = FALSE; break; |
476 | } | 462 | } |
477 | AdditionalUsingDirectories += option+2; | 463 | AdditionalUsingDirectories += option+3; |
478 | break; | 464 | break; |
479 | case 'C': | 465 | case 'C': |
480 | KeepComments = _True; | 466 | KeepComments = _True; |
481 | break; | 467 | break; |
482 | case 'D': | 468 | case 'D': |
483 | PreprocessorDefinitions += option+1; | 469 | PreprocessorDefinitions += option+2; |
484 | break; | 470 | break; |
485 | case 'E': | 471 | case 'E': |
486 | if ( second == 'H' ) { | 472 | if ( second == 'H' ) { |
487 | if ( third == 'a' || third == 'c' || third == 's' ) { | 473 | if ( third == 'a' |
474 | || (third == 'c' && fourth != 's') | ||
475 | || (third == 's' && fourth != 'c') ) { | ||
488 | // ExceptionHandling must be false, or it will override | 476 | // ExceptionHandling must be false, or it will override |
489 | // with an /EHsc option | 477 | // with an /EHsc option |
490 | ExceptionHandling = _False; | 478 | ExceptionHandling = _False; |
491 | AdditionalOptions += option; | 479 | AdditionalOptions += option; |
492 | break; | 480 | break; |
481 | } else if ( (third == 'c' && fourth == 's') | ||
482 | || (third == 's' && fourth == 'c') ) { | ||
483 | ExceptionHandling = _True; | ||
484 | AdditionalOptions += option; | ||
485 | break; | ||
493 | } | 486 | } |
494 | found = FALSE; break; | 487 | found = FALSE; break; |
495 | } | 488 | } |
496 | GeneratePreprocessedFile = preprocessYes; | 489 | GeneratePreprocessedFile = preprocessYes; |
497 | break; | 490 | break; |
498 | case 'F': | 491 | case 'F': |
499 | if ( second <= '9' && second >= '0' ) { | 492 | if ( second <= '9' && second >= '0' ) { |
500 | AdditionalOptions += option; | 493 | AdditionalOptions += option; |
501 | break; | 494 | break; |
502 | } else { | 495 | } else { |
503 | switch ( second ) { | 496 | switch ( second ) { |
504 | case 'A': | 497 | case 'A': |
505 | if ( third == 'c' ) { | 498 | if ( third == 'c' ) { |
506 | AssemblerOutput = asmListingAsmMachine; | 499 | AssemblerOutput = asmListingAsmMachine; |
507 | if ( fourth == 's' ) | 500 | if ( fourth == 's' ) |
508 | AssemblerOutput = asmListingAsmMachineSrc; | 501 | AssemblerOutput = asmListingAsmMachineSrc; |
509 | } else if ( third == 's' ) { | 502 | } else if ( third == 's' ) { |
510 | AssemblerOutput = asmListingAsmSrc; | 503 | AssemblerOutput = asmListingAsmSrc; |
511 | } else { | 504 | } else { |
512 | AssemblerOutput = asmListingAssemblyOnly; | 505 | AssemblerOutput = asmListingAssemblyOnly; |
513 | } | 506 | } |
514 | break; | 507 | break; |
515 | case 'a': | 508 | case 'a': |
516 | AssemblerListingLocation = option+3; | 509 | AssemblerListingLocation = option+3; |
517 | break; | 510 | break; |
518 | case 'I': | 511 | case 'I': |
519 | ForcedIncludeFiles += option+3; | 512 | ForcedIncludeFiles += option+3; |
520 | break; | 513 | break; |
521 | case 'R': | 514 | case 'R': |
522 | BrowseInformation = brAllInfo; | 515 | BrowseInformation = brAllInfo; |
523 | BrowseInformationFile = option+3; | 516 | BrowseInformationFile = option+3; |
524 | break; | 517 | break; |
525 | case 'r': | 518 | case 'r': |
526 | BrowseInformation = brNoLocalSymbols; | 519 | BrowseInformation = brNoLocalSymbols; |
527 | BrowseInformationFile = option+3; | 520 | BrowseInformationFile = option+3; |
528 | break; | 521 | break; |
529 | case 'U': | 522 | case 'U': |
530 | ForcedUsingFiles += option+3; | 523 | ForcedUsingFiles += option+3; |
531 | break; | 524 | break; |
532 | case 'd': | 525 | case 'd': |
533 | ProgramDataBaseFileName = option+3; | 526 | ProgramDataBaseFileName = option+3; |
534 | break; | 527 | break; |
535 | case 'e': | 528 | case 'e': |
536 | OutputFile = option+3; | 529 | OutputFile = option+3; |
537 | break; | 530 | break; |
538 | case 'm': | 531 | case 'm': |
539 | AdditionalOptions += option; | 532 | AdditionalOptions += option; |
540 | break; | 533 | break; |
541 | case 'o': | 534 | case 'o': |
542 | ObjectFile = option+3; | 535 | ObjectFile = option+3; |
543 | break; | 536 | break; |
544 | case 'p': | 537 | case 'p': |
545 | PrecompiledHeaderFile = option+3; | 538 | PrecompiledHeaderFile = option+3; |
546 | break; | 539 | break; |
547 | case 'x': | 540 | case 'x': |
548 | ExpandAttributedSource = _True; | 541 | ExpandAttributedSource = _True; |
549 | break; | 542 | break; |
550 | default: | 543 | default: |
551 | found = FALSE; break; | 544 | found = FALSE; break; |
552 | } | 545 | } |
553 | } | 546 | } |
554 | break; | 547 | break; |
555 | case 'G': | 548 | case 'G': |
556 | switch ( second ) { | 549 | switch ( second ) { |
557 | case '3': | 550 | case '3': |
558 | case '4': | 551 | case '4': |
559 | qWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" ); | 552 | qWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" ); |
560 | found = FALSE; break; | 553 | found = FALSE; break; |
561 | case '5': | 554 | case '5': |
562 | OptimizeForProcessor = procOptimizePentium; | 555 | OptimizeForProcessor = procOptimizePentium; |
563 | break; | 556 | break; |
564 | case '6': | 557 | case '6': |
565 | case 'B': | 558 | case 'B': |
566 | OptimizeForProcessor = procOptimizePentiumProAndAbove; | 559 | OptimizeForProcessor = procOptimizePentiumProAndAbove; |
567 | break; | 560 | break; |
568 | case 'A': | 561 | case 'A': |
569 | OptimizeForWindowsApplication = _True; | 562 | OptimizeForWindowsApplication = _True; |
570 | break; | 563 | break; |
571 | case 'F': | 564 | case 'F': |
572 | StringPooling = _True; | 565 | StringPooling = _True; |
573 | break; | 566 | break; |
574 | case 'H': | 567 | case 'H': |
575 | AdditionalOptions += option; | 568 | AdditionalOptions += option; |
576 | break; | 569 | break; |
577 | case 'L': | 570 | case 'L': |
578 | WholeProgramOptimization = _True; | 571 | WholeProgramOptimization = _True; |
579 | if ( third == '-' ) | 572 | if ( third == '-' ) |
580 | WholeProgramOptimization = _False; | 573 | WholeProgramOptimization = _False; |
581 | break; | 574 | break; |
582 | case 'R': | 575 | case 'R': |
583 | RuntimeTypeInfo = _True; | 576 | RuntimeTypeInfo = _True; |
584 | if ( third == '-' ) | 577 | if ( third == '-' ) |
585 | RuntimeTypeInfo = _False; | 578 | RuntimeTypeInfo = _False; |
586 | break; | 579 | break; |
587 | case 'S': | 580 | case 'S': |
588 | BufferSecurityCheck = _True; | 581 | BufferSecurityCheck = _True; |
589 | break; | 582 | break; |
590 | case 'T': | 583 | case 'T': |
591 | EnableFiberSafeOptimizations = _True; | 584 | EnableFiberSafeOptimizations = _True; |
592 | break; | 585 | break; |
593 | case 'X': | 586 | case 'X': |
587 | // ExceptionHandling == true will override with | ||
588 | // an /EHsc option, which is correct with /GX | ||
589 | ExceptionHandling = _True; // Fall-through | ||
594 | case 'Z': | 590 | case 'Z': |
595 | case 'e': | 591 | case 'e': |
596 | case 'h': | 592 | case 'h': |
597 | AdditionalOptions += option; | 593 | AdditionalOptions += option; |
598 | break; | 594 | break; |
599 | case 'd': | 595 | case 'd': |
600 | CallingConvention = callConventionCDecl; | 596 | CallingConvention = callConventionCDecl; |
601 | break; | 597 | break; |
602 | case 'f': | 598 | case 'f': |
603 | StringPooling = _True; | 599 | StringPooling = _True; |
604 | AdditionalOptions += option; | 600 | AdditionalOptions += option; |
605 | break; | 601 | break; |
606 | case 'm': | 602 | case 'm': |
607 | MinimalRebuild = _True; | 603 | MinimalRebuild = _True; |
608 | if ( third == '-' ) | 604 | if ( third == '-' ) |
609 | MinimalRebuild = _False; | 605 | MinimalRebuild = _False; |
610 | break; | 606 | break; |
611 | case 'r': | 607 | case 'r': |
612 | CallingConvention = callConventionFastCall; | 608 | CallingConvention = callConventionFastCall; |
613 | break; | 609 | break; |
614 | case 's': | 610 | case 's': |
615 | // Warning: following [num] is not used, | 611 | // Warning: following [num] is not used, |
616 | // were should we put it? | 612 | // were should we put it? |
617 | BufferSecurityCheck = _True; | 613 | BufferSecurityCheck = _True; |
618 | break; | 614 | break; |
619 | case 'y': | 615 | case 'y': |
620 | EnableFunctionLevelLinking = _True; | 616 | EnableFunctionLevelLinking = _True; |
621 | break; | 617 | break; |
622 | case 'z': | 618 | case 'z': |
623 | CallingConvention = callConventionStdCall; | 619 | CallingConvention = callConventionStdCall; |
624 | break; | 620 | break; |
625 | default: | 621 | default: |
626 | found = FALSE; break; | 622 | found = FALSE; break; |
627 | } | 623 | } |
628 | break; | 624 | break; |
629 | case 'H': | 625 | case 'H': |
630 | AdditionalOptions += option; | 626 | AdditionalOptions += option; |
631 | break; | 627 | break; |
632 | case 'I': | 628 | case 'I': |
633 | AdditionalIncludeDirectories += option+2; | 629 | AdditionalIncludeDirectories += option+2; |
634 | break; | 630 | break; |
635 | case 'L': | 631 | case 'L': |
636 | if ( second == 'D' ) { | 632 | if ( second == 'D' ) { |
637 | AdditionalOptions += option; | 633 | AdditionalOptions += option; |
638 | break; | 634 | break; |
639 | } | 635 | } |
640 | found = FALSE; break; | 636 | found = FALSE; break; |
641 | case 'M': | 637 | case 'M': |
642 | if ( second == 'D' ) { | 638 | if ( second == 'D' ) { |
643 | RuntimeLibrary = rtMultiThreadedDLL; | 639 | RuntimeLibrary = rtMultiThreadedDLL; |
644 | if ( third == 'd' ) | 640 | if ( third == 'd' ) |
645 | RuntimeLibrary = rtMultiThreadedDebugDLL; | 641 | RuntimeLibrary = rtMultiThreadedDebugDLL; |
646 | break; | 642 | break; |
647 | } else if ( second == 'L' ) { | 643 | } else if ( second == 'L' ) { |
648 | RuntimeLibrary = rtSingleThreaded; | 644 | RuntimeLibrary = rtSingleThreaded; |
649 | if ( third == 'd' ) | 645 | if ( third == 'd' ) |
650 | RuntimeLibrary = rtSingleThreadedDebug; | 646 | RuntimeLibrary = rtSingleThreadedDebug; |
651 | break; | 647 | break; |
652 | } else if ( second == 'T' ) { | 648 | } else if ( second == 'T' ) { |
653 | RuntimeLibrary = rtMultiThreaded; | 649 | RuntimeLibrary = rtMultiThreaded; |
654 | if ( third == 'd' ) | 650 | if ( third == 'd' ) |
655 | RuntimeLibrary = rtMultiThreadedDebug; | 651 | RuntimeLibrary = rtMultiThreadedDebug; |
656 | break; | 652 | break; |
657 | } | 653 | } |
658 | found = FALSE; break; | 654 | found = FALSE; break; |
659 | case 'O': | 655 | case 'O': |
660 | switch ( second ) { | 656 | switch ( second ) { |
661 | case '1': | 657 | case '1': |
662 | Optimization = optimizeMinSpace; | 658 | Optimization = optimizeMinSpace; |
663 | break; | 659 | break; |
664 | case '2': | 660 | case '2': |
665 | Optimization = optimizeMaxSpeed; | 661 | Optimization = optimizeMaxSpeed; |
666 | break; | 662 | break; |
667 | case 'a': | 663 | case 'a': |
668 | AdditionalOptions += option; | 664 | AdditionalOptions += option; |
669 | break; | 665 | break; |
670 | case 'b': | 666 | case 'b': |
671 | if ( third == '0' ) | 667 | if ( third == '0' ) |
672 | InlineFunctionExpansion = expandDisable; | 668 | InlineFunctionExpansion = expandDisable; |
673 | else if ( third == '1' ) | 669 | else if ( third == '1' ) |
674 | InlineFunctionExpansion = expandOnlyInline; | 670 | InlineFunctionExpansion = expandOnlyInline; |
675 | else if ( third == '2' ) | 671 | else if ( third == '2' ) |
676 | InlineFunctionExpansion = expandAnySuitable; | 672 | InlineFunctionExpansion = expandAnySuitable; |
677 | else | 673 | else |
678 | found = FALSE; | 674 | found = FALSE; |
679 | break; | 675 | break; |
680 | case 'd': | 676 | case 'd': |
681 | Optimization = optimizeDisabled; | 677 | Optimization = optimizeDisabled; |
682 | break; | 678 | break; |
683 | case 'g': | 679 | case 'g': |
684 | GlobalOptimizations = _True; | 680 | GlobalOptimizations = _True; |
685 | break; | 681 | break; |
686 | case 'i': | 682 | case 'i': |
687 | EnableIntrinsicFunctions = _True; | 683 | EnableIntrinsicFunctions = _True; |
688 | break; | 684 | break; |
689 | case 'p': | 685 | case 'p': |
@@ -861,258 +857,258 @@ bool VCCLCompilerTool::parseOption( const char* option ) | |||
861 | case '1': | 857 | case '1': |
862 | StructMemberAlignment = alignSingleByte; | 858 | StructMemberAlignment = alignSingleByte; |
863 | if ( fourth == '6' ) | 859 | if ( fourth == '6' ) |
864 | StructMemberAlignment = alignSixteenBytes; | 860 | StructMemberAlignment = alignSixteenBytes; |
865 | break; | 861 | break; |
866 | case '2': | 862 | case '2': |
867 | StructMemberAlignment = alignTwoBytes; | 863 | StructMemberAlignment = alignTwoBytes; |
868 | break; | 864 | break; |
869 | case '4': | 865 | case '4': |
870 | StructMemberAlignment = alignFourBytes; | 866 | StructMemberAlignment = alignFourBytes; |
871 | break; | 867 | break; |
872 | case '8': | 868 | case '8': |
873 | StructMemberAlignment = alignEightBytes; | 869 | StructMemberAlignment = alignEightBytes; |
874 | break; | 870 | break; |
875 | default: | 871 | default: |
876 | found = FALSE; break; | 872 | found = FALSE; break; |
877 | } | 873 | } |
878 | break; | 874 | break; |
879 | default: | 875 | default: |
880 | found = FALSE; break; | 876 | found = FALSE; break; |
881 | } | 877 | } |
882 | break; | 878 | break; |
883 | case 'c': | 879 | case 'c': |
884 | if ( second == '\0' ) { | 880 | if ( second == '\0' ) { |
885 | CompileOnly = _True; | 881 | CompileOnly = _True; |
886 | } else if ( second == 'l' ) { | 882 | } else if ( second == 'l' ) { |
887 | if ( *(option+5) == 'n' ) { | 883 | if ( *(option+5) == 'n' ) { |
888 | CompileAsManaged = managedAssembly; | 884 | CompileAsManaged = managedAssembly; |
889 | TurnOffAssemblyGeneration = _True; | 885 | TurnOffAssemblyGeneration = _True; |
890 | } else { | 886 | } else { |
891 | CompileAsManaged = managedAssembly; | 887 | CompileAsManaged = managedAssembly; |
892 | } | 888 | } |
893 | } else { | 889 | } else { |
894 | found = FALSE; break; | 890 | found = FALSE; break; |
895 | } | 891 | } |
896 | break; | 892 | break; |
897 | case 'd': | 893 | case 'd': |
898 | if ( second != 'r' ) { | 894 | if ( second != 'r' ) { |
899 | found = FALSE; break; | 895 | found = FALSE; break; |
900 | } | 896 | } |
901 | CompileAsManaged = managedAssembly; | 897 | CompileAsManaged = managedAssembly; |
902 | break; | 898 | break; |
903 | case 'n': | 899 | case 'n': |
904 | if ( second == 'o' && third == 'B' && fourth == 'o' ) { | 900 | if ( second == 'o' && third == 'B' && fourth == 'o' ) { |
905 | AdditionalOptions += "/noBool"; | 901 | AdditionalOptions += "/noBool"; |
906 | break; | 902 | break; |
907 | } | 903 | } |
908 | if ( second == 'o' && third == 'l' && fourth == 'o' ) { | 904 | if ( second == 'o' && third == 'l' && fourth == 'o' ) { |
909 | SuppressStartupBanner = _True; | 905 | SuppressStartupBanner = _True; |
910 | break; | 906 | break; |
911 | } | 907 | } |
912 | found = FALSE; break; | 908 | found = FALSE; break; |
913 | case 's': | 909 | case 's': |
914 | if ( second == 'h' && third == 'o' && fourth == 'w' ) { | 910 | if ( second == 'h' && third == 'o' && fourth == 'w' ) { |
915 | ShowIncludes = _True; | 911 | ShowIncludes = _True; |
916 | break; | 912 | break; |
917 | } | 913 | } |
918 | found = FALSE; break; | 914 | found = FALSE; break; |
919 | case 'u': | 915 | case 'u': |
920 | UndefineAllPreprocessorDefinitions = _True; | 916 | UndefineAllPreprocessorDefinitions = _True; |
921 | break; | 917 | break; |
922 | case 'v': | 918 | case 'v': |
923 | if ( second == 'd' || second == 'm' ) { | 919 | if ( second == 'd' || second == 'm' ) { |
924 | AdditionalOptions += option; | 920 | AdditionalOptions += option; |
925 | break; | 921 | break; |
926 | } | 922 | } |
927 | found = FALSE; break; | 923 | found = FALSE; break; |
928 | case 'w': | 924 | case 'w': |
929 | switch ( second ) { | 925 | switch ( second ) { |
930 | case '\0': | 926 | case '\0': |
931 | WarningLevel = warningLevel_0; | 927 | WarningLevel = warningLevel_0; |
932 | break; | 928 | break; |
933 | case 'd': | 929 | case 'd': |
934 | DisableSpecificWarnings += option+3; | 930 | DisableSpecificWarnings += option+3; |
935 | break; | 931 | break; |
936 | default: | 932 | default: |
937 | AdditionalOptions += option; | 933 | AdditionalOptions += option; |
938 | } | 934 | } |
939 | break; | 935 | break; |
940 | default: | 936 | default: |
941 | found = FALSE; break; | 937 | found = FALSE; break; |
942 | } | 938 | } |
943 | if( !found ) | 939 | if( !found ) |
944 | warn_msg( WarnLogic, "Could not parse Compiler option: %s", option ); | 940 | warn_msg( WarnLogic, "Could not parse Compiler option: %s", option ); |
945 | return TRUE; | 941 | return TRUE; |
946 | } | 942 | } |
947 | 943 | ||
948 | // VCLinkerTool ----------------------------------------------------- | 944 | // VCLinkerTool ----------------------------------------------------- |
949 | VCLinkerTool::VCLinkerTool() | 945 | VCLinkerTool::VCLinkerTool() |
950 | :EnableCOMDATFolding( optFoldingDefault ), | 946 | :EnableCOMDATFolding( optFoldingDefault ), |
951 | GenerateDebugInformation( unset ), | 947 | GenerateDebugInformation( unset ), |
952 | GenerateMapFile( unset ), | 948 | GenerateMapFile( unset ), |
953 | HeapCommitSize( -1 ), | 949 | HeapCommitSize( -1 ), |
954 | HeapReserveSize( -1 ), | 950 | HeapReserveSize( -1 ), |
955 | IgnoreAllDefaultLibraries( unset ), | 951 | IgnoreAllDefaultLibraries( unset ), |
956 | IgnoreEmbeddedIDL( unset ), | 952 | IgnoreEmbeddedIDL( unset ), |
957 | IgnoreImportLibrary( unset ), | 953 | IgnoreImportLibrary( _True ), |
958 | LargeAddressAware( addrAwareDefault ), | 954 | LargeAddressAware( addrAwareDefault ), |
959 | LinkDLL( unset ), | 955 | LinkDLL( unset ), |
960 | LinkIncremental( linkIncrementalYes ), | 956 | LinkIncremental( linkIncrementalDefault ), |
961 | LinkTimeCodeGeneration( unset ), | 957 | LinkTimeCodeGeneration( unset ), |
962 | MapExports( unset ), | 958 | MapExports( unset ), |
963 | MapLines( unset ), | 959 | MapLines( unset ), |
964 | OptimizeForWindows98( optWin98Default ), | 960 | OptimizeForWindows98( optWin98Default ), |
965 | OptimizeReferences( optReferencesDefault ), | 961 | OptimizeReferences( optReferencesDefault ), |
966 | RegisterOutput( unset ), | 962 | RegisterOutput( unset ), |
967 | ResourceOnlyDLL( unset ), | 963 | ResourceOnlyDLL( unset ), |
968 | SetChecksum( unset ), | 964 | SetChecksum( unset ), |
969 | ShowProgress( linkProgressNotSet ), | 965 | ShowProgress( linkProgressNotSet ), |
970 | StackCommitSize( -1 ), | 966 | StackCommitSize( -1 ), |
971 | StackReserveSize( -1 ), | 967 | StackReserveSize( -1 ), |
972 | SubSystem( subSystemNotSet ), | 968 | SubSystem( subSystemNotSet ), |
973 | SupportUnloadOfDelayLoadedDLL( unset ), | 969 | SupportUnloadOfDelayLoadedDLL( unset ), |
974 | SuppressStartupBanner( unset ), | 970 | SuppressStartupBanner( unset ), |
975 | SwapRunFromCD( unset ), | 971 | SwapRunFromCD( unset ), |
976 | SwapRunFromNet( unset ), | 972 | SwapRunFromNet( unset ), |
977 | TargetMachine( machineNotSet ), | 973 | TargetMachine( machineNotSet ), |
978 | TerminalServerAware( termSvrAwareDefault ), | 974 | TerminalServerAware( termSvrAwareDefault ), |
979 | TurnOffAssemblyGeneration( unset ), | 975 | TurnOffAssemblyGeneration( unset ), |
980 | TypeLibraryResourceID( 0 ) | 976 | TypeLibraryResourceID( 0 ) |
981 | { | 977 | { |
982 | } | 978 | } |
983 | 979 | ||
984 | QTextStream &operator<<( QTextStream &strm, const VCLinkerTool &tool ) | 980 | QTextStream &operator<<( QTextStream &strm, const VCLinkerTool &tool ) |
985 | { | 981 | { |
986 | strm << _begTool3; | 982 | strm << _begTool3; |
987 | strm << _VCLinkerToolName; | 983 | strm << _VCLinkerToolName; |
988 | strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies, " " ); | 984 | strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies, " " ); |
989 | strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories ); | 985 | strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories ); |
990 | strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " ); | 986 | strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " ); |
991 | strm << XPair( _AddModuleNamesToAssembly, tool.AddModuleNamesToAssembly ); | 987 | strm << XPair( _AddModuleNamesToAssembly, tool.AddModuleNamesToAssembly ); |
992 | strm << SPair( _BaseAddress, tool.BaseAddress ); | 988 | strm << SPair( _BaseAddress, tool.BaseAddress ); |
993 | strm << XPair( _DelayLoadDLLs, tool.DelayLoadDLLs ); | 989 | strm << XPair( _DelayLoadDLLs, tool.DelayLoadDLLs ); |
994 | if ( tool.EnableCOMDATFolding != optFoldingDefault ) strm << EPair( _EnableCOMDATFolding, tool.EnableCOMDATFolding ); | 990 | if ( tool.EnableCOMDATFolding != optFoldingDefault ) strm << EPair( _EnableCOMDATFolding, tool.EnableCOMDATFolding ); |
995 | strm << SPair( _EntryPointSymbol, tool.EntryPointSymbol ); | 991 | strm << SPair( _EntryPointSymbol, tool.EntryPointSymbol ); |
996 | strm << XPair( _ForceSymbolReferences, tool.ForceSymbolReferences ); | 992 | strm << XPair( _ForceSymbolReferences, tool.ForceSymbolReferences ); |
997 | strm << SPair( _FunctionOrder, tool.FunctionOrder ); | 993 | strm << SPair( _FunctionOrder, tool.FunctionOrder ); |
998 | strm << TPair( _GenerateDebugInformation, tool.GenerateDebugInformation ); | 994 | strm << TPair( _GenerateDebugInformation, tool.GenerateDebugInformation ); |
999 | strm << TPair( _GenerateMapFile, tool.GenerateMapFile ); | 995 | strm << TPair( _GenerateMapFile, tool.GenerateMapFile ); |
1000 | if ( tool.HeapCommitSize != -1 ) strm << LPair( _HeapCommitSize, tool.HeapCommitSize ); | 996 | if ( tool.HeapCommitSize != -1 ) strm << LPair( _HeapCommitSize, tool.HeapCommitSize ); |
1001 | if ( tool.HeapReserveSize != -1 ) strm << LPair( _HeapReserveSize, tool.HeapReserveSize ); | 997 | if ( tool.HeapReserveSize != -1 ) strm << LPair( _HeapReserveSize, tool.HeapReserveSize ); |
1002 | strm << TPair( _IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries ); | 998 | strm << TPair( _IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries ); |
1003 | strm << XPair( _IgnoreDefaultLibraryNames, tool.IgnoreDefaultLibraryNames ); | 999 | strm << XPair( _IgnoreDefaultLibraryNames, tool.IgnoreDefaultLibraryNames ); |
1004 | strm << TPair( _IgnoreEmbeddedIDL, tool.IgnoreEmbeddedIDL ); | 1000 | strm << TPair( _IgnoreEmbeddedIDL, tool.IgnoreEmbeddedIDL ); |
1005 | strm << TPair( _IgnoreImportLibrary, tool.IgnoreImportLibrary ); | 1001 | strm << TPair( _IgnoreImportLibrary, tool.IgnoreImportLibrary ); |
1006 | strm << SPair( _ImportLibrary, tool.ImportLibrary ); | 1002 | strm << SPair( _ImportLibrary, tool.ImportLibrary ); |
1007 | if ( tool.LargeAddressAware != addrAwareDefault ) strm << EPair( _LargeAddressAware, tool.LargeAddressAware ); | 1003 | if ( tool.LargeAddressAware != addrAwareDefault ) strm << EPair( _LargeAddressAware, tool.LargeAddressAware ); |
1008 | strm << TPair( _LinkDLL, tool.LinkDLL ); | 1004 | strm << TPair( _LinkDLL, tool.LinkDLL ); |
1009 | if ( tool.LinkIncremental != linkIncrementalDefault ) strm << EPair( _LinkIncremental, tool.LinkIncremental ); | 1005 | if ( tool.LinkIncremental != linkIncrementalDefault ) strm << EPair( _LinkIncremental, tool.LinkIncremental ); |
1010 | strm << TPair( _LinkTimeCodeGeneration, tool.LinkTimeCodeGeneration ); | 1006 | strm << TPair( _LinkTimeCodeGeneration, tool.LinkTimeCodeGeneration ); |
1011 | strm << SPair( _LinkToManagedResourceFile, tool.LinkToManagedResourceFile ); | 1007 | strm << SPair( _LinkToManagedResourceFile, tool.LinkToManagedResourceFile ); |
1012 | strm << TPair( _MapExports, tool.MapExports ); | 1008 | strm << TPair( _MapExports, tool.MapExports ); |
1013 | strm << SPair( _MapFileName, tool.MapFileName ); | 1009 | strm << SPair( _MapFileName, tool.MapFileName ); |
1014 | strm << TPair( _MapLines, tool.MapLines ); | 1010 | strm << TPair( _MapLines, tool.MapLines ); |
1015 | strm << SPair( _MergedIDLBaseFileName, tool.MergedIDLBaseFileName ); | 1011 | strm << SPair( _MergedIDLBaseFileName, tool.MergedIDLBaseFileName ); |
1016 | strm << SPair( _MergeSections, tool.MergeSections ); | 1012 | strm << SPair( _MergeSections, tool.MergeSections ); |
1017 | strm << SPair( _MidlCommandFile, tool.MidlCommandFile ); | 1013 | strm << SPair( _MidlCommandFile, tool.MidlCommandFile ); |
1018 | strm << SPair( _ModuleDefinitionFile, tool.ModuleDefinitionFile ); | 1014 | strm << SPair( _ModuleDefinitionFile, tool.ModuleDefinitionFile ); |
1019 | if ( tool.OptimizeForWindows98 != optWin98Default ) strm << EPair( _OptimizeForWindows98, tool.OptimizeForWindows98 ); | 1015 | if ( tool.OptimizeForWindows98 != optWin98Default ) strm << EPair( _OptimizeForWindows98, tool.OptimizeForWindows98 ); |
1020 | if ( tool.OptimizeReferences != optReferencesDefault ) strm << EPair( _OptimizeReferences, tool.OptimizeReferences ); | 1016 | if ( tool.OptimizeReferences != optReferencesDefault ) strm << EPair( _OptimizeReferences, tool.OptimizeReferences ); |
1021 | strm << SPair( _OutputFile, tool.OutputFile ); | 1017 | strm << SPair( _OutputFile, tool.OutputFile ); |
1022 | strm << SPair( _ProgramDatabaseFile, tool.ProgramDatabaseFile ); | 1018 | strm << _ProgramDatabaseFile << tool.ProgramDatabaseFile << "\""; |
1023 | strm << TPair( _RegisterOutput, tool.RegisterOutput ); | 1019 | strm << TPair( _RegisterOutput, tool.RegisterOutput ); |
1024 | strm << TPair( _ResourceOnlyDLL, tool.ResourceOnlyDLL ); | 1020 | strm << TPair( _ResourceOnlyDLL, tool.ResourceOnlyDLL ); |
1025 | strm << TPair( _SetChecksum, tool.SetChecksum ); | 1021 | strm << TPair( _SetChecksum, tool.SetChecksum ); |
1026 | if ( tool.ShowProgress != linkProgressNotSet ) strm << EPair( _ShowProgress, tool.ShowProgress ); | 1022 | if ( tool.ShowProgress != linkProgressNotSet ) strm << EPair( _ShowProgress, tool.ShowProgress ); |
1027 | if ( tool.StackCommitSize != -1 ) strm << LPair( _StackCommitSize, tool.StackCommitSize ); | 1023 | if ( tool.StackCommitSize != -1 ) strm << LPair( _StackCommitSize, tool.StackCommitSize ); |
1028 | if ( tool.StackReserveSize != -1 ) strm << LPair( _StackReserveSize, tool.StackReserveSize ); | 1024 | if ( tool.StackReserveSize != -1 ) strm << LPair( _StackReserveSize, tool.StackReserveSize ); |
1029 | strm << SPair( _StripPrivateSymbols, tool.StripPrivateSymbols ); | 1025 | strm << SPair( _StripPrivateSymbols, tool.StripPrivateSymbols ); |
1030 | strm << EPair( _SubSystem, tool.SubSystem ); | 1026 | strm << EPair( _SubSystem, tool.SubSystem ); |
1031 | strm << TPair( _SupportUnloadOfDelayLoadedDLL, tool.SupportUnloadOfDelayLoadedDLL ); | 1027 | strm << TPair( _SupportUnloadOfDelayLoadedDLL, tool.SupportUnloadOfDelayLoadedDLL ); |
1032 | strm << TPair( _SuppressStartupBanner, tool.SuppressStartupBanner ); | 1028 | strm << TPair( _SuppressStartupBanner, tool.SuppressStartupBanner ); |
1033 | strm << TPair( _SwapRunFromCD, tool.SwapRunFromCD ); | 1029 | strm << TPair( _SwapRunFromCD, tool.SwapRunFromCD ); |
1034 | strm << TPair( _SwapRunFromNet, tool.SwapRunFromNet ); | 1030 | strm << TPair( _SwapRunFromNet, tool.SwapRunFromNet ); |
1035 | if ( tool.TargetMachine != machineNotSet ) strm << EPair( _TargetMachine, tool.TargetMachine ); | 1031 | if ( tool.TargetMachine != machineNotSet ) strm << EPair( _TargetMachine, tool.TargetMachine ); |
1036 | if ( tool.TerminalServerAware != termSvrAwareDefault ) strm << EPair( _TerminalServerAware, tool.TerminalServerAware ); | 1032 | if ( tool.TerminalServerAware != termSvrAwareDefault ) strm << EPair( _TerminalServerAware, tool.TerminalServerAware ); |
1037 | strm << TPair( _TurnOffAssemblyGeneration, tool.TurnOffAssemblyGeneration ); | 1033 | strm << TPair( _TurnOffAssemblyGeneration, tool.TurnOffAssemblyGeneration ); |
1038 | strm << SPair( _TypeLibraryFile, tool.TypeLibraryFile ); | 1034 | strm << SPair( _TypeLibraryFile, tool.TypeLibraryFile ); |
1039 | if ( tool.TypeLibraryResourceID != rcUseDefault ) strm << LPair( _TypeLibraryResourceID, tool.TypeLibraryResourceID ); | 1035 | if ( tool.TypeLibraryResourceID != rcUseDefault ) strm << LPair( _TypeLibraryResourceID, tool.TypeLibraryResourceID ); |
1040 | strm << SPair( _Version4, tool.Version ); | 1036 | strm << SPair( _Version4, tool.Version ); |
1041 | strm << "/>"; | 1037 | strm << "/>"; |
1042 | return strm; | 1038 | return strm; |
1043 | } | 1039 | } |
1044 | 1040 | ||
1045 | // Hashing routine to do fast option lookups ---- | 1041 | // Hashing routine to do fast option lookups ---- |
1046 | // Slightly rewritten to stop on ':' ',' and '\0' | 1042 | // Slightly rewritten to stop on ':' ',' and '\0' |
1047 | // Original routine in qtranslator.cpp ---------- | 1043 | // Original routine in qtranslator.cpp ---------- |
1048 | static uint elfHash( const char* name ) | 1044 | static uint elfHash( const char* name ) |
1049 | { | 1045 | { |
1050 | const uchar *k; | 1046 | const uchar *k; |
1051 | uint h = 0; | 1047 | uint h = 0; |
1052 | uint g; | 1048 | uint g; |
1053 | 1049 | ||
1054 | if ( name ) { | 1050 | if ( name ) { |
1055 | k = (const uchar *) name; | 1051 | k = (const uchar *) name; |
1056 | while ( (*k) && | 1052 | while ( (*k) && |
1057 | (*k)!= ':' && | 1053 | (*k)!= ':' && |
1058 | (*k)!=',' && | 1054 | (*k)!=',' && |
1059 | (*k)!=' ' ) { | 1055 | (*k)!=' ' ) { |
1060 | h = ( h << 4 ) + *k++; | 1056 | h = ( h << 4 ) + *k++; |
1061 | if ( (g = (h & 0xf0000000)) != 0 ) | 1057 | if ( (g = (h & 0xf0000000)) != 0 ) |
1062 | h ^= g >> 24; | 1058 | h ^= g >> 24; |
1063 | h &= ~g; | 1059 | h &= ~g; |
1064 | } | 1060 | } |
1065 | } | 1061 | } |
1066 | if ( !h ) | 1062 | if ( !h ) |
1067 | h = 1; | 1063 | h = 1; |
1068 | return h; | 1064 | return h; |
1069 | } | 1065 | } |
1070 | 1066 | ||
1071 | //#define USE_DISPLAY_HASH | 1067 | //#define USE_DISPLAY_HASH |
1072 | #ifdef USE_DISPLAY_HASH | 1068 | #ifdef USE_DISPLAY_HASH |
1073 | static void displayHash( const char* str ) | 1069 | static void displayHash( const char* str ) |
1074 | { | 1070 | { |
1075 | printf( "case 0x%07x: // %s\n break;\n", elfHash(str), str ); | 1071 | printf( "case 0x%07x: // %s\n break;\n", elfHash(str), str ); |
1076 | } | 1072 | } |
1077 | #endif | 1073 | #endif |
1078 | 1074 | ||
1079 | bool VCLinkerTool::parseOption( const char* option ) | 1075 | bool VCLinkerTool::parseOption( const char* option ) |
1080 | { | 1076 | { |
1081 | #ifdef USE_DISPLAY_HASH | 1077 | #ifdef USE_DISPLAY_HASH |
1082 | // Main options | 1078 | // Main options |
1083 | displayHash( "/ALIGN" ); displayHash( "/ALLOWBIND" ); displayHash( "/ASSEMBLYMODULE" ); | 1079 | displayHash( "/ALIGN" ); displayHash( "/ALLOWBIND" ); displayHash( "/ASSEMBLYMODULE" ); |
1084 | displayHash( "/ASSEMBLYRESOURCE" ); displayHash( "/BASE" ); displayHash( "/DEBUG" ); | 1080 | displayHash( "/ASSEMBLYRESOURCE" ); displayHash( "/BASE" ); displayHash( "/DEBUG" ); |
1085 | displayHash( "/DEF" ); displayHash( "/DEFAULTLIB" ); displayHash( "/DELAY" ); | 1081 | displayHash( "/DEF" ); displayHash( "/DEFAULTLIB" ); displayHash( "/DELAY" ); |
1086 | displayHash( "/DELAYLOAD" ); displayHash( "/DLL" ); displayHash( "/DRIVER" ); | 1082 | displayHash( "/DELAYLOAD" ); displayHash( "/DLL" ); displayHash( "/DRIVER" ); |
1087 | displayHash( "/ENTRY" ); displayHash( "/EXETYPE" ); displayHash( "/EXPORT" ); | 1083 | displayHash( "/ENTRY" ); displayHash( "/EXETYPE" ); displayHash( "/EXPORT" ); |
1088 | displayHash( "/FIXED" ); displayHash( "/FORCE" ); displayHash( "/HEAP" ); | 1084 | displayHash( "/FIXED" ); displayHash( "/FORCE" ); displayHash( "/HEAP" ); |
1089 | displayHash( "/IDLOUT" ); displayHash( "/IGNOREIDL" ); displayHash( "/IMPLIB" ); | 1085 | displayHash( "/IDLOUT" ); displayHash( "/IGNOREIDL" ); displayHash( "/IMPLIB" ); |
1090 | displayHash( "/INCLUDE" ); displayHash( "/INCREMENTAL" ); displayHash( "/LARGEADDRESSAWARE" ); | 1086 | displayHash( "/INCLUDE" ); displayHash( "/INCREMENTAL" ); displayHash( "/LARGEADDRESSAWARE" ); |
1091 | displayHash( "/LIBPATH" ); displayHash( "/LTCG" ); displayHash( "/MACHINE" ); | 1087 | displayHash( "/LIBPATH" ); displayHash( "/LTCG" ); displayHash( "/MACHINE" ); |
1092 | displayHash( "/MAP" ); displayHash( "/MAPINFO" ); displayHash( "/MERGE" ); | 1088 | displayHash( "/MAP" ); displayHash( "/MAPINFO" ); displayHash( "/MERGE" ); |
1093 | displayHash( "/MIDL" ); displayHash( "/NOASSEMBLY" ); displayHash( "/NODEFAULTLIB" ); | 1089 | displayHash( "/MIDL" ); displayHash( "/NOASSEMBLY" ); displayHash( "/NODEFAULTLIB" ); |
1094 | displayHash( "/NOENTRY" ); displayHash( "/NOLOGO" ); displayHash( "/OPT" ); | 1090 | displayHash( "/NOENTRY" ); displayHash( "/NOLOGO" ); displayHash( "/OPT" ); |
1095 | displayHash( "/ORDER" ); displayHash( "/OUT" ); displayHash( "/PDB" ); | 1091 | displayHash( "/ORDER" ); displayHash( "/OUT" ); displayHash( "/PDB" ); |
1096 | displayHash( "/PDBSTRIPPED" ); displayHash( "/RELEASE" ); displayHash( "/SECTION" ); | 1092 | displayHash( "/PDBSTRIPPED" ); displayHash( "/RELEASE" ); displayHash( "/SECTION" ); |
1097 | displayHash( "/STACK" ); displayHash( "/STUB" ); displayHash( "/SUBSYSTEM" ); | 1093 | displayHash( "/STACK" ); displayHash( "/STUB" ); displayHash( "/SUBSYSTEM" ); |
1098 | displayHash( "/SWAPRUN" ); displayHash( "/TLBID" ); displayHash( "/TLBOUT" ); | 1094 | displayHash( "/SWAPRUN" ); displayHash( "/TLBID" ); displayHash( "/TLBOUT" ); |
1099 | displayHash( "/TSAWARE" ); displayHash( "/VERBOSE" ); displayHash( "/VERSION" ); | 1095 | displayHash( "/TSAWARE" ); displayHash( "/VERBOSE" ); displayHash( "/VERSION" ); |
1100 | displayHash( "/VXD" ); displayHash( "/WS " ); | 1096 | displayHash( "/VXD" ); displayHash( "/WS " ); |
1101 | #endif | 1097 | #endif |
1102 | #ifdef USE_DISPLAY_HASH | 1098 | #ifdef USE_DISPLAY_HASH |
1103 | // Sub options | 1099 | // Sub options |
1104 | displayHash( "UNLOAD" ); displayHash( "NOBIND" ); displayHash( "no" ); displayHash( "NOSTATUS" ); displayHash( "STATUS" ); | 1100 | displayHash( "UNLOAD" ); displayHash( "NOBIND" ); displayHash( "no" ); displayHash( "NOSTATUS" ); displayHash( "STATUS" ); |
1105 | displayHash( "AM33" ); displayHash( "ARM" ); displayHash( "CEE" ); displayHash( "IA64" ); displayHash( "X86" ); displayHash( "M32R" ); | 1101 | displayHash( "AM33" ); displayHash( "ARM" ); displayHash( "CEE" ); displayHash( "IA64" ); displayHash( "X86" ); displayHash( "M32R" ); |
1106 | displayHash( "MIPS" ); displayHash( "MIPS16" ); displayHash( "MIPSFPU" ); displayHash( "MIPSFPU16" ); displayHash( "MIPSR41XX" ); displayHash( "PPC" ); | 1102 | displayHash( "MIPS" ); displayHash( "MIPS16" ); displayHash( "MIPSFPU" ); displayHash( "MIPSFPU16" ); displayHash( "MIPSR41XX" ); displayHash( "PPC" ); |
1107 | displayHash( "SH3" ); displayHash( "SH4" ); displayHash( "SH5" ); displayHash( "THUMB" ); displayHash( "TRICORE" ); displayHash( "EXPORTS" ); | 1103 | displayHash( "SH3" ); displayHash( "SH4" ); displayHash( "SH5" ); displayHash( "THUMB" ); displayHash( "TRICORE" ); displayHash( "EXPORTS" ); |
1108 | displayHash( "LINES" ); displayHash( "REF" ); displayHash( "NOREF" ); displayHash( "ICF" ); displayHash( "WIN98" ); displayHash( "NOWIN98" ); | 1104 | displayHash( "LINES" ); displayHash( "REF" ); displayHash( "NOREF" ); displayHash( "ICF" ); displayHash( "WIN98" ); displayHash( "NOWIN98" ); |
1109 | displayHash( "CONSOLE" ); displayHash( "EFI_APPLICATION" ); displayHash( "EFI_BOOT_SERVICE_DRIVER" ); displayHash( "EFI_ROM" ); displayHash( "EFI_RUNTIME_DRIVER" ); displayHash( "NATIVE" ); | 1105 | displayHash( "CONSOLE" ); displayHash( "EFI_APPLICATION" ); displayHash( "EFI_BOOT_SERVICE_DRIVER" ); displayHash( "EFI_ROM" ); displayHash( "EFI_RUNTIME_DRIVER" ); displayHash( "NATIVE" ); |
1110 | displayHash( "POSIX" ); displayHash( "WINDOWS" ); displayHash( "WINDOWSCE" ); displayHash( "NET" ); displayHash( "CD" ); displayHash( "NO" ); | 1106 | displayHash( "POSIX" ); displayHash( "WINDOWS" ); displayHash( "WINDOWSCE" ); displayHash( "NET" ); displayHash( "CD" ); displayHash( "NO" ); |
1111 | #endif | 1107 | #endif |
1112 | bool found = TRUE; | 1108 | bool found = TRUE; |
1113 | switch ( elfHash(option) ) { | 1109 | switch ( elfHash(option) ) { |
1114 | case 0x3360dbe: // /ALIGN[:number] | 1110 | case 0x3360dbe: // /ALIGN[:number] |
1115 | case 0x1485c34: // /ALLOWBIND[:NO] | 1111 | case 0x1485c34: // /ALLOWBIND[:NO] |
1116 | case 0x6b21972: // /DEFAULTLIB:library | 1112 | case 0x6b21972: // /DEFAULTLIB:library |
1117 | case 0x396ea92: // /DRIVER[:UPONLY | :WDM] | 1113 | case 0x396ea92: // /DRIVER[:UPONLY | :WDM] |
1118 | case 0xaca9d75: // /EXETYPE[:DYNAMIC | :DEV386] | 1114 | case 0xaca9d75: // /EXETYPE[:DYNAMIC | :DEV386] |
@@ -1614,379 +1610,504 @@ bool VCMIDLTool::parseOption( const char* option ) | |||
1614 | case 0x5b1cb97: // /app_config | 1610 | case 0x5b1cb97: // /app_config |
1615 | case 0x3595cf4: // /c_ext | 1611 | case 0x3595cf4: // /c_ext |
1616 | case 0x5a2fc64: // /client {none|stub} | 1612 | case 0x5a2fc64: // /client {none|stub} |
1617 | case 0xa64d3dd: // /confirm | 1613 | case 0xa64d3dd: // /confirm |
1618 | case 0xa765b64: // /cpp_cmd cmd_line | 1614 | case 0xa765b64: // /cpp_cmd cmd_line |
1619 | case 0x35aabb2: // /cstub filename | 1615 | case 0x35aabb2: // /cstub filename |
1620 | case 0x03629f4: // /lcid | 1616 | case 0x03629f4: // /lcid |
1621 | case 0x6495cc4: // /ms_ext | 1617 | case 0x6495cc4: // /ms_ext |
1622 | case 0x96c7a1e: // /ms_union | 1618 | case 0x96c7a1e: // /ms_union |
1623 | case 0x4996fa2: // /msc_ver <nnnn> | 1619 | case 0x4996fa2: // /msc_ver <nnnn> |
1624 | case 0x64ceb12: // /newtlb | 1620 | case 0x64ceb12: // /newtlb |
1625 | case 0x6555a40: // /no_cpp | 1621 | case 0x6555a40: // /no_cpp |
1626 | case 0xf64d6a6: // /no_default_epv | 1622 | case 0xf64d6a6: // /no_default_epv |
1627 | case 0x6dd9384: // /no_format_opt | 1623 | case 0x6dd9384: // /no_format_opt |
1628 | case 0x556dbee: // /no_warn | 1624 | case 0x556dbee: // /no_warn |
1629 | case 0x3655a70: // /nocpp | 1625 | case 0x3655a70: // /nocpp |
1630 | case 0x2b455a3: // /oldnames | 1626 | case 0x2b455a3: // /oldnames |
1631 | case 0x662bb12: // /oldtlb | 1627 | case 0x662bb12: // /oldtlb |
1632 | case 0x0036696: // /osf | 1628 | case 0x0036696: // /osf |
1633 | case 0x036679b: // /pack {N} | 1629 | case 0x036679b: // /pack {N} |
1634 | case 0x678bd38: // /prefix {all|client|server|switch} | 1630 | case 0x678bd38: // /prefix {all|client|server|switch} |
1635 | case 0x96b702c: // /protocol {all|dce|ndr64} | 1631 | case 0x96b702c: // /protocol {all|dce|ndr64} |
1636 | case 0x3696aa3: // /rpcss | 1632 | case 0x3696aa3: // /rpcss |
1637 | case 0x698ca60: // /savePP | 1633 | case 0x698ca60: // /savePP |
1638 | case 0x69c9cf2: // /server {none|stub} | 1634 | case 0x69c9cf2: // /server {none|stub} |
1639 | case 0x36aabb2: // /sstub filename | 1635 | case 0x36aabb2: // /sstub filename |
1640 | case 0xce9b12b: // /syntax_check | 1636 | case 0xce9b12b: // /syntax_check |
1641 | case 0xc9b5f16: // /use_epv | 1637 | case 0xc9b5f16: // /use_epv |
1642 | AdditionalOptions += option; | 1638 | AdditionalOptions += option; |
1643 | break; | 1639 | break; |
1644 | default: | 1640 | default: |
1645 | // /W{0|1|2|3|4} case | 1641 | // /W{0|1|2|3|4} case |
1646 | if ( *(option+1) == 'W' ) { | 1642 | if ( *(option+1) == 'W' ) { |
1647 | switch ( *(option+2) ) { | 1643 | switch ( *(option+2) ) { |
1648 | case '0': | 1644 | case '0': |
1649 | WarningLevel = midlWarningLevel_0; | 1645 | WarningLevel = midlWarningLevel_0; |
1650 | break; | 1646 | break; |
1651 | case '1': | 1647 | case '1': |
1652 | WarningLevel = midlWarningLevel_1; | 1648 | WarningLevel = midlWarningLevel_1; |
1653 | break; | 1649 | break; |
1654 | case '2': | 1650 | case '2': |
1655 | WarningLevel = midlWarningLevel_2; | 1651 | WarningLevel = midlWarningLevel_2; |
1656 | break; | 1652 | break; |
1657 | case '3': | 1653 | case '3': |
1658 | WarningLevel = midlWarningLevel_3; | 1654 | WarningLevel = midlWarningLevel_3; |
1659 | break; | 1655 | break; |
1660 | case '4': | 1656 | case '4': |
1661 | WarningLevel = midlWarningLevel_4; | 1657 | WarningLevel = midlWarningLevel_4; |
1662 | break; | 1658 | break; |
1663 | default: | 1659 | default: |
1664 | found = FALSE; | 1660 | found = FALSE; |
1665 | } | 1661 | } |
1666 | } | 1662 | } |
1667 | break; | 1663 | break; |
1668 | } | 1664 | } |
1669 | if( !found ) | 1665 | if( !found ) |
1670 | warn_msg( WarnLogic, "Could not parse MIDL option: %s", option ); | 1666 | warn_msg( WarnLogic, "Could not parse MIDL option: %s", option ); |
1671 | return TRUE; | 1667 | return TRUE; |
1672 | } | 1668 | } |
1673 | 1669 | ||
1674 | // VCLibrarianTool -------------------------------------------------- | 1670 | // VCLibrarianTool -------------------------------------------------- |
1675 | VCLibrarianTool::VCLibrarianTool() | 1671 | VCLibrarianTool::VCLibrarianTool() |
1676 | :IgnoreAllDefaultLibraries( unset ), | 1672 | :IgnoreAllDefaultLibraries( unset ), |
1677 | SuppressStartupBanner( _True ) | 1673 | SuppressStartupBanner( _True ) |
1678 | { | 1674 | { |
1679 | } | 1675 | } |
1680 | 1676 | ||
1681 | QTextStream &operator<<( QTextStream &strm, const VCLibrarianTool &tool ) | 1677 | QTextStream &operator<<( QTextStream &strm, const VCLibrarianTool &tool ) |
1682 | { | 1678 | { |
1683 | strm << _begTool3; | 1679 | strm << _begTool3; |
1684 | strm << SPair( _ToolName, QString( "VCLibrarianTool" ) ); | 1680 | strm << SPair( _ToolName, QString( "VCLibrarianTool" ) ); |
1685 | strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies ); | 1681 | strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies ); |
1686 | strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories ); | 1682 | strm << XPair( _AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories ); |
1687 | strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " ); | 1683 | strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " ); |
1688 | strm << XPair( _ExportNamedFunctions, tool.ExportNamedFunctions ); | 1684 | strm << XPair( _ExportNamedFunctions, tool.ExportNamedFunctions ); |
1689 | strm << XPair( _ForceSymbolReferences, tool.ForceSymbolReferences ); | 1685 | strm << XPair( _ForceSymbolReferences, tool.ForceSymbolReferences ); |
1690 | strm << TPair( _IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries ); | 1686 | strm << TPair( _IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries ); |
1691 | strm << XPair( _IgnoreDefaultLibraryNames, tool.IgnoreDefaultLibraryNames ); | 1687 | strm << XPair( _IgnoreDefaultLibraryNames, tool.IgnoreDefaultLibraryNames ); |
1692 | strm << SPair( _ModuleDefinitionFile, tool.ModuleDefinitionFile ); | 1688 | strm << SPair( _ModuleDefinitionFile, tool.ModuleDefinitionFile ); |
1693 | strm << SPair( _OutputFile, tool.OutputFile ); | 1689 | strm << SPair( _OutputFile, tool.OutputFile ); |
1694 | strm << TPair( _SuppressStartupBanner, tool.SuppressStartupBanner ); | 1690 | strm << TPair( _SuppressStartupBanner, tool.SuppressStartupBanner ); |
1695 | strm << "/>"; | 1691 | strm << "/>"; |
1696 | return strm; | 1692 | return strm; |
1697 | } | 1693 | } |
1698 | 1694 | ||
1699 | // VCCustomBuildTool ------------------------------------------------ | 1695 | // VCCustomBuildTool ------------------------------------------------ |
1700 | VCCustomBuildTool::VCCustomBuildTool() | 1696 | VCCustomBuildTool::VCCustomBuildTool() |
1701 | { | 1697 | { |
1702 | ToolName = "VCCustomBuildTool"; | 1698 | ToolName = "VCCustomBuildTool"; |
1703 | } | 1699 | } |
1704 | 1700 | ||
1705 | QTextStream &operator<<( QTextStream &strm, const VCCustomBuildTool &tool ) | 1701 | QTextStream &operator<<( QTextStream &strm, const VCCustomBuildTool &tool ) |
1706 | { | 1702 | { |
1707 | strm << _begTool3; | 1703 | strm << _begTool3; |
1708 | strm << SPair( _ToolName, tool.ToolName ); | 1704 | strm << SPair( _ToolName, tool.ToolName ); |
1709 | strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies, ";" ); | 1705 | strm << XPair( _AdditionalDependencies4, tool.AdditionalDependencies, ";" ); |
1710 | strm << SPair( _CommandLine4, tool.CommandLine ); | 1706 | strm << XPair( _CommandLine4, tool.CommandLine, "\n" ); |
1711 | strm << SPair( _Description4, tool.Description ); | 1707 | strm << SPair( _Description4, tool.Description ); |
1712 | strm << SPair( _Outputs4, tool.Outputs ); | 1708 | strm << XPair( _Outputs4, tool.Outputs, ";" ); |
1713 | strm << SPair( _ToolPath, tool.ToolPath ); | 1709 | strm << SPair( _ToolPath, tool.ToolPath ); |
1714 | strm << "/>"; | 1710 | strm << "/>"; |
1715 | return strm; | 1711 | return strm; |
1716 | } | 1712 | } |
1717 | 1713 | ||
1718 | // VCResourceCompilerTool ------------------------------------------- | 1714 | // VCResourceCompilerTool ------------------------------------------- |
1719 | VCResourceCompilerTool::VCResourceCompilerTool() | 1715 | VCResourceCompilerTool::VCResourceCompilerTool() |
1720 | : Culture( rcUseDefault ), | 1716 | : Culture( rcUseDefault ), |
1721 | IgnoreStandardIncludePath( unset ), | 1717 | IgnoreStandardIncludePath( unset ), |
1722 | ShowProgress( linkProgressNotSet ) | 1718 | ShowProgress( linkProgressNotSet ) |
1723 | { | 1719 | { |
1724 | PreprocessorDefinitions = "NDEBUG"; | 1720 | PreprocessorDefinitions = "NDEBUG"; |
1725 | } | 1721 | } |
1726 | 1722 | ||
1727 | QTextStream &operator<<( QTextStream &strm, const VCResourceCompilerTool &tool ) | 1723 | QTextStream &operator<<( QTextStream &strm, const VCResourceCompilerTool &tool ) |
1728 | { | 1724 | { |
1729 | strm << _begTool3; | 1725 | strm << _begTool3; |
1730 | strm << _VCResourceCompilerToolName; | 1726 | strm << _VCResourceCompilerToolName; |
1731 | strm << SPair( _ToolPath, tool.ToolPath ); | 1727 | strm << SPair( _ToolPath, tool.ToolPath ); |
1732 | strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories ); | 1728 | strm << XPair( _AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories ); |
1733 | strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " ); | 1729 | strm << XPair( _AdditionalOptions, tool.AdditionalOptions, " " ); |
1734 | if ( tool.Culture != rcUseDefault ) strm << EPair( _Culture, tool.Culture ); | 1730 | if ( tool.Culture != rcUseDefault ) strm << EPair( _Culture, tool.Culture ); |
1735 | strm << XPair( _FullIncludePath, tool.FullIncludePath ); | 1731 | strm << XPair( _FullIncludePath, tool.FullIncludePath ); |
1736 | strm << TPair( _IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath ); | 1732 | strm << TPair( _IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath ); |
1737 | strm << XPair( _PreprocessorDefinitions, tool.PreprocessorDefinitions ); | 1733 | strm << XPair( _PreprocessorDefinitions, tool.PreprocessorDefinitions ); |
1738 | strm << SPair( _ResourceOutputFileName, tool.ResourceOutputFileName ); | 1734 | strm << SPair( _ResourceOutputFileName, tool.ResourceOutputFileName ); |
1739 | if ( tool.ShowProgress != linkProgressNotSet ) strm << EPair( _ShowProgress, tool.ShowProgress ); | 1735 | if ( tool.ShowProgress != linkProgressNotSet ) strm << EPair( _ShowProgress, tool.ShowProgress ); |
1740 | strm << "/>"; | 1736 | strm << "/>"; |
1741 | return strm; | 1737 | return strm; |
1742 | } | 1738 | } |
1743 | 1739 | ||
1744 | // VCEventTool ------------------------------------------------- | 1740 | // VCEventTool ------------------------------------------------- |
1745 | QTextStream &operator<<( QTextStream &strm, const VCEventTool &tool ) | 1741 | QTextStream &operator<<( QTextStream &strm, const VCEventTool &tool ) |
1746 | { | 1742 | { |
1747 | strm << _begTool3; | 1743 | strm << _begTool3; |
1748 | strm << SPair( _ToolName, tool.ToolName ); | 1744 | strm << SPair( _ToolName, tool.ToolName ); |
1749 | strm << SPair( _ToolPath, tool.ToolPath ); | 1745 | strm << SPair( _ToolPath, tool.ToolPath ); |
1750 | strm << SPair( _CommandLine4, tool.CommandLine ); | 1746 | strm << SPair( _CommandLine4, tool.CommandLine ); |
1751 | strm << SPair( _Description4, tool.Description ); | 1747 | strm << SPair( _Description4, tool.Description ); |
1752 | strm << TPair( _ExcludedFromBuild, tool.ExcludedFromBuild ); | 1748 | strm << TPair( _ExcludedFromBuild, tool.ExcludedFromBuild ); |
1753 | strm << "/>"; | 1749 | strm << "/>"; |
1754 | return strm; | 1750 | return strm; |
1755 | } | 1751 | } |
1756 | 1752 | ||
1757 | // VCPostBuildEventTool --------------------------------------------- | 1753 | // VCPostBuildEventTool --------------------------------------------- |
1758 | VCPostBuildEventTool::VCPostBuildEventTool() | 1754 | VCPostBuildEventTool::VCPostBuildEventTool() |
1759 | { | 1755 | { |
1760 | ToolName = "VCPostBuildEventTool"; | 1756 | ToolName = "VCPostBuildEventTool"; |
1761 | } | 1757 | } |
1762 | 1758 | ||
1763 | // VCPreBuildEventTool ---------------------------------------------- | 1759 | // VCPreBuildEventTool ---------------------------------------------- |
1764 | VCPreBuildEventTool::VCPreBuildEventTool() | 1760 | VCPreBuildEventTool::VCPreBuildEventTool() |
1765 | { | 1761 | { |
1766 | ToolName = "VCPreBuildEventTool"; | 1762 | ToolName = "VCPreBuildEventTool"; |
1767 | } | 1763 | } |
1768 | 1764 | ||
1769 | // VCPreLinkEventTool ----------------------------------------------- | 1765 | // VCPreLinkEventTool ----------------------------------------------- |
1770 | VCPreLinkEventTool::VCPreLinkEventTool() | 1766 | VCPreLinkEventTool::VCPreLinkEventTool() |
1771 | { | 1767 | { |
1772 | ToolName = "VCPreLinkEventTool"; | 1768 | ToolName = "VCPreLinkEventTool"; |
1773 | } | 1769 | } |
1774 | 1770 | ||
1775 | // VCConfiguration -------------------------------------------------- | 1771 | // VCConfiguration -------------------------------------------------- |
1776 | 1772 | ||
1777 | VCConfiguration::VCConfiguration() | 1773 | VCConfiguration::VCConfiguration() |
1778 | :ATLMinimizesCRunTimeLibraryUsage( unset ), | 1774 | :ATLMinimizesCRunTimeLibraryUsage( unset ), |
1779 | BuildBrowserInformation( unset ), | 1775 | BuildBrowserInformation( unset ), |
1780 | CharacterSet( charSetNotSet ), | 1776 | CharacterSet( charSetNotSet ), |
1781 | ConfigurationType( typeApplication ), | 1777 | ConfigurationType( typeApplication ), |
1782 | RegisterOutput( unset ), | 1778 | RegisterOutput( unset ), |
1783 | UseOfATL( useATLNotSet ), | 1779 | UseOfATL( useATLNotSet ), |
1784 | UseOfMfc( useMfcStdWin ), | 1780 | UseOfMfc( useMfcStdWin ), |
1785 | WholeProgramOptimization( unset ) | 1781 | WholeProgramOptimization( unset ) |
1786 | { | 1782 | { |
1787 | compiler.config = this; | 1783 | compiler.config = this; |
1788 | linker.config = this; | 1784 | linker.config = this; |
1789 | idl.config = this; | 1785 | idl.config = this; |
1790 | } | 1786 | } |
1791 | 1787 | ||
1792 | QTextStream &operator<<( QTextStream &strm, const VCConfiguration &tool ) | 1788 | QTextStream &operator<<( QTextStream &strm, const VCConfiguration &tool ) |
1793 | { | 1789 | { |
1794 | strm << _begConfiguration; | 1790 | strm << _begConfiguration; |
1795 | strm << SPair( _Name3, tool.Name ); | 1791 | strm << SPair( _Name3, tool.Name ); |
1796 | strm << SPair( _OutputDirectory3, tool.OutputDirectory ); | 1792 | strm << SPair( _OutputDirectory3, tool.OutputDirectory ); |
1797 | strm << TPair( _ATLMinimizesCRunTimeLibraryUsage, tool.ATLMinimizesCRunTimeLibraryUsage ); | 1793 | strm << TPair( _ATLMinimizesCRunTimeLibraryUsage, tool.ATLMinimizesCRunTimeLibraryUsage ); |
1798 | strm << TPair( _BuildBrowserInformation, tool.BuildBrowserInformation ); | 1794 | strm << TPair( _BuildBrowserInformation, tool.BuildBrowserInformation ); |
1799 | if ( tool.CharacterSet != charSetNotSet)strm << EPair( _CharacterSet, tool.CharacterSet ); | 1795 | if ( tool.CharacterSet != charSetNotSet)strm << EPair( _CharacterSet, tool.CharacterSet ); |
1800 | strm << EPair( _ConfigurationType, tool.ConfigurationType ); | 1796 | strm << EPair( _ConfigurationType, tool.ConfigurationType ); |
1801 | strm << SPair( _DeleteExtensionsOnClean, tool.DeleteExtensionsOnClean ); | 1797 | strm << SPair( _DeleteExtensionsOnClean, tool.DeleteExtensionsOnClean ); |
1802 | strm << SPair( _ImportLibrary, tool.ImportLibrary ); | 1798 | strm << SPair( _ImportLibrary, tool.ImportLibrary ); |
1803 | strm << SPair( _IntermediateDirectory, tool.IntermediateDirectory ); | 1799 | strm << SPair( _IntermediateDirectory, tool.IntermediateDirectory ); |
1804 | strm << SPair( _PrimaryOutput, tool.PrimaryOutput ); | 1800 | strm << SPair( _PrimaryOutput, tool.PrimaryOutput ); |
1805 | strm << SPair( _ProgramDatabase, tool.ProgramDatabase ); | 1801 | strm << SPair( _ProgramDatabase, tool.ProgramDatabase ); |
1806 | strm << TPair( _RegisterOutput, tool.RegisterOutput ); | 1802 | strm << TPair( _RegisterOutput, tool.RegisterOutput ); |
1807 | if ( tool.UseOfATL != useATLNotSet) strm << EPair( _UseOfATL, tool.UseOfATL ); | 1803 | if ( tool.UseOfATL != useATLNotSet) strm << EPair( _UseOfATL, tool.UseOfATL ); |
1808 | strm << EPair( _UseOfMfc, tool.UseOfMfc ); | 1804 | strm << EPair( _UseOfMfc, tool.UseOfMfc ); |
1809 | strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization ); | 1805 | strm << TPair( _WholeProgramOptimization, tool.WholeProgramOptimization ); |
1810 | strm << ">"; | 1806 | strm << ">"; |
1811 | strm << tool.compiler; | 1807 | strm << tool.compiler; |
1812 | strm << tool.custom; | 1808 | strm << tool.custom; |
1813 | if ( tool.ConfigurationType == typeStaticLibrary ) | 1809 | if ( tool.ConfigurationType == typeStaticLibrary ) |
1814 | strm << tool.librarian; | 1810 | strm << tool.librarian; |
1815 | else | 1811 | else |
1816 | strm << tool.linker; | 1812 | strm << tool.linker; |
1817 | strm << tool.idl; | 1813 | strm << tool.idl; |
1818 | strm << tool.postBuild; | 1814 | strm << tool.postBuild; |
1819 | strm << tool.preBuild; | 1815 | strm << tool.preBuild; |
1820 | strm << tool.preLink; | 1816 | strm << tool.preLink; |
1821 | strm << tool.resource; | 1817 | strm << tool.resource; |
1822 | strm << _endConfiguration; | 1818 | strm << _endConfiguration; |
1823 | return strm; | 1819 | return strm; |
1824 | } | 1820 | } |
1825 | // VCFilter --------------------------------------------------------- | 1821 | // VCFilter --------------------------------------------------------- |
1826 | VCFilter::VCFilter() | 1822 | VCFilter::VCFilter() |
1827 | : ParseFiles( unset ) | 1823 | : ParseFiles( unset ) |
1828 | { | 1824 | { |
1825 | useCustomBuildTool = FALSE; | ||
1826 | useCompilerTool = FALSE; | ||
1829 | } | 1827 | } |
1830 | 1828 | ||
1831 | void VCFilter::generateMOC( QTextStream &strm, QString str ) const | 1829 | void VCFilter::addMOCstage( QTextStream &strm, QString filename ) |
1832 | { | 1830 | { |
1833 | QString mocOutput = Project->findMocDestination( str ); | 1831 | QString mocOutput = Project->findMocDestination( filename ); |
1834 | QString mocApp = Project->var( "QMAKE_MOC" ); | 1832 | QString mocApp = Project->var( "QMAKE_MOC" ); |
1835 | 1833 | ||
1836 | if( mocOutput.isEmpty() ) { | 1834 | if( mocOutput.isEmpty() && filename.endsWith(".moc") ) { |
1837 | // In specialcases we DO moc .cpp files | 1835 | // In specialcases we DO moc .cpp files |
1838 | // when the result is an .moc file | 1836 | // when the result is an .moc file |
1839 | if ( !str.endsWith(".moc") ) | 1837 | mocOutput = filename; |
1840 | return; | 1838 | filename = Project->findMocSource( mocOutput ); |
1841 | mocOutput = str; | ||
1842 | str = Project->findMocSource( mocOutput ); | ||
1843 | } | 1839 | } |
1844 | 1840 | ||
1845 | strm << _begFileConfiguration; | 1841 | if (mocOutput.isEmpty()) |
1846 | strm << _Name5; | 1842 | return; |
1847 | strm << Config->Name; | 1843 | |
1848 | strm << "\">"; | 1844 | CustomBuildTool = VCCustomBuildTool(); |
1849 | strm << _begTool5; | 1845 | useCustomBuildTool = TRUE; |
1850 | strm << _VCCustomBuildTool; | 1846 | CustomBuildTool.Description = "Moc'ing " + filename + "..."; |
1851 | strm << _Description6; | 1847 | CustomBuildTool.CommandLine += (mocApp + " " |
1852 | strm << "Moc'ing " << str << "...\""; | 1848 | + filename + " -o " + mocOutput); |
1853 | strm << _CommandLine6; | 1849 | CustomBuildTool.AdditionalDependencies = mocApp; |
1854 | strm << mocApp; | 1850 | CustomBuildTool.Outputs += mocOutput; |
1855 | strm << " " << str << " -o " << mocOutput << "\""; | ||
1856 | strm << _AdditionalDependencies6; | ||
1857 | strm << mocApp << "\""; | ||
1858 | strm << _Outputs6; | ||
1859 | strm << mocOutput << "\""; | ||
1860 | strm << "/>"; | ||
1861 | strm << _endFileConfiguration; | ||
1862 | } | 1851 | } |
1863 | 1852 | ||
1864 | void VCFilter::generateUIC( QTextStream &strm, const QString& str ) const | 1853 | void VCFilter::addUICstage( QTextStream &strm, QString str ) |
1865 | { | 1854 | { |
1855 | CustomBuildTool = VCCustomBuildTool(); | ||
1856 | useCustomBuildTool = TRUE; | ||
1857 | |||
1866 | QString uicApp = Project->var("QMAKE_UIC"); | 1858 | QString uicApp = Project->var("QMAKE_UIC"); |
1867 | QString mocApp = Project->var( "QMAKE_MOC" ); | 1859 | QString mocApp = Project->var( "QMAKE_MOC" ); |
1868 | QString fname = str.section( '\\', -1 ); | 1860 | QString fname = str.section( '\\', -1 ); |
1869 | QString mocDir = Project->var( "MOC_DIR" ); | 1861 | QString mocDir = Project->var( "MOC_DIR" ); |
1870 | QString uiDir = Project->var( "UI_DIR" ); | 1862 | QString uiDir = Project->var( "UI_DIR" ); |
1871 | QString uiHeaders; | 1863 | QString uiHeaders; |
1872 | QString uiSources; | 1864 | QString uiSources; |
1873 | 1865 | ||
1874 | // Determining the paths for the output files. | 1866 | // Determining the paths for the output files. |
1875 | int slash = str.findRev( '\\' ); | 1867 | int slash = str.findRev( '\\' ); |
1876 | QString pname = ( slash != -1 ) ? str.left( slash+1 ) : QString( ".\\" ); | 1868 | QString pname = ( slash != -1 ) ? str.left( slash+1 ) : QString( ".\\" ); |
1877 | if( !uiDir.isEmpty() ) { | 1869 | if( !uiDir.isEmpty() ) { |
1878 | uiHeaders = uiDir; | 1870 | uiHeaders = uiDir; |
1879 | uiSources = uiDir; | 1871 | uiSources = uiDir; |
1880 | } else { | 1872 | } else { |
1881 | uiHeaders = Project->var( "UI_HEADERS_DIR" ); | 1873 | uiHeaders = Project->var( "UI_HEADERS_DIR" ); |
1882 | uiSources = Project->var( "UI_SOURCES_DIR" ); | 1874 | uiSources = Project->var( "UI_SOURCES_DIR" ); |
1883 | if( uiHeaders.isEmpty() ) | 1875 | if( uiHeaders.isEmpty() ) |
1884 | uiHeaders = pname; | 1876 | uiHeaders = pname; |
1885 | if( uiSources.isEmpty() ) | 1877 | if( uiSources.isEmpty() ) |
1886 | uiSources = pname; | 1878 | uiSources = pname; |
1887 | } | 1879 | } |
1888 | if( !uiHeaders.endsWith( "\\" ) ) | 1880 | if( !uiHeaders.endsWith( "\\" ) ) |
1889 | uiHeaders += "\\"; | 1881 | uiHeaders += "\\"; |
1890 | if( !uiSources.endsWith( "\\" ) ) | 1882 | if( !uiSources.endsWith( "\\" ) ) |
1891 | uiSources += "\\"; | 1883 | uiSources += "\\"; |
1892 | 1884 | ||
1893 | // Determine the file name. | 1885 | // Determine the file name. |
1894 | int dot = fname.findRev( '.' ); | 1886 | int dot = fname.findRev( '.' ); |
1895 | if( dot != -1 ) | 1887 | if( dot != -1 ) |
1896 | fname.truncate( dot ); | 1888 | fname.truncate( dot ); |
1897 | 1889 | ||
1898 | strm << _begFileConfiguration; | 1890 | if ( mocDir.isEmpty() ) |
1899 | strm << _Name5; | 1891 | mocDir = pname; |
1900 | strm << Config->Name; | 1892 | |
1901 | strm << "\">"; | 1893 | CustomBuildTool.Description = ("Uic'ing " + str + "...\""); |
1902 | strm << _begTool5; | 1894 | CustomBuildTool.CommandLine += // Create .h from .ui file |
1903 | strm << _VCCustomBuildTool; | 1895 | uicApp + " " + str + " -o " + uiHeaders + fname + ".h"; |
1904 | strm << _Description6; | 1896 | CustomBuildTool.CommandLine += // Create .cpp from .ui file |
1905 | strm << "Uic'ing " << str << "...\""; | 1897 | uicApp + " " + str + " -i " + fname + ".h -o " + uiSources + fname + ".cpp"; |
1906 | strm << _CommandLine6; | 1898 | CustomBuildTool.CommandLine += // Moc the headerfile |
1907 | strm << uicApp << " " << str << " -o " << uiHeaders << fname << ".h && "; // Create .h from .ui file | 1899 | mocApp + " " + uiHeaders + fname + ".h -o " + mocDir + Option::h_moc_mod + fname + Option::h_moc_ext; |
1908 | strm << uicApp << " " << str << " -i " << fname << ".h -o " << uiSources << fname << ".cpp && ";// Create .cpp from .ui file | 1900 | |
1909 | strm << mocApp << " " << uiHeaders << fname << ".h -o " << mocDir << "moc_" << fname << ".cpp\""; | 1901 | CustomBuildTool.AdditionalDependencies += mocApp; |
1910 | strm << _AdditionalDependencies6; | 1902 | CustomBuildTool.AdditionalDependencies += uicApp; |
1911 | strm << mocApp << ";" << uicApp << "\""; | 1903 | CustomBuildTool.Outputs += |
1912 | strm << _Outputs6; | 1904 | uiHeaders + fname + ".h;" + uiSources + fname + ".cpp;" + mocDir + Option::h_moc_mod + fname + Option::h_moc_ext; |
1913 | strm << uiHeaders << fname << ".h;" << uiSources << fname << ".cpp;" << mocDir << "moc_" << fname << ".cpp\""; | ||
1914 | strm << "/>"; | ||
1915 | strm << _endFileConfiguration; | ||
1916 | } | 1905 | } |
1917 | 1906 | ||
1918 | QTextStream &operator<<( QTextStream &strm, const VCFilter &tool ) | 1907 | void VCFilter::modifyPCHstage( QTextStream &strm, QString str ) |
1908 | { | ||
1909 | bool isCFile = str.endsWith(".c"); | ||
1910 | bool isHFile = (str.endsWith(".h") && str == Project->precompH); | ||
1911 | |||
1912 | if (!isCFile && !isHFile) | ||
1913 | return; | ||
1914 | |||
1915 | CompilerTool = VCCLCompilerTool(); | ||
1916 | useCompilerTool = TRUE; | ||
1917 | |||
1918 | // Unset some default options | ||
1919 | CompilerTool.BufferSecurityCheck = unset; | ||
1920 | CompilerTool.DebugInformationFormat = debugUnknown; | ||
1921 | CompilerTool.ExceptionHandling = unset; | ||
1922 | CompilerTool.GeneratePreprocessedFile = preprocessUnknown; | ||
1923 | CompilerTool.Optimization = optimizeDefault; | ||
1924 | CompilerTool.ProgramDataBaseFileName = QString::null; | ||
1925 | CompilerTool.RuntimeLibrary = rtUnknown; | ||
1926 | CompilerTool.WarningLevel = warningLevelUnknown; | ||
1927 | |||
1928 | // Setup PCH options | ||
1929 | CompilerTool.UsePrecompiledHeader = (isCFile ? pchNone : pchCreateUsingSpecific); | ||
1930 | CompilerTool.PrecompiledHeaderThrough = "$(NOINHERIT)"; | ||
1931 | CompilerTool.ForcedIncludeFiles = "$(NOINHERIT)"; | ||
1932 | } | ||
1933 | |||
1934 | bool VCFilter::addIMGstage( QTextStream &strm, QString str ) | ||
1935 | { | ||
1936 | bool isCorH = FALSE; | ||
1937 | if (str.endsWith(".c") || str.endsWith(".rc")) | ||
1938 | isCorH = TRUE; | ||
1939 | QStringList::Iterator it; | ||
1940 | for(it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) | ||
1941 | if(str.endsWith(*it)) | ||
1942 | isCorH = TRUE; | ||
1943 | for(it = Option::h_ext.begin(); it != Option::h_ext.end(); ++it) | ||
1944 | if(str.endsWith(*it)) | ||
1945 | isCorH = TRUE; | ||
1946 | |||
1947 | QString collectionName = Project->project->first("QMAKE_IMAGE_COLLECTION"); | ||
1948 | if (str.isEmpty() || isCorH || collectionName.isEmpty()) | ||
1949 | return FALSE; | ||
1950 | |||
1951 | CustomBuildTool = VCCustomBuildTool(); | ||
1952 | useCustomBuildTool = TRUE; | ||
1953 | |||
1954 | // Some projects (like designer core) may have too many images to | ||
1955 | // call uic directly. Therefor we have to create a temporary | ||
1956 | // file, with the image list, and call uic with the -f option. | ||
1957 | QString tmpFileCmd = "echo "; | ||
1958 | QString tmpImageFilename = ".imgcol"; | ||
1959 | QStringList& list = Project->project->variables()["IMAGES"]; | ||
1960 | bool firstOutput = TRUE; | ||
1961 | it = list.begin(); | ||
1962 | while( it!=list.end() ) { | ||
1963 | tmpFileCmd += (*it) + " "; | ||
1964 | ++it; | ||
1965 | if (tmpFileCmd.length()>250 || it==list.end()) { | ||
1966 | CustomBuildTool.CommandLine += tmpFileCmd | ||
1967 | + (firstOutput?"> ":">> ") | ||
1968 | + tmpImageFilename; | ||
1969 | tmpFileCmd = "echo "; | ||
1970 | firstOutput = FALSE; | ||
1971 | } | ||
1972 | } | ||
1973 | |||
1974 | QString uicApp = Project->var("QMAKE_UIC"); | ||
1975 | CustomBuildTool.Description = ("Generate imagecollection"); | ||
1976 | CustomBuildTool.CommandLine += | ||
1977 | uicApp + " -embed " + Project->project->first("QMAKE_ORIG_TARGET") | ||
1978 | + " -f .imgcol -o " + collectionName; | ||
1979 | CustomBuildTool.AdditionalDependencies += uicApp; | ||
1980 | CustomBuildTool.AdditionalDependencies += list; | ||
1981 | CustomBuildTool.Outputs = collectionName; | ||
1982 | CustomBuildTool.Outputs += tmpImageFilename; | ||
1983 | return TRUE; | ||
1984 | } | ||
1985 | |||
1986 | QTextStream &operator<<( QTextStream &strm, VCFilter &tool ) | ||
1919 | { | 1987 | { |
1920 | if ( tool.Files.count() == 0 ) | 1988 | if ( tool.Files.count() == 0 ) |
1921 | return strm; | 1989 | return strm; |
1922 | 1990 | ||
1923 | strm << _begFilter; | 1991 | strm << _begFilter; |
1924 | strm << SPair( _Name3, tool.Name ); | 1992 | strm << SPair( _Name3, tool.Name ); |
1925 | strm << TPair( _ParseFiles, tool.ParseFiles ); | 1993 | strm << TPair( _ParseFiles, tool.ParseFiles ); |
1926 | strm << SPair( _Filter, tool.Filter ); | 1994 | strm << SPair( _Filter, tool.Filter ); |
1927 | strm << ">"; | 1995 | strm << ">"; |
1996 | |||
1997 | bool resourceBuild = FALSE; | ||
1998 | int currentLevels = 0; | ||
1999 | QStringList currentDirs; | ||
1928 | for ( QStringList::ConstIterator it = tool.Files.begin(); it != tool.Files.end(); ++it ) { | 2000 | for ( QStringList::ConstIterator it = tool.Files.begin(); it != tool.Files.end(); ++it ) { |
2001 | if ( !tool.flat_files ) { | ||
2002 | QStringList newDirs = QStringList::split('\\',(*it)); | ||
2003 | newDirs.pop_back(); // Skip the filename | ||
2004 | |||
2005 | int newLevels = int(newDirs.count()); | ||
2006 | int equalLevels = 0; | ||
2007 | for (int i = 0; i<currentLevels; i++, equalLevels++ ) | ||
2008 | if (currentDirs[i] != newDirs[i]) | ||
2009 | break; | ||
2010 | int closeFilters = currentLevels - equalLevels; | ||
2011 | int openFilters = newLevels - equalLevels; | ||
2012 | |||
2013 | // close previous non-equal filter | ||
2014 | while ( closeFilters-- ) | ||
2015 | strm << _endFilter; | ||
2016 | |||
2017 | // open new non-equal filters | ||
2018 | newLevels = 0; | ||
2019 | while ( openFilters-- ) { | ||
2020 | strm << _begFilter; | ||
2021 | strm << SPair( _Name3, newDirs[equalLevels + newLevels] ); | ||
2022 | strm << _Filter << "\">"; // Blank filter | ||
2023 | ++newLevels; | ||
2024 | } | ||
2025 | currentDirs = newDirs; | ||
2026 | currentLevels = int(newDirs.count()); | ||
2027 | } | ||
2028 | |||
2029 | tool.useCustomBuildTool = FALSE; | ||
2030 | tool.useCompilerTool = FALSE; | ||
2031 | // Add UIC, MOC and PCH stages to file | ||
2032 | if ( tool.CustomBuild == moc ) | ||
2033 | tool.addMOCstage( strm, *it ); | ||
2034 | else if ( tool.CustomBuild == uic ) | ||
2035 | tool.addUICstage( strm, *it ); | ||
2036 | else if ( tool.CustomBuild == resource ) { | ||
2037 | if (!resourceBuild) | ||
2038 | resourceBuild = tool.addIMGstage(strm, *it); | ||
2039 | } | ||
2040 | if (tool.Project->usePCH) | ||
2041 | tool.modifyPCHstage( strm, *it ); | ||
2042 | |||
1929 | strm << _begFile; | 2043 | strm << _begFile; |
1930 | strm << SPair( _RelativePath, *it ); | 2044 | strm << SPair( _RelativePath, *it ); |
1931 | strm << ">"; | 2045 | strm << ">"; |
1932 | if ( tool.CustomBuild == moc ) | 2046 | // Output custom build and compiler options |
1933 | tool.generateMOC( strm, *it ); | 2047 | // for all configurations |
1934 | else if ( tool.CustomBuild == uic ) | 2048 | if (tool.useCustomBuildTool || tool.useCompilerTool) { |
1935 | tool.generateUIC( strm, *it ); | 2049 | for ( uint i = 0; i < tool.Config->count(); i++ ) { |
2050 | strm << _begFileConfiguration; | ||
2051 | strm << _Name5; | ||
2052 | strm << (*tool.Config)[i].Name; | ||
2053 | strm << "\">"; | ||
2054 | if (tool.useCustomBuildTool) | ||
2055 | strm << tool.CustomBuildTool; | ||
2056 | if (tool.useCompilerTool) | ||
2057 | strm << tool.CompilerTool; | ||
2058 | strm << _endFileConfiguration; | ||
2059 | } | ||
2060 | } | ||
1936 | strm << _endFile; | 2061 | strm << _endFile; |
1937 | } | 2062 | } |
1938 | 2063 | // close remaining open filters, in non-flat mode | |
2064 | while ( !tool.flat_files && currentLevels-- ) { | ||
2065 | strm << _endFilter; | ||
2066 | } | ||
1939 | strm << _endFilter; | 2067 | strm << _endFilter; |
1940 | return strm; | 2068 | return strm; |
1941 | } | 2069 | } |
1942 | 2070 | ||
1943 | // VCProject -------------------------------------------------------- | 2071 | // VCProject -------------------------------------------------------- |
1944 | VCProject::VCProject() | 2072 | VCProject::VCProject() |
1945 | { | 2073 | { |
1946 | #if defined(Q_WS_WIN32) | 2074 | VCConfiguration conf; |
1947 | GUID guid; | 2075 | Configuration += conf ; // Release |
1948 | QUuid uniqueId; | 2076 | //Configuration += conf ; // Debug added later, after Release init |
1949 | HRESULT h = CoCreateGuid( &guid ); | ||
1950 | if ( h == S_OK ) | ||
1951 | uniqueId = QUuid( guid ); | ||
1952 | ProjectGUID = uniqueId.toString(); | ||
1953 | #else | ||
1954 | // Qt doesn't support GUID on other platforms yet | ||
1955 | ProjectGUID = ""; | ||
1956 | #endif | ||
1957 | } | 2077 | } |
1958 | 2078 | ||
1959 | QTextStream &operator<<( QTextStream &strm, const VCProject &tool ) | 2079 | QTextStream &operator<<( QTextStream &strm, const VCProject &tool ) |
1960 | { | 2080 | { |
1961 | strm << _xmlInit; | 2081 | strm << _xmlInit; |
1962 | strm << _begVisualStudioProject; | 2082 | strm << _begVisualStudioProject; |
1963 | strm << _ProjectType; | 2083 | strm << _ProjectType; |
1964 | strm << SPair( _Version1, tool.Version ); | 2084 | strm << SPair( _Version1, tool.Version ); |
1965 | strm << SPair( _Name1, tool.Name ); | 2085 | strm << SPair( _Name1, tool.Name ); |
1966 | strm << SPair( _ProjectGUID, tool.ProjectGUID ); | 2086 | strm << SPair( _ProjectGUID, tool.ProjectGUID ); |
1967 | strm << SPair( _SccProjectName, tool.SccProjectName ); | 2087 | strm << SPair( _SccProjectName, tool.SccProjectName ); |
1968 | strm << SPair( _SccLocalPath, tool.SccLocalPath ); | 2088 | strm << SPair( _SccLocalPath, tool.SccLocalPath ); |
1969 | strm << ">"; | 2089 | strm << ">"; |
1970 | strm << _begPlatforms; | 2090 | strm << _begPlatforms; |
1971 | strm << _begPlatform; | 2091 | strm << _begPlatform; |
1972 | strm << SPair( _Name3, tool.PlatformName ); | 2092 | strm << SPair( _Name3, tool.PlatformName ); |
1973 | strm << "/>"; | 2093 | strm << "/>"; |
1974 | strm << _endPlatforms; | 2094 | strm << _endPlatforms; |
1975 | strm << _begConfigurations; | 2095 | strm << _begConfigurations; |
1976 | strm << tool.Configuration; | 2096 | for ( uint i = 0; i < tool.Configuration.count(); i++ ) |
2097 | strm << tool.Configuration[i]; | ||
1977 | strm << _endConfigurations; | 2098 | strm << _endConfigurations; |
1978 | strm << _begFiles; | 2099 | strm << _begFiles; |
1979 | strm << tool.SourceFiles; | 2100 | strm << (VCFilter&)tool.SourceFiles; |
1980 | strm << tool.HeaderFiles; | 2101 | strm << (VCFilter&)tool.HeaderFiles; |
1981 | strm << tool.MOCFiles; | 2102 | strm << (VCFilter&)tool.MOCFiles; |
1982 | strm << tool.UICFiles; | 2103 | strm << (VCFilter&)tool.UICFiles; |
1983 | strm << tool.FormFiles; | 2104 | strm << (VCFilter&)tool.FormFiles; |
1984 | strm << tool.TranslationFiles; | 2105 | strm << (VCFilter&)tool.TranslationFiles; |
1985 | strm << tool.LexYaccFiles; | 2106 | strm << (VCFilter&)tool.LexYaccFiles; |
1986 | strm << tool.ResourceFiles; | 2107 | strm << (VCFilter&)tool.ResourceFiles; |
1987 | strm << _endFiles; | 2108 | strm << _endFiles; |
1988 | strm << _begGlobals; | 2109 | strm << _begGlobals; |
1989 | strm << _endGlobals; | 2110 | strm << _endGlobals; |
1990 | strm << _endVisualStudioProject; | 2111 | strm << _endVisualStudioProject; |
1991 | return strm; | 2112 | return strm; |
1992 | } | 2113 | } |
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index 1dca68d..9ce38d2 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h | |||
@@ -1,477 +1,485 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of ________ class. | 4 | ** Definition of VCProject class. |
5 | ** | 5 | ** |
6 | ** Copyright (C) 2002 Trolltech AS. All rights reserved. | 6 | ** Copyright (C) 2002-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** This file is part of the network module of the Qt GUI Toolkit. | 8 | ** This file is part of qmake. |
9 | ** | 9 | ** |
10 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
11 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
12 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
13 | ** | 13 | ** |
14 | ** This file may be distributed and/or modified under the terms of the | 14 | ** This file may be distributed and/or modified under the terms of the |
15 | ** GNU General Public License version 2 as published by the Free Software | 15 | ** GNU General Public License version 2 as published by the Free Software |
16 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
17 | ** packaging of this file. | 17 | ** packaging of this file. |
18 | ** | 18 | ** |
19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
20 | ** file in accordance with the Qt Commercial License Agreement provided | 20 | ** file in accordance with the Qt Commercial License Agreement provided |
21 | ** with the Software. | 21 | ** with the Software. |
22 | ** | 22 | ** |
23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
25 | ** | 25 | ** |
26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
27 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
30 | ** | 30 | ** |
31 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
32 | ** not clear to you. | 32 | ** not clear to you. |
33 | ** | 33 | ** |
34 | **********************************************************************/ | 34 | **********************************************************************/ |
35 | |||
35 | #ifndef __MSVC_OBJECTMODEL_H__ | 36 | #ifndef __MSVC_OBJECTMODEL_H__ |
36 | #define __MSVC_OBJECTMODEL_H__ | 37 | #define __MSVC_OBJECTMODEL_H__ |
37 | 38 | ||
38 | #include "project.h" | 39 | #include "project.h" |
39 | #include <qstring.h> | 40 | #include <qstring.h> |
40 | #include <qstringlist.h> | 41 | #include <qstringlist.h> |
41 | 42 | ||
42 | /* | 43 | /* |
43 | This Object model is of course VERY simplyfied, | 44 | This Object model is of course VERY simplyfied, |
44 | and does not actually follow the original MSVC | 45 | and does not actually follow the original MSVC |
45 | object model. However, it fulfilles the basic | 46 | object model. However, it fulfilles the basic |
46 | needs for qmake | 47 | needs for qmake |
47 | */ | 48 | */ |
48 | 49 | ||
49 | /* | 50 | /* |
50 | If a triState value is 'unset' then the | 51 | If a triState value is 'unset' then the |
51 | corresponding property is not in the output, | 52 | corresponding property is not in the output, |
52 | forcing the tool to utilize default values. | 53 | forcing the tool to utilize default values. |
53 | False/True values will be in the output... | 54 | False/True values will be in the output... |
54 | */ | 55 | */ |
55 | enum customBuildCheck { | 56 | enum customBuildCheck { |
56 | none, | 57 | none, |
57 | moc, | 58 | moc, |
58 | uic, | 59 | uic, |
59 | lexyacc | 60 | lexyacc, |
61 | resource | ||
60 | }; | 62 | }; |
61 | enum triState { | 63 | enum triState { |
62 | unset = -1, | 64 | unset = -1, |
63 | _False = 0, | 65 | _False = 0, |
64 | _True = 1 | 66 | _True = 1 |
65 | }; | 67 | }; |
66 | enum addressAwarenessType { | 68 | enum addressAwarenessType { |
67 | addrAwareDefault, | 69 | addrAwareDefault, |
68 | addrAwareNoLarge, | 70 | addrAwareNoLarge, |
69 | addrAwareLarge | 71 | addrAwareLarge |
70 | }; | 72 | }; |
71 | enum asmListingOption { | 73 | enum asmListingOption { |
72 | asmListingNone, | 74 | asmListingNone, |
73 | asmListingAssemblyOnly, | 75 | asmListingAssemblyOnly, |
74 | asmListingAsmMachineSrc, | 76 | asmListingAsmMachineSrc, |
75 | asmListingAsmMachine, | 77 | asmListingAsmMachine, |
76 | asmListingAsmSrc | 78 | asmListingAsmSrc |
77 | }; | 79 | }; |
78 | enum basicRuntimeCheckOption { | 80 | enum basicRuntimeCheckOption { |
79 | runtimeBasicCheckNone, | 81 | runtimeBasicCheckNone, |
80 | runtimeCheckStackFrame, | 82 | runtimeCheckStackFrame, |
81 | runtimeCheckUninitVariables, | 83 | runtimeCheckUninitVariables, |
82 | runtimeBasicCheckAll | 84 | runtimeBasicCheckAll |
83 | }; | 85 | }; |
84 | enum browseInfoOption { | 86 | enum browseInfoOption { |
85 | brInfoNone, | 87 | brInfoNone, |
86 | brAllInfo, | 88 | brAllInfo, |
87 | brNoLocalSymbols | 89 | brNoLocalSymbols |
88 | }; | 90 | }; |
89 | enum callingConventionOption { | 91 | enum callingConventionOption { |
90 | callConventionDefault = -1, | 92 | callConventionDefault = -1, |
91 | callConventionCDecl, | 93 | callConventionCDecl, |
92 | callConventionFastCall, | 94 | callConventionFastCall, |
93 | callConventionStdCall | 95 | callConventionStdCall |
94 | }; | 96 | }; |
95 | enum charSet { | 97 | enum charSet { |
96 | charSetNotSet, | 98 | charSetNotSet, |
97 | charSetUnicode, | 99 | charSetUnicode, |
98 | charSetMBCS | 100 | charSetMBCS |
99 | }; | 101 | }; |
100 | enum compileAsManagedOptions { | 102 | enum compileAsManagedOptions { |
101 | managedDefault = -1, | 103 | managedDefault = -1, |
102 | managedAssembly = 2 | 104 | managedAssembly = 2 |
103 | }; | 105 | }; |
104 | enum CompileAsOptions{ | 106 | enum CompileAsOptions{ |
105 | compileAsDefault, | 107 | compileAsDefault, |
106 | compileAsC, | 108 | compileAsC, |
107 | compileAsCPlusPlus | 109 | compileAsCPlusPlus |
108 | }; | 110 | }; |
109 | enum ConfigurationTypes { | 111 | enum ConfigurationTypes { |
110 | typeUnknown = 0, | 112 | typeUnknown = 0, |
111 | typeApplication = 1, | 113 | typeApplication = 1, |
112 | typeDynamicLibrary = 2, | 114 | typeDynamicLibrary = 2, |
113 | typeStaticLibrary = 4, | 115 | typeStaticLibrary = 4, |
114 | typeGeneric = 10 | 116 | typeGeneric = 10 |
115 | }; | 117 | }; |
116 | enum debugOption { | 118 | enum debugOption { |
119 | debugUnknown = -1, | ||
117 | debugDisabled, | 120 | debugDisabled, |
118 | debugOldStyleInfo, | 121 | debugOldStyleInfo, |
119 | debugLineInfoOnly, | 122 | debugLineInfoOnly, |
120 | debugEnabled, | 123 | debugEnabled, |
121 | debugEditAndContinue | 124 | debugEditAndContinue |
122 | }; | 125 | }; |
123 | enum eAppProtectionOption { | 126 | enum eAppProtectionOption { |
124 | eAppProtectUnchanged, | 127 | eAppProtectUnchanged, |
125 | eAppProtectLow, | 128 | eAppProtectLow, |
126 | eAppProtectMedium, | 129 | eAppProtectMedium, |
127 | eAppProtectHigh | 130 | eAppProtectHigh |
128 | }; | 131 | }; |
129 | enum enumResourceLangID { | 132 | enum enumResourceLangID { |
130 | rcUseDefault = 0, | 133 | rcUseDefault = 0, |
131 | rcAfrikaans = 1078, | 134 | rcAfrikaans = 1078, |
132 | rcAlbanian = 1052, | 135 | rcAlbanian = 1052, |
133 | rcArabicAlgeria = 5121, | 136 | rcArabicAlgeria = 5121, |
134 | rcArabicBahrain = 15361, | 137 | rcArabicBahrain = 15361, |
135 | rcArabicEgypt = 3073, | 138 | rcArabicEgypt = 3073, |
136 | rcArabicIraq = 2049, | 139 | rcArabicIraq = 2049, |
137 | rcArabicJordan = 11265, | 140 | rcArabicJordan = 11265, |
138 | rcArabicKuwait = 13313, | 141 | rcArabicKuwait = 13313, |
139 | rcArabicLebanon = 12289, | 142 | rcArabicLebanon = 12289, |
140 | rcArabicLibya = 4097, | 143 | rcArabicLibya = 4097, |
141 | rcArabicMorocco = 6145, | 144 | rcArabicMorocco = 6145, |
142 | rcArabicOman = 8193, | 145 | rcArabicOman = 8193, |
143 | rcArabicQatar = 16385, | 146 | rcArabicQatar = 16385, |
144 | rcArabicSaudi = 1025, | 147 | rcArabicSaudi = 1025, |
145 | rcArabicSyria = 10241, | 148 | rcArabicSyria = 10241, |
146 | rcArabicTunisia = 7169, | 149 | rcArabicTunisia = 7169, |
147 | rcArabicUnitedArabEmirates= 14337, | 150 | rcArabicUnitedArabEmirates= 14337, |
148 | rcArabicYemen = 9217, | 151 | rcArabicYemen = 9217, |
149 | rcBasque = 1069, | 152 | rcBasque = 1069, |
150 | rcBulgarian = 1026, | 153 | rcBulgarian = 1026, |
151 | rcByelorussian = 1059, | 154 | rcByelorussian = 1059, |
152 | rcCatalan = 1027, | 155 | rcCatalan = 1027, |
153 | rcChineseHongKong = 3076, | 156 | rcChineseHongKong = 3076, |
154 | rcChinesePRC = 2052, | 157 | rcChinesePRC = 2052, |
155 | rcChineseSingapore = 4100, | 158 | rcChineseSingapore = 4100, |
156 | rcChineseTaiwan = 1028, | 159 | rcChineseTaiwan = 1028, |
157 | rcCroatian = 1050, | 160 | rcCroatian = 1050, |
158 | rcCzech = 1029, | 161 | rcCzech = 1029, |
159 | rcDanish = 1030, | 162 | rcDanish = 1030, |
160 | rcDutchBelgium = 2067, | 163 | rcDutchBelgium = 2067, |
161 | rcDutchStandard = 1043, | 164 | rcDutchStandard = 1043, |
162 | rcEnglishAustralia = 3081, | 165 | rcEnglishAustralia = 3081, |
163 | rcEnglishBritain = 2057, | 166 | rcEnglishBritain = 2057, |
164 | rcEnglishCanada = 4105, | 167 | rcEnglishCanada = 4105, |
165 | RcEnglishCaribbean = 9225, | 168 | RcEnglishCaribbean = 9225, |
166 | rcEnglishIreland = 6153, | 169 | rcEnglishIreland = 6153, |
167 | rcEnglishJamaica = 8201, | 170 | rcEnglishJamaica = 8201, |
168 | rcEnglishNewZealand = 5129, | 171 | rcEnglishNewZealand = 5129, |
169 | rcEnglishSouthAfrica= 7177, | 172 | rcEnglishSouthAfrica= 7177, |
170 | rcEnglishUS = 1033, | 173 | rcEnglishUS = 1033, |
171 | rcEstonian = 1061, | 174 | rcEstonian = 1061, |
172 | rcFarsi = 1065, | 175 | rcFarsi = 1065, |
173 | rcFinnish = 1035, | 176 | rcFinnish = 1035, |
174 | rcFrenchBelgium = 2060, | 177 | rcFrenchBelgium = 2060, |
175 | rcFrenchCanada = 3084, | 178 | rcFrenchCanada = 3084, |
176 | rcFrenchLuxembourg = 5132, | 179 | rcFrenchLuxembourg = 5132, |
177 | rcFrenchStandard = 1036, | 180 | rcFrenchStandard = 1036, |
178 | rcFrenchSwitzerland = 4108, | 181 | rcFrenchSwitzerland = 4108, |
179 | rcGermanAustria = 3079, | 182 | rcGermanAustria = 3079, |
180 | rcGermanLichtenstein= 5127, | 183 | rcGermanLichtenstein= 5127, |
181 | rcGermanLuxembourg = 4103, | 184 | rcGermanLuxembourg = 4103, |
182 | rcGermanStandard = 1031, | 185 | rcGermanStandard = 1031, |
183 | rcGermanSwitzerland = 2055, | 186 | rcGermanSwitzerland = 2055, |
184 | rcGreek = 1032, | 187 | rcGreek = 1032, |
185 | rcHebrew = 1037, | 188 | rcHebrew = 1037, |
186 | rcHungarian = 1038, | 189 | rcHungarian = 1038, |
187 | rcIcelandic = 1039, | 190 | rcIcelandic = 1039, |
188 | rcIndonesian = 1057, | 191 | rcIndonesian = 1057, |
189 | rcItalianStandard = 1040, | 192 | rcItalianStandard = 1040, |
190 | rcItalianSwitzerland= 2064, | 193 | rcItalianSwitzerland= 2064, |
191 | rcJapanese = 1041, | 194 | rcJapanese = 1041, |
192 | rcKorean = 1042, | 195 | rcKorean = 1042, |
193 | rcKoreanJohab = 2066, | 196 | rcKoreanJohab = 2066, |
194 | rcLatvian = 1062, | 197 | rcLatvian = 1062, |
195 | rcLithuanian = 1063, | 198 | rcLithuanian = 1063, |
196 | rcNorwegianBokmal = 1044, | 199 | rcNorwegianBokmal = 1044, |
197 | rcNorwegianNynorsk = 2068, | 200 | rcNorwegianNynorsk = 2068, |
198 | rcPolish = 1045, | 201 | rcPolish = 1045, |
199 | rcPortugueseBrazilian= 1046, | 202 | rcPortugueseBrazilian= 1046, |
200 | rcPortugueseStandard= 2070, | 203 | rcPortugueseStandard= 2070, |
201 | rcRomanian = 1048, | 204 | rcRomanian = 1048, |
202 | rcRussian = 1049, | 205 | rcRussian = 1049, |
203 | rcSerbian = 2074, | 206 | rcSerbian = 2074, |
204 | rcSlovak = 1051, | 207 | rcSlovak = 1051, |
205 | rcSpanishArgentina = 11274, | 208 | rcSpanishArgentina = 11274, |
206 | rcSpanishBolivia = 16394, | 209 | rcSpanishBolivia = 16394, |
207 | rcSpanishChile = 13322, | 210 | rcSpanishChile = 13322, |
208 | rcSpanishColombia = 9226, | 211 | rcSpanishColombia = 9226, |
209 | rcSpanishCostaRica = 5130, | 212 | rcSpanishCostaRica = 5130, |
210 | rcSpanishDominicanRepublic= 7178, | 213 | rcSpanishDominicanRepublic= 7178, |
211 | rcSpanishEcuador = 12298, | 214 | rcSpanishEcuador = 12298, |
212 | rcSpanishGuatemala = 4106, | 215 | rcSpanishGuatemala = 4106, |
213 | rcSpanishMexico = 2058, | 216 | rcSpanishMexico = 2058, |
214 | rcSpanishModern = 3082, | 217 | rcSpanishModern = 3082, |
215 | rcSpanishPanama = 6154, | 218 | rcSpanishPanama = 6154, |
216 | rcSpanishParaguay = 15370, | 219 | rcSpanishParaguay = 15370, |
217 | rcSpanishPeru = 10250, | 220 | rcSpanishPeru = 10250, |
218 | rcSpanishTraditional= 1034, | 221 | rcSpanishTraditional= 1034, |
219 | rcSpanishUruguay = 14346, | 222 | rcSpanishUruguay = 14346, |
220 | rcSpanishVenezuela = 8202, | 223 | rcSpanishVenezuela = 8202, |
221 | rcSwedish = 1053, | 224 | rcSwedish = 1053, |
222 | rcThai = 1054, | 225 | rcThai = 1054, |
223 | rcTurkish = 1055, | 226 | rcTurkish = 1055, |
224 | rcUkrainian = 1058, | 227 | rcUkrainian = 1058, |
225 | rcUrdu = 1056 | 228 | rcUrdu = 1056 |
226 | }; | 229 | }; |
227 | enum enumSccEvent { | 230 | enum enumSccEvent { |
228 | eProjectInScc, | 231 | eProjectInScc, |
229 | ePreDirtyNotification | 232 | ePreDirtyNotification |
230 | }; | 233 | }; |
231 | enum favorSizeOrSpeedOption { | 234 | enum favorSizeOrSpeedOption { |
232 | favorNone, | 235 | favorNone, |
233 | favorSpeed, | 236 | favorSpeed, |
234 | favorSize | 237 | favorSize |
235 | }; | 238 | }; |
236 | enum genProxyLanguage { | 239 | enum genProxyLanguage { |
237 | genProxyNative, | 240 | genProxyNative, |
238 | genProxyManaged | 241 | genProxyManaged |
239 | }; | 242 | }; |
240 | enum inlineExpansionOption { | 243 | enum inlineExpansionOption { |
241 | expandDisable, | 244 | expandDisable, |
242 | expandOnlyInline, | 245 | expandOnlyInline, |
243 | expandAnySuitable | 246 | expandAnySuitable, |
247 | expandDefault // Not useful number, but stops the output | ||
244 | }; | 248 | }; |
245 | enum linkIncrementalType { | 249 | enum linkIncrementalType { |
246 | linkIncrementalDefault, | 250 | linkIncrementalDefault, |
247 | linkIncrementalNo, | 251 | linkIncrementalNo, |
248 | linkIncrementalYes | 252 | linkIncrementalYes |
249 | }; | 253 | }; |
250 | enum linkProgressOption { | 254 | enum linkProgressOption { |
251 | linkProgressNotSet, | 255 | linkProgressNotSet, |
252 | linkProgressAll, | 256 | linkProgressAll, |
253 | linkProgressLibs | 257 | linkProgressLibs |
254 | }; | 258 | }; |
255 | enum machineTypeOption { | 259 | enum machineTypeOption { |
256 | machineNotSet, | 260 | machineNotSet, |
257 | machineX86 | 261 | machineX86 |
258 | }; | 262 | }; |
259 | enum midlCharOption { | 263 | enum midlCharOption { |
260 | midlCharUnsigned, | 264 | midlCharUnsigned, |
261 | midlCharSigned, | 265 | midlCharSigned, |
262 | midlCharAscii7 | 266 | midlCharAscii7 |
263 | }; | 267 | }; |
264 | enum midlErrorCheckOption { | 268 | enum midlErrorCheckOption { |
265 | midlEnableCustom, | 269 | midlEnableCustom, |
266 | midlDisableAll, | 270 | midlDisableAll, |
267 | midlEnableAll | 271 | midlEnableAll |
268 | }; | 272 | }; |
269 | enum midlStructMemberAlignOption { | 273 | enum midlStructMemberAlignOption { |
270 | midlAlignNotSet, | 274 | midlAlignNotSet, |
271 | midlAlignSingleByte, | 275 | midlAlignSingleByte, |
272 | midlAlignTwoBytes, | 276 | midlAlignTwoBytes, |
273 | midlAlignFourBytes, | 277 | midlAlignFourBytes, |
274 | midlAlignEightBytes, | 278 | midlAlignEightBytes, |
275 | midlAlignSixteenBytes | 279 | midlAlignSixteenBytes |
276 | }; | 280 | }; |
277 | enum midlTargetEnvironment { | 281 | enum midlTargetEnvironment { |
278 | midlTargetNotSet, | 282 | midlTargetNotSet, |
279 | midlTargetWin32, | 283 | midlTargetWin32, |
280 | midlTargetWin64 | 284 | midlTargetWin64 |
281 | }; | 285 | }; |
282 | enum midlWarningLevelOption { | 286 | enum midlWarningLevelOption { |
283 | midlWarningLevel_0, | 287 | midlWarningLevel_0, |
284 | midlWarningLevel_1, | 288 | midlWarningLevel_1, |
285 | midlWarningLevel_2, | 289 | midlWarningLevel_2, |
286 | midlWarningLevel_3, | 290 | midlWarningLevel_3, |
287 | midlWarningLevel_4 | 291 | midlWarningLevel_4 |
288 | }; | 292 | }; |
289 | enum optFoldingType { | 293 | enum optFoldingType { |
290 | optFoldingDefault, | 294 | optFoldingDefault, |
291 | optNoFolding, | 295 | optNoFolding, |
292 | optFolding | 296 | optFolding |
293 | }; | 297 | }; |
294 | enum optimizeOption { | 298 | enum optimizeOption { |
295 | optimizeDisabled, | 299 | optimizeDisabled, |
296 | optimizeMinSpace, | 300 | optimizeMinSpace, |
297 | optimizeMaxSpeed, | 301 | optimizeMaxSpeed, |
298 | optimizeFull, | 302 | optimizeFull, |
299 | optimizeCustom | 303 | optimizeCustom, |
304 | optimizeDefault // Not useful number, but stops the output | ||
300 | }; | 305 | }; |
301 | enum optRefType { | 306 | enum optRefType { |
302 | optReferencesDefault, | 307 | optReferencesDefault, |
303 | optNoReferences, | 308 | optNoReferences, |
304 | optReferences | 309 | optReferences |
305 | }; | 310 | }; |
306 | enum optWin98Type { | 311 | enum optWin98Type { |
307 | optWin98Default, | 312 | optWin98Default, |
308 | optWin98No, | 313 | optWin98No, |
309 | optWin98Yes | 314 | optWin98Yes |
310 | }; | 315 | }; |
311 | enum pchOption { | 316 | enum pchOption { |
312 | pchNone, | 317 | pchNone, |
313 | pchCreateUsingSpecific, | 318 | pchCreateUsingSpecific, |
314 | pchGenerateAuto, | 319 | pchGenerateAuto, |
315 | pchUseUsingSpecific | 320 | pchUseUsingSpecific |
316 | }; | 321 | }; |
317 | enum preprocessOption { | 322 | enum preprocessOption { |
323 | preprocessUnknown = -1, | ||
318 | preprocessNo, | 324 | preprocessNo, |
319 | preprocessYes, | 325 | preprocessYes, |
320 | preprocessNoLineNumbers | 326 | preprocessNoLineNumbers |
321 | }; | 327 | }; |
322 | enum ProcessorOptimizeOption { | 328 | enum ProcessorOptimizeOption { |
323 | procOptimizeBlended, | 329 | procOptimizeBlended, |
324 | procOptimizePentium, | 330 | procOptimizePentium, |
325 | procOptimizePentiumProAndAbove | 331 | procOptimizePentiumProAndAbove |
326 | }; | 332 | }; |
327 | enum RemoteDebuggerType { | 333 | enum RemoteDebuggerType { |
328 | DbgLocal, | 334 | DbgLocal, |
329 | DbgRemote, | 335 | DbgRemote, |
330 | DbgRemoteTCPIP | 336 | DbgRemoteTCPIP |
331 | }; | 337 | }; |
332 | enum runtimeLibraryOption { | 338 | enum runtimeLibraryOption { |
339 | rtUnknown = -1, | ||
333 | rtMultiThreaded, | 340 | rtMultiThreaded, |
334 | rtMultiThreadedDebug, | 341 | rtMultiThreadedDebug, |
335 | rtMultiThreadedDLL, | 342 | rtMultiThreadedDLL, |
336 | rtMultiThreadedDebugDLL, | 343 | rtMultiThreadedDebugDLL, |
337 | rtSingleThreaded, | 344 | rtSingleThreaded, |
338 | rtSingleThreadedDebug | 345 | rtSingleThreadedDebug |
339 | }; | 346 | }; |
340 | enum structMemberAlignOption { | 347 | enum structMemberAlignOption { |
341 | alignNotSet, | 348 | alignNotSet, |
342 | alignSingleByte, | 349 | alignSingleByte, |
343 | alignTwoBytes, | 350 | alignTwoBytes, |
344 | alignFourBytes, | 351 | alignFourBytes, |
345 | alignEightBytes, | 352 | alignEightBytes, |
346 | alignSixteenBytes | 353 | alignSixteenBytes |
347 | }; | 354 | }; |
348 | enum subSystemOption { | 355 | enum subSystemOption { |
349 | subSystemNotSet, | 356 | subSystemNotSet, |
350 | subSystemConsole, | 357 | subSystemConsole, |
351 | subSystemWindows | 358 | subSystemWindows |
352 | }; | 359 | }; |
353 | enum termSvrAwarenessType { | 360 | enum termSvrAwarenessType { |
354 | termSvrAwareDefault, | 361 | termSvrAwareDefault, |
355 | termSvrAwareNo, | 362 | termSvrAwareNo, |
356 | termSvrAwareYes | 363 | termSvrAwareYes |
357 | }; | 364 | }; |
358 | enum toolSetType { | 365 | enum toolSetType { |
359 | toolSetUtility, | 366 | toolSetUtility, |
360 | toolSetMakefile, | 367 | toolSetMakefile, |
361 | toolSetLinker, | 368 | toolSetLinker, |
362 | toolSetLibrarian, | 369 | toolSetLibrarian, |
363 | toolSetAll | 370 | toolSetAll |
364 | }; | 371 | }; |
365 | enum TypeOfDebugger { | 372 | enum TypeOfDebugger { |
366 | DbgNativeOnly, | 373 | DbgNativeOnly, |
367 | DbgManagedOnly, | 374 | DbgManagedOnly, |
368 | DbgMixed, | 375 | DbgMixed, |
369 | DbgAuto | 376 | DbgAuto |
370 | }; | 377 | }; |
371 | enum useOfATL { | 378 | enum useOfATL { |
372 | useATLNotSet, | 379 | useATLNotSet, |
373 | useATLStatic, | 380 | useATLStatic, |
374 | useATLDynamic | 381 | useATLDynamic |
375 | }; | 382 | }; |
376 | enum useOfMfc { | 383 | enum useOfMfc { |
377 | useMfcStdWin, | 384 | useMfcStdWin, |
378 | useMfcStatic, | 385 | useMfcStatic, |
379 | useMfcDynamic | 386 | useMfcDynamic |
380 | }; | 387 | }; |
381 | enum warningLevelOption { | 388 | enum warningLevelOption { |
389 | warningLevelUnknown = -1, | ||
382 | warningLevel_0, | 390 | warningLevel_0, |
383 | warningLevel_1, | 391 | warningLevel_1, |
384 | warningLevel_2, | 392 | warningLevel_2, |
385 | warningLevel_3, | 393 | warningLevel_3, |
386 | warningLevel_4 | 394 | warningLevel_4 |
387 | }; | 395 | }; |
388 | 396 | ||
389 | class VCToolBase { | 397 | class VCToolBase { |
390 | protected: | 398 | protected: |
391 | // Functions | 399 | // Functions |
392 | VCToolBase(){}; | 400 | VCToolBase(){}; |
393 | virtual ~VCToolBase(){} | 401 | virtual ~VCToolBase(){} |
394 | virtual bool parseOption( const char* option ) = 0; | 402 | virtual bool parseOption( const char* option ) = 0; |
395 | public: | 403 | public: |
396 | void parseOptions( QStringList& options ) { | 404 | void parseOptions( QStringList& options ) { |
397 | for ( QStringList::ConstIterator it=options.begin(); (it!=options.end()); it++ ) | 405 | for ( QStringList::ConstIterator it=options.begin(); (it!=options.end()); it++ ) |
398 | parseOption( (*it).latin1() ); | 406 | parseOption( (*it).latin1() ); |
399 | } | 407 | } |
400 | }; | 408 | }; |
401 | 409 | ||
402 | class VCConfiguration; | 410 | class VCConfiguration; |
403 | class VCProject; | 411 | class VCProject; |
404 | 412 | ||
405 | class VCCLCompilerTool : public VCToolBase | 413 | class VCCLCompilerTool : public VCToolBase |
406 | { | 414 | { |
407 | public: | 415 | public: |
408 | // Functions | 416 | // Functions |
409 | VCCLCompilerTool(); | 417 | VCCLCompilerTool(); |
410 | virtual ~VCCLCompilerTool(){} | 418 | virtual ~VCCLCompilerTool(){} |
411 | bool parseOption( const char* option ); | 419 | bool parseOption( const char* option ); |
412 | 420 | ||
413 | // Variables | 421 | // Variables |
414 | QStringList AdditionalIncludeDirectories; | 422 | QStringList AdditionalIncludeDirectories; |
415 | QStringList AdditionalOptions; | 423 | QStringList AdditionalOptions; |
416 | QStringList AdditionalUsingDirectories; | 424 | QStringList AdditionalUsingDirectories; |
417 | QString AssemblerListingLocation; | 425 | QString AssemblerListingLocation; |
418 | asmListingOption AssemblerOutput; | 426 | asmListingOption AssemblerOutput; |
419 | basicRuntimeCheckOption BasicRuntimeChecks; | 427 | basicRuntimeCheckOption BasicRuntimeChecks; |
420 | browseInfoOption BrowseInformation; | 428 | browseInfoOption BrowseInformation; |
421 | QString BrowseInformationFile; | 429 | QString BrowseInformationFile; |
422 | triState BufferSecurityCheck; | 430 | triState BufferSecurityCheck; |
423 | callingConventionOption CallingConvention; | 431 | callingConventionOption CallingConvention; |
424 | CompileAsOptions CompileAs; | 432 | CompileAsOptions CompileAs; |
425 | compileAsManagedOptions CompileAsManaged; | 433 | compileAsManagedOptions CompileAsManaged; |
426 | triState CompileOnly; | 434 | triState CompileOnly; |
427 | debugOption DebugInformationFormat; | 435 | debugOption DebugInformationFormat; |
428 | triState DefaultCharIsUnsigned; | 436 | triState DefaultCharIsUnsigned; |
429 | triState Detect64BitPortabilityProblems; | 437 | triState Detect64BitPortabilityProblems; |
430 | triState DisableLanguageExtensions; | 438 | triState DisableLanguageExtensions; |
431 | QStringList DisableSpecificWarnings; | 439 | QStringList DisableSpecificWarnings; |
432 | triState EnableFiberSafeOptimizations; | 440 | triState EnableFiberSafeOptimizations; |
433 | triState EnableFunctionLevelLinking; | 441 | triState EnableFunctionLevelLinking; |
434 | triState EnableIntrinsicFunctions; | 442 | triState EnableIntrinsicFunctions; |
435 | triState ExceptionHandling; | 443 | triState ExceptionHandling; |
436 | triState ExpandAttributedSource; | 444 | triState ExpandAttributedSource; |
437 | favorSizeOrSpeedOption FavorSizeOrSpeed; | 445 | favorSizeOrSpeedOption FavorSizeOrSpeed; |
438 | triState ForceConformanceInForLoopScope; | 446 | triState ForceConformanceInForLoopScope; |
439 | QStringList ForcedIncludeFiles; | 447 | QStringList ForcedIncludeFiles; |
440 | QStringList ForcedUsingFiles; | 448 | QStringList ForcedUsingFiles; |
441 | preprocessOption GeneratePreprocessedFile; | 449 | preprocessOption GeneratePreprocessedFile; |
442 | triState GlobalOptimizations; | 450 | triState GlobalOptimizations; |
443 | triState IgnoreStandardIncludePath; | 451 | triState IgnoreStandardIncludePath; |
444 | triState ImproveFloatingPointConsistency; | 452 | triState ImproveFloatingPointConsistency; |
445 | inlineExpansionOption InlineFunctionExpansion; | 453 | inlineExpansionOption InlineFunctionExpansion; |
446 | triState KeepComments; | 454 | triState KeepComments; |
447 | triState MinimalRebuild; | 455 | triState MinimalRebuild; |
448 | QString ObjectFile; | 456 | QString ObjectFile; |
449 | triState OmitFramePointers; | 457 | triState OmitFramePointers; |
450 | optimizeOption Optimization; | 458 | optimizeOption Optimization; |
451 | ProcessorOptimizeOption OptimizeForProcessor; | 459 | ProcessorOptimizeOption OptimizeForProcessor; |
452 | triState OptimizeForWindowsApplication; | 460 | triState OptimizeForWindowsApplication; |
453 | QString OutputFile; | 461 | QString OutputFile; |
454 | QString PrecompiledHeaderFile; | 462 | QString PrecompiledHeaderFile; |
455 | QString PrecompiledHeaderThrough; | 463 | QString PrecompiledHeaderThrough; |
456 | QStringList PreprocessorDefinitions; | 464 | QStringList PreprocessorDefinitions; |
457 | QString ProgramDataBaseFileName; | 465 | QString ProgramDataBaseFileName; |
458 | runtimeLibraryOption RuntimeLibrary; | 466 | runtimeLibraryOption RuntimeLibrary; |
459 | triState RuntimeTypeInfo; | 467 | triState RuntimeTypeInfo; |
460 | triState ShowIncludes; | 468 | triState ShowIncludes; |
461 | triState SmallerTypeCheck; | 469 | triState SmallerTypeCheck; |
462 | triState StringPooling; | 470 | triState StringPooling; |
463 | structMemberAlignOption StructMemberAlignment; | 471 | structMemberAlignOption StructMemberAlignment; |
464 | triState SuppressStartupBanner; | 472 | triState SuppressStartupBanner; |
465 | triState TreatWChar_tAsBuiltInType; | 473 | triState TreatWChar_tAsBuiltInType; |
466 | triState TurnOffAssemblyGeneration; | 474 | triState TurnOffAssemblyGeneration; |
467 | triState UndefineAllPreprocessorDefinitions; | 475 | triState UndefineAllPreprocessorDefinitions; |
468 | QStringList UndefinePreprocessorDefinitions; | 476 | QStringList UndefinePreprocessorDefinitions; |
469 | pchOption UsePrecompiledHeader; | 477 | pchOption UsePrecompiledHeader; |
470 | triState WarnAsError; | 478 | triState WarnAsError; |
471 | warningLevelOption WarningLevel; | 479 | warningLevelOption WarningLevel; |
472 | triState WholeProgramOptimization; | 480 | triState WholeProgramOptimization; |
473 | VCConfiguration* config; | 481 | VCConfiguration* config; |
474 | }; | 482 | }; |
475 | 483 | ||
476 | class VCLinkerTool : public VCToolBase | 484 | class VCLinkerTool : public VCToolBase |
477 | { | 485 | { |
@@ -518,256 +526,263 @@ public: | |||
518 | QString OutputFile; | 526 | QString OutputFile; |
519 | QString ProgramDatabaseFile; | 527 | QString ProgramDatabaseFile; |
520 | triState RegisterOutput; | 528 | triState RegisterOutput; |
521 | triState ResourceOnlyDLL; | 529 | triState ResourceOnlyDLL; |
522 | triState SetChecksum; | 530 | triState SetChecksum; |
523 | linkProgressOption ShowProgress; | 531 | linkProgressOption ShowProgress; |
524 | long StackCommitSize; | 532 | long StackCommitSize; |
525 | long StackReserveSize; | 533 | long StackReserveSize; |
526 | QString StripPrivateSymbols; // Should be list? | 534 | QString StripPrivateSymbols; // Should be list? |
527 | subSystemOption SubSystem; | 535 | subSystemOption SubSystem; |
528 | triState SupportUnloadOfDelayLoadedDLL; | 536 | triState SupportUnloadOfDelayLoadedDLL; |
529 | triState SuppressStartupBanner; | 537 | triState SuppressStartupBanner; |
530 | triState SwapRunFromCD; | 538 | triState SwapRunFromCD; |
531 | triState SwapRunFromNet; | 539 | triState SwapRunFromNet; |
532 | machineTypeOption TargetMachine; | 540 | machineTypeOption TargetMachine; |
533 | termSvrAwarenessType TerminalServerAware; | 541 | termSvrAwarenessType TerminalServerAware; |
534 | triState TurnOffAssemblyGeneration; | 542 | triState TurnOffAssemblyGeneration; |
535 | QString TypeLibraryFile; | 543 | QString TypeLibraryFile; |
536 | long TypeLibraryResourceID; | 544 | long TypeLibraryResourceID; |
537 | QString Version; | 545 | QString Version; |
538 | VCConfiguration* config; | 546 | VCConfiguration* config; |
539 | }; | 547 | }; |
540 | 548 | ||
541 | class VCMIDLTool : public VCToolBase | 549 | class VCMIDLTool : public VCToolBase |
542 | { | 550 | { |
543 | public: | 551 | public: |
544 | // Functions | 552 | // Functions |
545 | VCMIDLTool(); | 553 | VCMIDLTool(); |
546 | virtual ~VCMIDLTool(){} | 554 | virtual ~VCMIDLTool(){} |
547 | bool parseOption( const char* option ); | 555 | bool parseOption( const char* option ); |
548 | 556 | ||
549 | // Variables | 557 | // Variables |
550 | QStringList AdditionalIncludeDirectories; | 558 | QStringList AdditionalIncludeDirectories; |
551 | QStringList AdditionalOptions; | 559 | QStringList AdditionalOptions; |
552 | QStringList CPreprocessOptions; | 560 | QStringList CPreprocessOptions; |
553 | midlCharOption DefaultCharType; | 561 | midlCharOption DefaultCharType; |
554 | QString DLLDataFileName; // Should be list? | 562 | QString DLLDataFileName; // Should be list? |
555 | midlErrorCheckOption EnableErrorChecks; | 563 | midlErrorCheckOption EnableErrorChecks; |
556 | triState ErrorCheckAllocations; | 564 | triState ErrorCheckAllocations; |
557 | triState ErrorCheckBounds; | 565 | triState ErrorCheckBounds; |
558 | triState ErrorCheckEnumRange; | 566 | triState ErrorCheckEnumRange; |
559 | triState ErrorCheckRefPointers; | 567 | triState ErrorCheckRefPointers; |
560 | triState ErrorCheckStubData; | 568 | triState ErrorCheckStubData; |
561 | QStringList FullIncludePath; | 569 | QStringList FullIncludePath; |
562 | triState GenerateStublessProxies; | 570 | triState GenerateStublessProxies; |
563 | triState GenerateTypeLibrary; | 571 | triState GenerateTypeLibrary; |
564 | QString HeaderFileName; | 572 | QString HeaderFileName; |
565 | triState IgnoreStandardIncludePath; | 573 | triState IgnoreStandardIncludePath; |
566 | QString InterfaceIdentifierFileName; | 574 | QString InterfaceIdentifierFileName; |
567 | triState MkTypLibCompatible; | 575 | triState MkTypLibCompatible; |
568 | QString OutputDirectory; | 576 | QString OutputDirectory; |
569 | QStringList PreprocessorDefinitions; | 577 | QStringList PreprocessorDefinitions; |
570 | QString ProxyFileName; | 578 | QString ProxyFileName; |
571 | QString RedirectOutputAndErrors; | 579 | QString RedirectOutputAndErrors; |
572 | midlStructMemberAlignOption StructMemberAlignment; | 580 | midlStructMemberAlignOption StructMemberAlignment; |
573 | triState SuppressStartupBanner; | 581 | triState SuppressStartupBanner; |
574 | midlTargetEnvironment TargetEnvironment; | 582 | midlTargetEnvironment TargetEnvironment; |
575 | QString TypeLibraryName; | 583 | QString TypeLibraryName; |
576 | QStringList UndefinePreprocessorDefinitions; | 584 | QStringList UndefinePreprocessorDefinitions; |
577 | triState ValidateParameters; | 585 | triState ValidateParameters; |
578 | triState WarnAsError; | 586 | triState WarnAsError; |
579 | midlWarningLevelOption WarningLevel; | 587 | midlWarningLevelOption WarningLevel; |
580 | VCConfiguration* config; | 588 | VCConfiguration* config; |
581 | }; | 589 | }; |
582 | 590 | ||
583 | class VCLibrarianTool : public VCToolBase | 591 | class VCLibrarianTool : public VCToolBase |
584 | { | 592 | { |
585 | public: | 593 | public: |
586 | // Functions | 594 | // Functions |
587 | VCLibrarianTool(); | 595 | VCLibrarianTool(); |
588 | virtual ~VCLibrarianTool(){} | 596 | virtual ~VCLibrarianTool(){} |
589 | bool parseOption( const char* ){ return FALSE; }; | 597 | bool parseOption( const char* ){ return FALSE; }; |
590 | 598 | ||
591 | // Variables | 599 | // Variables |
592 | QStringList AdditionalDependencies; | 600 | QStringList AdditionalDependencies; |
593 | QStringList AdditionalLibraryDirectories; | 601 | QStringList AdditionalLibraryDirectories; |
594 | QStringList AdditionalOptions; | 602 | QStringList AdditionalOptions; |
595 | QStringList ExportNamedFunctions; | 603 | QStringList ExportNamedFunctions; |
596 | QStringList ForceSymbolReferences; | 604 | QStringList ForceSymbolReferences; |
597 | triState IgnoreAllDefaultLibraries; | 605 | triState IgnoreAllDefaultLibraries; |
598 | QStringList IgnoreDefaultLibraryNames; | 606 | QStringList IgnoreDefaultLibraryNames; |
599 | QString ModuleDefinitionFile; | 607 | QString ModuleDefinitionFile; |
600 | QString OutputFile; | 608 | QString OutputFile; |
601 | triState SuppressStartupBanner; | 609 | triState SuppressStartupBanner; |
602 | }; | 610 | }; |
603 | 611 | ||
604 | class VCCustomBuildTool : public VCToolBase | 612 | class VCCustomBuildTool : public VCToolBase |
605 | { | 613 | { |
606 | public: | 614 | public: |
607 | // Functions | 615 | // Functions |
608 | VCCustomBuildTool(); | 616 | VCCustomBuildTool(); |
609 | virtual ~VCCustomBuildTool(){} | 617 | virtual ~VCCustomBuildTool(){} |
610 | bool parseOption( const char* ){ return FALSE; }; | 618 | bool parseOption( const char* ){ return FALSE; }; |
611 | 619 | ||
612 | // Variables | 620 | // Variables |
613 | QStringList AdditionalDependencies; | 621 | QStringList AdditionalDependencies; |
614 | QString CommandLine; | 622 | QStringList CommandLine; |
615 | QString Description; | 623 | QString Description; |
616 | QString Outputs; | 624 | QStringList Outputs; |
617 | QString ToolName; | 625 | QString ToolName; |
618 | QString ToolPath; | 626 | QString ToolPath; |
619 | }; | 627 | }; |
620 | 628 | ||
621 | class VCResourceCompilerTool : public VCToolBase | 629 | class VCResourceCompilerTool : public VCToolBase |
622 | { | 630 | { |
623 | public: | 631 | public: |
624 | // Functions | 632 | // Functions |
625 | VCResourceCompilerTool(); | 633 | VCResourceCompilerTool(); |
626 | virtual ~VCResourceCompilerTool(){} | 634 | virtual ~VCResourceCompilerTool(){} |
627 | bool parseOption( const char* ){ return FALSE; }; | 635 | bool parseOption( const char* ){ return FALSE; }; |
628 | 636 | ||
629 | // Variables | 637 | // Variables |
630 | QStringList AdditionalIncludeDirectories; | 638 | QStringList AdditionalIncludeDirectories; |
631 | QStringList AdditionalOptions; | 639 | QStringList AdditionalOptions; |
632 | enumResourceLangID Culture; | 640 | enumResourceLangID Culture; |
633 | QStringList FullIncludePath; | 641 | QStringList FullIncludePath; |
634 | triState IgnoreStandardIncludePath; | 642 | triState IgnoreStandardIncludePath; |
635 | QStringList PreprocessorDefinitions; | 643 | QStringList PreprocessorDefinitions; |
636 | QString ResourceOutputFileName; | 644 | QString ResourceOutputFileName; |
637 | linkProgressOption ShowProgress; | 645 | linkProgressOption ShowProgress; |
638 | QString ToolPath; | 646 | QString ToolPath; |
639 | }; | 647 | }; |
640 | 648 | ||
641 | class VCEventTool : public VCToolBase | 649 | class VCEventTool : public VCToolBase |
642 | { | 650 | { |
643 | protected: | 651 | protected: |
644 | // Functions | 652 | // Functions |
645 | VCEventTool() : ExcludedFromBuild( unset ){}; | 653 | VCEventTool() : ExcludedFromBuild( unset ){}; |
646 | virtual ~VCEventTool(){} | 654 | virtual ~VCEventTool(){} |
647 | bool parseOption( const char* ){ return FALSE; }; | 655 | bool parseOption( const char* ){ return FALSE; }; |
648 | 656 | ||
649 | public: | 657 | public: |
650 | // Variables | 658 | // Variables |
651 | QString CommandLine; | 659 | QString CommandLine; |
652 | QString Description; | 660 | QString Description; |
653 | triState ExcludedFromBuild; | 661 | triState ExcludedFromBuild; |
654 | QString ToolName; | 662 | QString ToolName; |
655 | QString ToolPath; | 663 | QString ToolPath; |
656 | }; | 664 | }; |
657 | 665 | ||
658 | class VCPostBuildEventTool : public VCEventTool | 666 | class VCPostBuildEventTool : public VCEventTool |
659 | { | 667 | { |
660 | public: | 668 | public: |
661 | VCPostBuildEventTool(); | 669 | VCPostBuildEventTool(); |
662 | ~VCPostBuildEventTool(){} | 670 | ~VCPostBuildEventTool(){} |
663 | }; | 671 | }; |
664 | 672 | ||
665 | class VCPreBuildEventTool : public VCEventTool | 673 | class VCPreBuildEventTool : public VCEventTool |
666 | { | 674 | { |
667 | public: | 675 | public: |
668 | VCPreBuildEventTool(); | 676 | VCPreBuildEventTool(); |
669 | ~VCPreBuildEventTool(){} | 677 | ~VCPreBuildEventTool(){} |
670 | }; | 678 | }; |
671 | 679 | ||
672 | class VCPreLinkEventTool : public VCEventTool | 680 | class VCPreLinkEventTool : public VCEventTool |
673 | { | 681 | { |
674 | public: | 682 | public: |
675 | VCPreLinkEventTool(); | 683 | VCPreLinkEventTool(); |
676 | ~VCPreLinkEventTool(){} | 684 | ~VCPreLinkEventTool(){} |
677 | }; | 685 | }; |
678 | 686 | ||
679 | class VCConfiguration | 687 | class VCConfiguration |
680 | { | 688 | { |
681 | public: | 689 | public: |
682 | // Functions | 690 | // Functions |
683 | VCConfiguration(); | 691 | VCConfiguration(); |
684 | ~VCConfiguration(){} | 692 | ~VCConfiguration(){} |
685 | 693 | ||
686 | // Variables | 694 | // Variables |
687 | triState ATLMinimizesCRunTimeLibraryUsage; | 695 | triState ATLMinimizesCRunTimeLibraryUsage; |
688 | triState BuildBrowserInformation; | 696 | triState BuildBrowserInformation; |
689 | charSet CharacterSet; | 697 | charSet CharacterSet; |
690 | ConfigurationTypesConfigurationType; | 698 | ConfigurationTypesConfigurationType; |
691 | QString DeleteExtensionsOnClean; | 699 | QString DeleteExtensionsOnClean; |
692 | QString ImportLibrary; | 700 | QString ImportLibrary; |
693 | QString IntermediateDirectory; | 701 | QString IntermediateDirectory; |
694 | QString Name; | 702 | QString Name; |
695 | QString OutputDirectory; | 703 | QString OutputDirectory; |
696 | QString PrimaryOutput; | 704 | QString PrimaryOutput; |
697 | QString ProgramDatabase; | 705 | QString ProgramDatabase; |
698 | triState RegisterOutput; | 706 | triState RegisterOutput; |
699 | useOfATL UseOfATL; | 707 | useOfATL UseOfATL; |
700 | useOfMfc UseOfMfc; | 708 | useOfMfc UseOfMfc; |
701 | triState WholeProgramOptimization; | 709 | triState WholeProgramOptimization; |
702 | 710 | ||
703 | // XML sub-parts | 711 | // XML sub-parts |
704 | VCCLCompilerTool compiler; | 712 | VCCLCompilerTool compiler; |
705 | VCLinkerTool linker; | 713 | VCLinkerTool linker; |
706 | VCLibrarianTool librarian; | 714 | VCLibrarianTool librarian; |
707 | VCCustomBuildTool custom; | 715 | VCCustomBuildTool custom; |
708 | VCMIDLTool idl; | 716 | VCMIDLTool idl; |
709 | VCPostBuildEventTool postBuild; | 717 | VCPostBuildEventTool postBuild; |
710 | VCPreBuildEventTool preBuild; | 718 | VCPreBuildEventTool preBuild; |
711 | VCPreLinkEventTool preLink; | 719 | VCPreLinkEventTool preLink; |
712 | VCResourceCompilerTool resource; | 720 | VCResourceCompilerTool resource; |
713 | }; | 721 | }; |
714 | 722 | ||
715 | class VcprojGenerator; | 723 | class VcprojGenerator; |
716 | class VCFilter | 724 | class VCFilter |
717 | { | 725 | { |
718 | public: | 726 | public: |
719 | // Functions | 727 | // Functions |
720 | VCFilter(); | 728 | VCFilter(); |
721 | ~VCFilter(){} | 729 | ~VCFilter(){} |
722 | void generateMOC( QTextStream &strm, QString str ) const; | 730 | void addMOCstage( QTextStream &strm, QString str ); |
723 | void generateUIC( QTextStream &strm, const QString& str ) const; | 731 | void addUICstage( QTextStream &strm, QString str ); |
732 | bool addIMGstage( QTextStream &strm, QString str ); | ||
733 | void modifyPCHstage( QTextStream &strm, QString str ); | ||
724 | 734 | ||
725 | // Variables | 735 | // Variables |
726 | QString Name; | 736 | QString Name; |
727 | QString Filter; | 737 | QString Filter; |
728 | triState ParseFiles; | 738 | triState ParseFiles; |
729 | QStringList Files; | 739 | QStringList Files; |
730 | VcprojGenerator*Project; | 740 | VcprojGenerator*Project; |
731 | VCConfiguration*Config; | 741 | QValueList<VCConfiguration> *Config; |
732 | customBuildCheckCustomBuild; | 742 | customBuildCheckCustomBuild; |
743 | bool useCustomBuildTool; | ||
744 | VCCustomBuildTool CustomBuildTool; | ||
745 | bool useCompilerTool; | ||
746 | VCCLCompilerTool CompilerTool; | ||
747 | bool flat_files; | ||
733 | }; | 748 | }; |
734 | 749 | ||
735 | class VCProject | 750 | class VCProject |
736 | { | 751 | { |
737 | public: | 752 | public: |
738 | // Functions | 753 | // Functions |
739 | VCProject(); | 754 | VCProject(); |
740 | ~VCProject(){} | 755 | ~VCProject(){} |
741 | 756 | ||
742 | // Variables | 757 | // Variables |
743 | QString Name; | 758 | QString Name; |
744 | QString Version; | 759 | QString Version; |
745 | QString ProjectGUID; | 760 | QString ProjectGUID; |
746 | QString SccProjectName; | 761 | QString SccProjectName; |
747 | QString SccLocalPath; | 762 | QString SccLocalPath; |
748 | QString PlatformName; | 763 | QString PlatformName; |
749 | 764 | ||
750 | // XML sub-parts | 765 | // XML sub-parts |
751 | VCConfigurationConfiguration; | 766 | QValueList<VCConfiguration> Configuration; |
752 | VCFilter SourceFiles; | 767 | VCFilter SourceFiles; |
753 | VCFilter HeaderFiles; | 768 | VCFilter HeaderFiles; |
754 | VCFilter MOCFiles; | 769 | VCFilter MOCFiles; |
755 | VCFilter UICFiles; | 770 | VCFilter UICFiles; |
756 | VCFilter FormFiles; | 771 | VCFilter FormFiles; |
757 | VCFilter TranslationFiles; | 772 | VCFilter TranslationFiles; |
758 | VCFilter LexYaccFiles; | 773 | VCFilter LexYaccFiles; |
759 | VCFilter ResourceFiles; | 774 | VCFilter ResourceFiles; |
760 | }; | 775 | }; |
761 | 776 | ||
762 | QTextStream &operator<<( QTextStream &, const VCCLCompilerTool & ); | 777 | QTextStream &operator<<( QTextStream &, const VCCLCompilerTool & ); |
763 | QTextStream &operator<<( QTextStream &, const VCLinkerTool & ); | 778 | QTextStream &operator<<( QTextStream &, const VCLinkerTool & ); |
764 | QTextStream &operator<<( QTextStream &, const VCMIDLTool & ); | 779 | QTextStream &operator<<( QTextStream &, const VCMIDLTool & ); |
765 | QTextStream &operator<<( QTextStream &, const VCCustomBuildTool & ); | 780 | QTextStream &operator<<( QTextStream &, const VCCustomBuildTool & ); |
766 | QTextStream &operator<<( QTextStream &, const VCLibrarianTool & ); | 781 | QTextStream &operator<<( QTextStream &, const VCLibrarianTool & ); |
767 | QTextStream &operator<<( QTextStream &, const VCResourceCompilerTool & ); | 782 | QTextStream &operator<<( QTextStream &, const VCResourceCompilerTool & ); |
768 | QTextStream &operator<<( QTextStream &, const VCEventTool & ); | 783 | QTextStream &operator<<( QTextStream &, const VCEventTool & ); |
769 | QTextStream &operator<<( QTextStream &, const VCConfiguration & ); | 784 | QTextStream &operator<<( QTextStream &, const VCConfiguration & ); |
770 | QTextStream &operator<<( QTextStream &, const VCFilter & ); | 785 | QTextStream &operator<<( QTextStream &, VCFilter & ); |
771 | QTextStream &operator<<( QTextStream &, const VCProject & ); | 786 | QTextStream &operator<<( QTextStream &, const VCProject & ); |
772 | 787 | ||
773 | #endif //__MSVC_OBJECTMODEL_H__ | 788 | #endif //__MSVC_OBJECTMODEL_H__ |
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index d2cbc31..aa8fe16 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp | |||
@@ -1,1214 +1,1462 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of VcprojGenerator class. | 4 | ** Implementation of VcprojGenerator class. |
5 | ** | 5 | ** |
6 | ** Created : 970521 | 6 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. | 8 | ** This file is part of qmake. |
9 | ** | ||
10 | ** This file is part of the network module of the Qt GUI Toolkit. | ||
11 | ** | 9 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 13 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 14 | ** This file may be distributed and/or modified under the terms of the |
17 | ** GNU General Public License version 2 as published by the Free Software | 15 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 17 | ** packaging of this file. |
20 | ** | 18 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
22 | ** file in accordance with the Qt Commercial License Agreement provided | 20 | ** file in accordance with the Qt Commercial License Agreement provided |
23 | ** with the Software. | 21 | ** with the Software. |
24 | ** | 22 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 25 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 30 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 32 | ** not clear to you. |
35 | ** | 33 | ** |
36 | **********************************************************************/ | 34 | **********************************************************************/ |
37 | 35 | ||
38 | #include "msvc_vcproj.h" | 36 | #include "msvc_vcproj.h" |
39 | #include "option.h" | 37 | #include "option.h" |
38 | #include "qtmd5.h" // SG's MD5 addon | ||
40 | #include <qdir.h> | 39 | #include <qdir.h> |
41 | #include <qregexp.h> | 40 | #include <qregexp.h> |
42 | #include <qdict.h> | 41 | #include <qdict.h> |
43 | #include <quuid.h> | 42 | #include <quuid.h> |
44 | #include <stdlib.h> | 43 | #include <stdlib.h> |
44 | #include <qsettings.h> | ||
45 | |||
46 | //#define DEBUG_SOLUTION_GEN | ||
47 | //#define DEBUG_PROJECT_GEN | ||
48 | |||
49 | // Registry keys for .NET version detection ------------------------- | ||
50 | const char* _regNet2002 = "Microsoft\\VisualStudio\\7.0\\Setup\\VC\\ProductDir"; | ||
51 | const char* _regNet2003 = "Microsoft\\VisualStudio\\7.1\\Setup\\VC\\ProductDir"; | ||
45 | 52 | ||
46 | #if defined(Q_OS_WIN32) | 53 | bool use_net2003_version() |
47 | #include <objbase.h> | ||
48 | #ifndef GUID_DEFINED | ||
49 | #define GUID_DEFINED | ||
50 | typedef struct _GUID | ||
51 | { | 54 | { |
52 | ulong Data1; | 55 | #ifndef Q_OS_WIN32 |
53 | ushort Data2; | 56 | return FALSE; // Always generate 7.0 versions on other platforms |
54 | ushort Data3; | 57 | #else |
55 | uchar Data4[8]; | 58 | // Only search for the version once |
56 | } GUID; | 59 | static int current_version = -1; |
57 | #endif | 60 | if (current_version!=-1) |
61 | return (current_version==71); | ||
62 | |||
63 | // Fallback to .NET 2002 | ||
64 | current_version = 70; | ||
65 | |||
66 | // Get registry entries for both versions | ||
67 | bool ok = false; | ||
68 | QSettings setting; | ||
69 | QString path2002 = setting.readEntry(_regNet2002); | ||
70 | QString path2003 = setting.readEntry(_regNet2003); | ||
71 | |||
72 | if ( path2002.isNull() || path2003.isNull() ) { | ||
73 | // Only have one MSVC, so use that one | ||
74 | current_version = (path2003.isNull() ? 70 : 71); | ||
75 | } else { | ||
76 | // Have both, so figure out the current | ||
77 | QString paths = getenv("PATH"); | ||
78 | QStringList pathlist = QStringList::split(";", paths.lower()); | ||
79 | |||
80 | path2003 = path2003.lower(); | ||
81 | QStringList::iterator it; | ||
82 | for(it=pathlist.begin(); it!=pathlist.end(); ++it) { | ||
83 | if ((*it).contains(path2003)) { | ||
84 | current_version = 71; | ||
85 | } else if ((*it).contains(path2002) | ||
86 | && current_version == 71) { | ||
87 | fprintf( stderr, "Both .NET 2002 & .NET 2003 directories for VC found in you PATH variable!\nFallback to .NET 2002 project generation" ); | ||
88 | current_version = 70; | ||
89 | break; | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | return (current_version==71); | ||
58 | #endif | 94 | #endif |
95 | }; | ||
59 | 96 | ||
60 | // Flatfile Tags ---------------------------------------------------- | 97 | // Flatfile Tags ---------------------------------------------------- |
61 | const char* _snlHeader = "Microsoft Visual Studio Solution File, Format Version 7.00"; | 98 | const char* _slnHeader70= "Microsoft Visual Studio Solution File, Format Version 7.00"; |
99 | const char* _slnHeader71= "Microsoft Visual Studio Solution File, Format Version 8.00"; | ||
62 | // The following UUID _may_ change for later servicepacks... | 100 | // The following UUID _may_ change for later servicepacks... |
63 | // If so we need to search through the registry at | 101 | // If so we need to search through the registry at |
64 | // HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\7.0\Projects | 102 | // HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\7.0\Projects |
65 | // to find the subkey that contains a "PossibleProjectExtension" | 103 | // to find the subkey that contains a "PossibleProjectExtension" |
66 | // containing "vcproj"... | 104 | // containing "vcproj"... |
67 | // Use the hardcoded value for now so projects generated on other | 105 | // Use the hardcoded value for now so projects generated on other |
68 | // platforms are actually usable. | 106 | // platforms are actually usable. |
69 | const char* _snlMSVCvcprojGUID = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"; | 107 | const char* _slnMSVCvcprojGUID = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"; |
70 | const char* _snlProjectBeg= "\nProject(\""; | 108 | const char* _slnProjectBeg= "\nProject(\""; |
71 | const char* _snlProjectMid= "\") = "; | 109 | const char* _slnProjectMid= "\") = "; |
72 | const char* _snlProjectEnd= "\nEndProject"; | 110 | const char* _slnProjectEnd= "\nEndProject"; |
73 | const char* _snlGlobalBeg= "\nGlobal"; | 111 | const char* _slnGlobalBeg= "\nGlobal"; |
74 | const char* _snlGlobalEnd= "\nEndGlobal"; | 112 | const char* _slnGlobalEnd= "\nEndGlobal"; |
75 | const char* _snlSolutionConf= "\n\tGlobalSection(SolutionConfiguration) = preSolution" | 113 | const char* _slnSolutionConf= "\n\tGlobalSection(SolutionConfiguration) = preSolution" |
76 | "\n\t\tConfigName.0 = Release" | 114 | "\n\t\tConfigName.0 = Debug" |
115 | "\n\t\tConfigName.1 = Release" | ||
77 | "\n\tEndGlobalSection"; | 116 | "\n\tEndGlobalSection"; |
78 | const char* _snlProjDepBeg= "\n\tGlobalSection(ProjectDependencies) = postSolution"; | 117 | const char* _slnProjDepBeg= "\n\tGlobalSection(ProjectDependencies) = postSolution"; |
79 | const char* _snlProjDepEnd= "\n\tEndGlobalSection"; | 118 | const char* _slnProjDepEnd= "\n\tEndGlobalSection"; |
80 | const char* _snlProjConfBeg= "\n\tGlobalSection(ProjectConfiguration) = postSolution"; | 119 | const char* _slnProjConfBeg= "\n\tGlobalSection(ProjectConfiguration) = postSolution"; |
81 | const char* _snlProjConfTag1= ".Release.ActiveCfg = Release|Win32"; | 120 | const char* _slnProjRelConfTag1= ".Release.ActiveCfg = Release|Win32"; |
82 | const char* _snlProjConfTag2= ".Release.Build.0 = Release|Win32"; | 121 | const char* _slnProjRelConfTag2= ".Release.Build.0 = Release|Win32"; |
83 | const char* _snlProjConfEnd= "\n\tEndGlobalSection"; | 122 | const char* _slnProjDbgConfTag1= ".Debug.ActiveCfg = Debug|Win32"; |
84 | const char* _snlExtSections= "\n\tGlobalSection(ExtensibilityGlobals) = postSolution" | 123 | const char* _slnProjDbgConfTag2= ".Debug.Build.0 = Debug|Win32"; |
124 | const char* _slnProjConfEnd= "\n\tEndGlobalSection"; | ||
125 | const char* _slnExtSections= "\n\tGlobalSection(ExtensibilityGlobals) = postSolution" | ||
85 | "\n\tEndGlobalSection" | 126 | "\n\tEndGlobalSection" |
86 | "\n\tGlobalSection(ExtensibilityAddIns) = postSolution" | 127 | "\n\tGlobalSection(ExtensibilityAddIns) = postSolution" |
87 | "\n\tEndGlobalSection"; | 128 | "\n\tEndGlobalSection"; |
88 | // ------------------------------------------------------------------ | 129 | // ------------------------------------------------------------------ |
89 | 130 | ||
90 | VcprojGenerator::VcprojGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE) | 131 | VcprojGenerator::VcprojGenerator(QMakeProject *p) : Win32MakefileGenerator(p), init_flag(FALSE) |
91 | { | 132 | { |
92 | } | 133 | } |
93 | 134 | ||
94 | /* \internal | 135 | /* \internal |
95 | Generates a project file for the given profile. | 136 | Generates a project file for the given profile. |
96 | Options are either a Visual Studio projectfiles, or | 137 | Options are either a Visual Studio projectfiles, or |
97 | solutionfiles by parsing recursive projectdirectories. | 138 | solutionfiles by parsing recursive projectdirectories. |
98 | */ | 139 | */ |
99 | bool VcprojGenerator::writeMakefile(QTextStream &t) | 140 | bool VcprojGenerator::writeMakefile(QTextStream &t) |
100 | { | 141 | { |
101 | // Check if all requirements are fullfilled | 142 | // Check if all requirements are fullfilled |
102 | if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { | 143 | if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { |
103 | fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n", | 144 | fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n", |
104 | var("QMAKE_FAILED_REQUIREMENTS").latin1()); | 145 | var("QMAKE_FAILED_REQUIREMENTS").latin1()); |
105 | return TRUE; | 146 | return TRUE; |
106 | } | 147 | } |
107 | 148 | ||
108 | // Generate project file | 149 | // Generate project file |
109 | if(project->first("TEMPLATE") == "vcapp" || | 150 | if(project->first("TEMPLATE") == "vcapp" || |
110 | project->first("TEMPLATE") == "vclib") { | 151 | project->first("TEMPLATE") == "vclib") { |
111 | debug_msg(1, "Generator: MSVC.NET: Writing project file" ); | 152 | debug_msg(1, "Generator: MSVC.NET: Writing project file" ); |
112 | t << vcProject; | 153 | t << vcProject; |
113 | return TRUE; | 154 | return TRUE; |
114 | } | 155 | } |
115 | // Generate solution file | 156 | // Generate solution file |
116 | else if(project->first("TEMPLATE") == "vcsubdirs") { | 157 | else if(project->first("TEMPLATE") == "vcsubdirs") { |
117 | debug_msg(1, "Generator: MSVC.NET: Writing solution file" ); | 158 | debug_msg(1, "Generator: MSVC.NET: Writing solution file" ); |
118 | writeSubDirs(t); | 159 | writeSubDirs(t); |
119 | return TRUE; | 160 | return TRUE; |
120 | } | 161 | } |
121 | return FALSE; | 162 | return FALSE; |
122 | 163 | ||
123 | } | 164 | } |
124 | 165 | ||
125 | struct VcsolutionDepend { | 166 | struct VcsolutionDepend { |
126 | QString uuid; | 167 | QString uuid; |
127 | QString vcprojFile, orig_target, target; | 168 | QString vcprojFile, orig_target, target; |
128 | ::target targetType; | 169 | ::target targetType; |
170 | bool debugBuild; | ||
129 | QStringList dependencies; | 171 | QStringList dependencies; |
130 | }; | 172 | }; |
131 | 173 | ||
174 | QUuid VcprojGenerator::getProjectUUID(const QString &filename) | ||
175 | { | ||
176 | bool validUUID = true; | ||
177 | |||
178 | // Read GUID from variable-space | ||
179 | QUuid uuid = project->first("GUID"); | ||
180 | |||
181 | // If none, create one based on the MD5 of absolute project path | ||
182 | if (uuid.isNull() || !filename.isNull()) { | ||
183 | QString abspath = filename.isNull()?project->first("QMAKE_MAKEFILE"):filename; | ||
184 | qtMD5(abspath.utf8(), (unsigned char*)(&uuid)); | ||
185 | validUUID = !uuid.isNull(); | ||
186 | uuid.data4[0] = (uuid.data4[0] & 0x3F) | 0x80; // UV_DCE variant | ||
187 | uuid.data3 = (uuid.data3 & 0x0FFF) | (QUuid::Name<<12); | ||
188 | } | ||
189 | |||
190 | // If still not valid, generate new one, and suggest adding to .pro | ||
191 | if (uuid.isNull() || !validUUID) { | ||
192 | uuid = QUuid::createUuid(); | ||
193 | fprintf(stderr, | ||
194 | "qmake couldn't create a GUID based on filepath, and we couldn't\nfind a valid GUID in the .pro file (Consider adding\n'GUID = %s' to the .pro file)\n", | ||
195 | uuid.toString().upper().latin1()); | ||
196 | } | ||
197 | |||
198 | // Store GUID in variable-space | ||
199 | project->values("GUID") = uuid.toString().upper(); | ||
200 | return uuid; | ||
201 | } | ||
202 | |||
132 | QUuid VcprojGenerator::increaseUUID( const QUuid &id ) | 203 | QUuid VcprojGenerator::increaseUUID( const QUuid &id ) |
133 | { | 204 | { |
134 | QUuid result( id ); | 205 | QUuid result( id ); |
135 | Q_LONG dataFirst = (result.data4[0] << 24) + | 206 | Q_LONG dataFirst = (result.data4[0] << 24) + |
136 | (result.data4[1] << 16) + | 207 | (result.data4[1] << 16) + |
137 | (result.data4[2] << 8) + | 208 | (result.data4[2] << 8) + |
138 | result.data4[3]; | 209 | result.data4[3]; |
139 | Q_LONG dataLast = (result.data4[4] << 24) + | 210 | Q_LONG dataLast = (result.data4[4] << 24) + |
140 | (result.data4[5] << 16) + | 211 | (result.data4[5] << 16) + |
141 | (result.data4[6] << 8) + | 212 | (result.data4[6] << 8) + |
142 | result.data4[7]; | 213 | result.data4[7]; |
143 | 214 | ||
144 | if ( !(dataLast++) ) | 215 | if ( !(dataLast++) ) |
145 | dataFirst++; | 216 | dataFirst++; |
146 | 217 | ||
147 | result.data4[0] = uchar((dataFirst >> 24) & 0xff); | 218 | result.data4[0] = uchar((dataFirst >> 24) & 0xff); |
148 | result.data4[1] = uchar((dataFirst >> 16) & 0xff); | 219 | result.data4[1] = uchar((dataFirst >> 16) & 0xff); |
149 | result.data4[2] = uchar((dataFirst >> 8) & 0xff); | 220 | result.data4[2] = uchar((dataFirst >> 8) & 0xff); |
150 | result.data4[3] = uchar( dataFirst & 0xff); | 221 | result.data4[3] = uchar( dataFirst & 0xff); |
151 | result.data4[4] = uchar((dataLast >> 24) & 0xff); | 222 | result.data4[4] = uchar((dataLast >> 24) & 0xff); |
152 | result.data4[5] = uchar((dataLast >> 16) & 0xff); | 223 | result.data4[5] = uchar((dataLast >> 16) & 0xff); |
153 | result.data4[6] = uchar((dataLast >> 8) & 0xff); | 224 | result.data4[6] = uchar((dataLast >> 8) & 0xff); |
154 | result.data4[7] = uchar( dataLast & 0xff); | 225 | result.data4[7] = uchar( dataLast & 0xff); |
155 | return result; | 226 | return result; |
156 | } | 227 | } |
157 | 228 | ||
158 | void VcprojGenerator::writeSubDirs(QTextStream &t) | 229 | void VcprojGenerator::writeSubDirs(QTextStream &t) |
159 | { | 230 | { |
160 | if(project->first("TEMPLATE") == "subdirs") { | 231 | if(project->first("TEMPLATE") == "subdirs") { |
161 | writeHeader(t); | 232 | writeHeader(t); |
162 | Win32MakefileGenerator::writeSubDirs(t); | 233 | Win32MakefileGenerator::writeSubDirs(t); |
163 | return; | 234 | return; |
164 | } | 235 | } |
165 | 236 | ||
166 | t << _snlHeader; | 237 | t << (use_net2003_version() ? _slnHeader71 : _slnHeader70); |
167 | QUuid solutionGUID; | ||
168 | #if defined(Q_WS_WIN32) | ||
169 | GUID guid; | ||
170 | HRESULT h = CoCreateGuid( &guid ); | ||
171 | if ( h == S_OK ) | ||
172 | solutionGUID = QUuid( guid ); | ||
173 | #else | ||
174 | // Qt doesn't support GUID on other platforms yet, | ||
175 | // so we use the all-zero uuid, and increase that. | ||
176 | #endif | ||
177 | |||
178 | 238 | ||
179 | QDict<VcsolutionDepend> solution_depends; | 239 | QDict<VcsolutionDepend> solution_depends; |
240 | |||
180 | QPtrList<VcsolutionDepend> solution_cleanup; | 241 | QPtrList<VcsolutionDepend> solution_cleanup; |
181 | solution_cleanup.setAutoDelete(TRUE); | 242 | solution_cleanup.setAutoDelete(TRUE); |
243 | |||
244 | |||
182 | QStringList subdirs = project->variables()["SUBDIRS"]; | 245 | QStringList subdirs = project->variables()["SUBDIRS"]; |
183 | QString oldpwd = QDir::currentDirPath(); | 246 | QString oldpwd = QDir::currentDirPath(); |
247 | |||
184 | for(QStringList::Iterator it = subdirs.begin(); it != subdirs.end(); ++it) { | 248 | for(QStringList::Iterator it = subdirs.begin(); it != subdirs.end(); ++it) { |
185 | QFileInfo fi(Option::fixPathToLocalOS((*it), TRUE)); | 249 | QFileInfo fi(Option::fixPathToLocalOS((*it), TRUE)); |
186 | if(fi.exists()) { | 250 | if(fi.exists()) { |
187 | if(fi.isDir()) { | 251 | if(fi.isDir()) { |
188 | QString profile = (*it); | 252 | QString profile = (*it); |
189 | if(!profile.endsWith(Option::dir_sep)) | 253 | if(!profile.endsWith(Option::dir_sep)) |
190 | profile += Option::dir_sep; | 254 | profile += Option::dir_sep; |
191 | profile += fi.baseName() + ".pro"; | 255 | profile += fi.baseName() + ".pro"; |
192 | subdirs.append(profile); | 256 | subdirs.append(profile); |
193 | } else { | 257 | } else { |
194 | QMakeProject tmp_proj; | 258 | QMakeProject tmp_proj; |
195 | QString dir = fi.dirPath(), fn = fi.fileName(); | 259 | QString dir = fi.dirPath(), fn = fi.fileName(); |
196 | if(!dir.isEmpty()) { | 260 | if(!dir.isEmpty()) { |
197 | if(!QDir::setCurrent(dir)) | 261 | if(!QDir::setCurrent(dir)) |
198 | fprintf(stderr, "Cannot find directory: %s\n", dir.latin1()); | 262 | fprintf(stderr, "Cannot find directory: %s\n", dir.latin1()); |
199 | } | 263 | } |
200 | if(tmp_proj.read(fn, oldpwd)) { | 264 | if(tmp_proj.read(fn, oldpwd)) { |
201 | if(tmp_proj.first("TEMPLATE") == "vcsubdirs") { | 265 | if(tmp_proj.first("TEMPLATE") == "vcsubdirs") { |
202 | QStringList tmp_subdirs = fileFixify(tmp_proj.variables()["SUBDIRS"]); | 266 | subdirs += fileFixify(tmp_proj.variables()["SUBDIRS"]); |
203 | subdirs += tmp_subdirs; | ||
204 | } else if(tmp_proj.first("TEMPLATE") == "vcapp" || tmp_proj.first("TEMPLATE") == "vclib") { | 267 | } else if(tmp_proj.first("TEMPLATE") == "vcapp" || tmp_proj.first("TEMPLATE") == "vclib") { |
205 | // Initialize a 'fake' project to get the correct variables | 268 | // Initialize a 'fake' project to get the correct variables |
206 | // and to be able to extract all the dependencies | 269 | // and to be able to extract all the dependencies |
207 | VcprojGenerator tmp_vcproj(&tmp_proj); | 270 | VcprojGenerator tmp_vcproj(&tmp_proj); |
208 | tmp_vcproj.setNoIO(TRUE); | 271 | tmp_vcproj.setNoIO(TRUE); |
209 | tmp_vcproj.init(); | 272 | tmp_vcproj.init(); |
210 | if(Option::debug_level) { | 273 | if(Option::debug_level) { |
211 | QMap<QString, QStringList> &vars = tmp_proj.variables(); | 274 | QMap<QString, QStringList> &vars = tmp_proj.variables(); |
212 | for(QMap<QString, QStringList>::Iterator it = vars.begin(); | 275 | for(QMap<QString, QStringList>::Iterator it = vars.begin(); |
213 | it != vars.end(); ++it) { | 276 | it != vars.end(); ++it) { |
214 | if(it.key().left(1) != "." && !it.data().isEmpty()) | 277 | if(it.key().left(1) != "." && !it.data().isEmpty()) |
215 | debug_msg(1, "%s: %s === %s", fn.latin1(), it.key().latin1(), | 278 | debug_msg(1, "%s: %s === %s", fn.latin1(), it.key().latin1(), |
216 | it.data().join(" :: ").latin1()); | 279 | it.data().join(" :: ").latin1()); |
217 | } | 280 | } |
218 | } | 281 | } |
219 | 282 | ||
220 | // We assume project filename is [QMAKE_ORIG_TARGET].vcproj | 283 | // We assume project filename is [QMAKE_ORIG_TARGET].vcproj |
221 | QString vcproj = fixFilename(tmp_vcproj.project->first("QMAKE_ORIG_TARGET")) + project->first("VCPROJ_EXTENSION"); | 284 | QString vcproj = fixFilename(tmp_vcproj.project->first("QMAKE_ORIG_TARGET")) + project->first("VCPROJ_EXTENSION"); |
222 | 285 | ||
223 | // If file doesn't exsist, then maybe the users configuration | 286 | // If file doesn't exsist, then maybe the users configuration |
224 | // doesn't allow it to be created. Skip to next... | 287 | // doesn't allow it to be created. Skip to next... |
225 | if(!QFile::exists(QDir::currentDirPath() + Option::dir_sep + vcproj)) { | 288 | if(!QFile::exists(QDir::currentDirPath() + Option::dir_sep + vcproj)) { |
226 | qDebug( "Ignored (not found) '%s'", QString(QDir::currentDirPath() + Option::dir_sep + vcproj).latin1() ); | 289 | warn_msg(WarnLogic, "Ignored (not found) '%s'", QString(QDir::currentDirPath() + Option::dir_sep + vcproj).latin1() ); |
227 | goto nextfile; // # Dirty! | 290 | goto nextfile; // # Dirty! |
228 | } | 291 | } |
229 | 292 | ||
230 | VcsolutionDepend *newDep = new VcsolutionDepend; | 293 | VcsolutionDepend *newDep = new VcsolutionDepend; |
231 | newDep->vcprojFile = fileFixify(vcproj); | 294 | newDep->vcprojFile = fileFixify(vcproj); |
232 | newDep->orig_target = tmp_proj.first("QMAKE_ORIG_TARGET"); | 295 | newDep->orig_target = tmp_proj.first("QMAKE_ORIG_TARGET"); |
233 | newDep->target = tmp_proj.first("TARGET").section(Option::dir_sep, -1); | 296 | newDep->target = tmp_proj.first("MSVCPROJ_TARGET").section(Option::dir_sep, -1); |
234 | newDep->targetType = tmp_vcproj.projectTarget; | 297 | newDep->targetType = tmp_vcproj.projectTarget; |
235 | { | 298 | newDep->debugBuild = tmp_proj.isActiveConfig("debug"); |
236 | static QUuid uuid = solutionGUID; | 299 | newDep->uuid = getProjectUUID(Option::fixPathToLocalOS(QDir::currentDirPath() + QDir::separator() + vcproj)).toString().upper(); |
237 | uuid = increaseUUID( uuid ); | 300 | |
238 | newDep->uuid = uuid.toString().upper(); | 301 | // We want to store it as the .lib name. |
239 | } | ||
240 | if(newDep->target.endsWith(".dll")) | 302 | if(newDep->target.endsWith(".dll")) |
241 | newDep->target = newDep->target.left(newDep->target.length()-3) + "lib"; | 303 | newDep->target = newDep->target.left(newDep->target.length()-3) + "lib"; |
304 | |||
305 | // All projects using Forms are dependent on uic.exe | ||
242 | if(!tmp_proj.isEmpty("FORMS")) | 306 | if(!tmp_proj.isEmpty("FORMS")) |
243 | newDep->dependencies << "uic.exe"; | 307 | newDep->dependencies << "uic.exe"; |
244 | { | 308 | |
245 | QStringList where("QMAKE_LIBS"); | 309 | // Add all unknown libs to the deps |
246 | if(!tmp_proj.isEmpty("QMAKE_INTERNAL_PRL_LIBS")) | 310 | QStringList where("QMAKE_LIBS"); |
247 | where = tmp_proj.variables()["QMAKE_INTERNAL_PRL_LIBS"]; | 311 | if(!tmp_proj.isEmpty("QMAKE_INTERNAL_PRL_LIBS")) |
248 | for(QStringList::iterator wit = where.begin(); | 312 | where = tmp_proj.variables()["QMAKE_INTERNAL_PRL_LIBS"]; |
249 | wit != where.end(); ++wit) { | 313 | for(QStringList::iterator wit = where.begin(); |
250 | QStringList &l = tmp_proj.variables()[(*wit)]; | 314 | wit != where.end(); ++wit) { |
251 | for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) { | 315 | QStringList &l = tmp_proj.variables()[(*wit)]; |
252 | QString opt = (*it); | 316 | for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) { |
253 | if(!opt.startsWith("/")) //Not a switch | 317 | QString opt = (*it); |
254 | newDep->dependencies << opt.section(Option::dir_sep, -1); | 318 | if(!opt.startsWith("/") && // Not a switch |
319 | opt != newDep->target && // Not self | ||
320 | opt != "opengl32.lib" && // We don't care about these libs | ||
321 | opt != "glu32.lib" && // to make depgen alittle faster | ||
322 | opt != "kernel32.lib" && | ||
323 | opt != "user32.lib" && | ||
324 | opt != "gdi32.lib" && | ||
325 | opt != "comdlg32.lib" && | ||
326 | opt != "advapi32.lib" && | ||
327 | opt != "shell32.lib" && | ||
328 | opt != "ole32.lib" && | ||
329 | opt != "oleaut32.lib" && | ||
330 | opt != "uuid.lib" && | ||
331 | opt != "imm32.lib" && | ||
332 | opt != "winmm.lib" && | ||
333 | opt != "wsock32.lib" && | ||
334 | opt != "winspool.lib" && | ||
335 | opt != "delayimp.lib" ) | ||
336 | { | ||
337 | newDep->dependencies << opt.section(Option::dir_sep, -1); | ||
255 | } | 338 | } |
256 | } | 339 | } |
257 | } | 340 | } |
341 | #ifdef DEBUG_SOLUTION_GEN | ||
342 | qDebug( "Deps for %20s: [%s]", newDep->target.latin1(), newDep->dependencies.join(" :: " ).latin1() ); | ||
343 | #endif | ||
258 | solution_cleanup.append(newDep); | 344 | solution_cleanup.append(newDep); |
259 | solution_depends.insert(newDep->target, newDep); | 345 | solution_depends.insert(newDep->target, newDep); |
260 | { | 346 | t << _slnProjectBeg << _slnMSVCvcprojGUID << _slnProjectMid |
261 | QRegExp libVersion("[0-9]{3,3}\\.lib$"); | ||
262 | if(libVersion.search(newDep->target) != -1) | ||
263 | solution_depends.insert(newDep->target.left(newDep->target.length() - | ||
264 | libVersion.matchedLength()) + ".lib", newDep); | ||
265 | } | ||
266 | t << _snlProjectBeg << _snlMSVCvcprojGUID << _snlProjectMid | ||
267 | << "\"" << newDep->orig_target << "\", \"" << newDep->vcprojFile | 347 | << "\"" << newDep->orig_target << "\", \"" << newDep->vcprojFile |
268 | << "\", \"" << newDep->uuid << "\""; | 348 | << "\", \"" << newDep->uuid << "\""; |
269 | t << _snlProjectEnd; | 349 | t << _slnProjectEnd; |
270 | } | 350 | } |
271 | } | 351 | } |
272 | nextfile: | 352 | nextfile: |
273 | QDir::setCurrent(oldpwd); | 353 | QDir::setCurrent(oldpwd); |
274 | } | 354 | } |
275 | } | 355 | } |
276 | } | 356 | } |
277 | t << _snlGlobalBeg; | 357 | t << _slnGlobalBeg; |
278 | t << _snlSolutionConf; | 358 | t << _slnSolutionConf; |
279 | t << _snlProjDepBeg; | 359 | t << _slnProjDepBeg; |
360 | |||
361 | // Figure out dependencies | ||
280 | for(solution_cleanup.first(); solution_cleanup.current(); solution_cleanup.next()) { | 362 | for(solution_cleanup.first(); solution_cleanup.current(); solution_cleanup.next()) { |
363 | if(solution_cleanup.current()->targetType == StaticLib) | ||
364 | continue; // Shortcut, Static libs are not dep. | ||
281 | int cnt = 0; | 365 | int cnt = 0; |
282 | for(QStringList::iterator dit = solution_cleanup.current()->dependencies.begin(); | 366 | for(QStringList::iterator dit = solution_cleanup.current()->dependencies.begin(); |
283 | dit != solution_cleanup.current()->dependencies.end(); | 367 | dit != solution_cleanup.current()->dependencies.end(); |
284 | ++dit) { | 368 | ++dit) |
285 | VcsolutionDepend *vc; | 369 | { |
286 | if((vc=solution_depends[*dit])) { | 370 | VcsolutionDepend *vc = solution_depends[*dit]; |
287 | if(solution_cleanup.current()->targetType != StaticLib || vc->targetType == Application) | 371 | if(vc) |
288 | t << "\n\t\t" << solution_cleanup.current()->uuid << "." << cnt++ << " = " << vc->uuid; | 372 | t << "\n\t\t" << solution_cleanup.current()->uuid << "." << cnt++ << " = " << vc->uuid; |
289 | } | ||
290 | } | 373 | } |
291 | } | 374 | } |
292 | t << _snlProjDepEnd; | 375 | t << _slnProjDepEnd; |
293 | t << _snlProjConfBeg; | 376 | t << _slnProjConfBeg; |
294 | for(solution_cleanup.first(); solution_cleanup.current(); solution_cleanup.next()) { | 377 | for(solution_cleanup.first(); solution_cleanup.current(); solution_cleanup.next()) { |
295 | t << "\n\t\t" << solution_cleanup.current()->uuid << _snlProjConfTag1; | 378 | t << "\n\t\t" << solution_cleanup.current()->uuid << _slnProjDbgConfTag1; |
296 | t << "\n\t\t" << solution_cleanup.current()->uuid << _snlProjConfTag2; | 379 | t << "\n\t\t" << solution_cleanup.current()->uuid << _slnProjDbgConfTag2; |
380 | t << "\n\t\t" << solution_cleanup.current()->uuid << _slnProjRelConfTag1; | ||
381 | t << "\n\t\t" << solution_cleanup.current()->uuid << _slnProjRelConfTag2; | ||
297 | } | 382 | } |
298 | t << _snlProjConfEnd; | 383 | t << _slnProjConfEnd; |
299 | t << _snlExtSections; | 384 | t << _slnExtSections; |
300 | t << _snlGlobalEnd; | 385 | t << _slnGlobalEnd; |
301 | } | 386 | } |
302 | 387 | ||
303 | // ------------------------------------------------------------------------------------------------ | 388 | // ------------------------------------------------------------------------------------------------ |
304 | // ------------------------------------------------------------------------------------------------ | 389 | // ------------------------------------------------------------------------------------------------ |
305 | 390 | ||
306 | void VcprojGenerator::init() | 391 | void VcprojGenerator::init() |
307 | { | 392 | { |
308 | if( init_flag ) | 393 | if( init_flag ) |
309 | return; | 394 | return; |
310 | if(project->first("TEMPLATE") == "vcsubdirs") { //too much work for subdirs | 395 | if(project->first("TEMPLATE") == "vcsubdirs") { //too much work for subdirs |
311 | init_flag = TRUE; | 396 | init_flag = TRUE; |
312 | return; | 397 | return; |
313 | } | 398 | } |
314 | 399 | ||
315 | debug_msg(1, "Generator: MSVC.NET: Initializing variables" ); | 400 | debug_msg(1, "Generator: MSVC.NET: Initializing variables" ); |
316 | 401 | ||
317 | /* | 402 | /* |
318 | // Once to be nice and clean code... | 403 | // Once to be nice and clean code... |
319 | // Wouldn't life be great? | 404 | // Wouldn't life be great? |
320 | 405 | ||
321 | // Are we building Qt? | 406 | // Are we building Qt? |
322 | bool is_qt = | 407 | bool is_qt = |
323 | ( project->first("TARGET") == "qt"QTDLL_POSTFIX || | 408 | ( project->first("TARGET") == "qt"QTDLL_POSTFIX || |
324 | project->first("TARGET") == "qt-mt"QTDLL_POSTFIX ); | 409 | project->first("TARGET") == "qt-mt"QTDLL_POSTFIX ); |
325 | 410 | ||
326 | // Are we using Qt? | 411 | // Are we using Qt? |
327 | bool isQtActive = project->isActiveConfig("qt"); | 412 | bool isQtActive = project->isActiveConfig("qt"); |
328 | 413 | ||
329 | if ( isQtActive ) { | 414 | if ( isQtActive ) { |
330 | project->variables()["CONFIG"] += "moc"; | 415 | project->variables()["CONFIG"] += "moc"; |
331 | project->variables()["CONFIG"] += "windows"; | 416 | project->variables()["CONFIG"] += "windows"; |
332 | project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"]; | 417 | project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"]; |
333 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"]; | 418 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"]; |
334 | 419 | ||
335 | if( projectTarget == SharedLib ) | 420 | if( projectTarget == SharedLib ) |
336 | project->variables()["DEFINES"] += "QT_DLL"; | 421 | project->variables()["DEFINES"] += "QT_DLL"; |
337 | 422 | ||
338 | if( project->isActiveConfig("accessibility" ) ) | 423 | if( project->isActiveConfig("accessibility" ) ) |
339 | project->variables()["DEFINES"] += "QT_ACCESSIBILITY_SUPPORT"; | 424 | project->variables()["DEFINES"] += "QT_ACCESSIBILITY_SUPPORT"; |
340 | 425 | ||
341 | if ( project->isActiveConfig("plugin")) { | 426 | if ( project->isActiveConfig("plugin")) { |
342 | project->variables()["DEFINES"] += "QT_PLUGIN"; | 427 | project->variables()["DEFINES"] += "QT_PLUGIN"; |
343 | project->variables()["CONFIG"] += "dll"; | 428 | project->variables()["CONFIG"] += "dll"; |
344 | } | 429 | } |
345 | 430 | ||
346 | if( project->isActiveConfig("thread") ) { | 431 | if( project->isActiveConfig("thread") ) { |
347 | project->variables()["DEFINES"] += "QT_THREAD_SUPPORT"; | 432 | project->variables()["DEFINES"] += "QT_THREAD_SUPPORT"; |
348 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; | 433 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; |
349 | } else { | 434 | } else { |
350 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; | 435 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; |
351 | } | 436 | } |
352 | } | 437 | } |
353 | 438 | ||
354 | if ( project->isActiveConfig("opengl") ) { | 439 | if ( project->isActiveConfig("opengl") ) { |
355 | project->variables()["CONFIG"] += "windows"; // <-- Also in 'qt' above | 440 | project->variables()["CONFIG"] += "windows"; // <-- Also in 'qt' above |
356 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"]; | 441 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"]; |
357 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"]; | 442 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"]; |
358 | 443 | ||
359 | } | 444 | } |
360 | */ | 445 | */ |
361 | initOld(); // Currently calling old DSP code to set variables. CLEAN UP! | 446 | initOld(); // Currently calling old DSP code to set variables. CLEAN UP! |
362 | 447 | ||
363 | // Figure out what we're trying to build | 448 | // Figure out what we're trying to build |
364 | if ( project->first("TEMPLATE") == "vcapp" ) { | 449 | if ( project->first("TEMPLATE") == "vcapp" ) { |
365 | projectTarget = Application; | 450 | projectTarget = Application; |
366 | } else if ( project->first("TEMPLATE") == "vclib") { | 451 | } else if ( project->first("TEMPLATE") == "vclib") { |
367 | if ( project->isActiveConfig( "staticlib" ) ) | 452 | if ( project->isActiveConfig( "staticlib" ) ) |
368 | projectTarget = StaticLib; | 453 | projectTarget = StaticLib; |
369 | else | 454 | else |
370 | projectTarget = SharedLib; | 455 | projectTarget = SharedLib; |
371 | } | 456 | } |
457 | |||
458 | // Setup PCH variables | ||
459 | precompH = project->first("PRECOMPILED_HEADER"); | ||
460 | usePCH = !precompH.isEmpty() && project->isActiveConfig("precompile_header"); | ||
461 | if (usePCH) { | ||
462 | precompHFilename = QFileInfo(precompH).fileName(); | ||
463 | // Created files | ||
464 | QString origTarget = project->first("QMAKE_ORIG_TARGET"); | ||
465 | precompObj = origTarget + Option::obj_ext; | ||
466 | precompPch = origTarget + ".pch"; | ||
467 | // Add PRECOMPILED_HEADER to HEADERS | ||
468 | if (!project->variables()["HEADERS"].contains(precompH)) | ||
469 | project->variables()["HEADERS"] += precompH; | ||
470 | // Return to variable pool | ||
471 | project->variables()["PRECOMPILED_OBJECT"] = precompObj; | ||
472 | project->variables()["PRECOMPILED_PCH"] = precompPch; | ||
473 | } | ||
474 | |||
372 | initProject(); // Fills the whole project with proper data | 475 | initProject(); // Fills the whole project with proper data |
373 | } | 476 | } |
374 | 477 | ||
375 | void VcprojGenerator::initProject() | 478 | void VcprojGenerator::initProject() |
376 | { | 479 | { |
377 | // Initialize XML sub elements | 480 | // Initialize XML sub elements |
378 | // - Do this first since project elements may need | 481 | // - Do this first since project elements may need |
379 | // - to know of certain configuration options | 482 | // - to know of certain configuration options |
380 | initConfiguration(); | 483 | initConfiguration(); |
381 | initSourceFiles(); | 484 | initSourceFiles(); |
382 | initHeaderFiles(); | 485 | initHeaderFiles(); |
383 | initMOCFiles(); | 486 | initMOCFiles(); |
384 | initUICFiles(); | 487 | initUICFiles(); |
385 | initFormsFiles(); | 488 | initFormsFiles(); |
386 | initTranslationFiles(); | 489 | initTranslationFiles(); |
387 | initLexYaccFiles(); | 490 | initLexYaccFiles(); |
388 | initResourceFiles(); | 491 | initResourceFiles(); |
389 | 492 | ||
390 | // Own elements ----------------------------- | 493 | // Own elements ----------------------------- |
391 | vcProject.Name = project->first("QMAKE_ORIG_TARGET"); | 494 | vcProject.Name = project->first("QMAKE_ORIG_TARGET"); |
392 | vcProject.Version = "7.00"; | 495 | vcProject.Version = use_net2003_version() ? "7.10" : "7.00"; |
393 | vcProject.PlatformName = ( vcProject.Configuration.idl.TargetEnvironment == midlTargetWin64 ? "Win64" : "Win32" ); | 496 | vcProject.ProjectGUID = getProjectUUID().toString().upper(); |
497 | vcProject.PlatformName = ( vcProject.Configuration[0].idl.TargetEnvironment == midlTargetWin64 ? "Win64" : "Win32" ); | ||
394 | // These are not used by Qt, but may be used by customers | 498 | // These are not used by Qt, but may be used by customers |
395 | vcProject.SccProjectName = project->first("SCCPROJECTNAME"); | 499 | vcProject.SccProjectName = project->first("SCCPROJECTNAME"); |
396 | vcProject.SccLocalPath = project->first("SCCLOCALPATH"); | 500 | vcProject.SccLocalPath = project->first("SCCLOCALPATH"); |
397 | } | 501 | } |
398 | 502 | ||
399 | void VcprojGenerator::initConfiguration() | 503 | void VcprojGenerator::initConfiguration() |
400 | { | 504 | { |
401 | // Initialize XML sub elements | 505 | // Initialize XML sub elements |
402 | // - Do this first since main configuration elements may need | 506 | // - Do this first since main configuration elements may need |
403 | // - to know of certain compiler/linker options | 507 | // - to know of certain compiler/linker options |
404 | initCompilerTool(); | 508 | initCompilerTool(); |
405 | if ( projectTarget == StaticLib ) | 509 | if ( projectTarget == StaticLib ) |
406 | initLibrarianTool(); | 510 | initLibrarianTool(); |
407 | else | 511 | else |
408 | initLinkerTool(); | 512 | initLinkerTool(); |
409 | initIDLTool(); | 513 | initIDLTool(); |
410 | 514 | ||
411 | // Own elements ----------------------------- | 515 | // Own elements ----------------------------- |
412 | QString temp = project->first("BuildBrowserInformation"); | 516 | QString temp = project->first("BuildBrowserInformation"); |
413 | switch ( projectTarget ) { | 517 | switch ( projectTarget ) { |
414 | case SharedLib: | 518 | case SharedLib: |
415 | vcProject.Configuration.ConfigurationType = typeDynamicLibrary; | 519 | vcProject.Configuration[0].ConfigurationType = typeDynamicLibrary; |
416 | break; | 520 | break; |
417 | case StaticLib: | 521 | case StaticLib: |
418 | vcProject.Configuration.ConfigurationType = typeStaticLibrary; | 522 | vcProject.Configuration[0].ConfigurationType = typeStaticLibrary; |
419 | break; | 523 | break; |
420 | case Application: | 524 | case Application: |
421 | default: | 525 | default: |
422 | vcProject.Configuration.ConfigurationType = typeApplication; | 526 | vcProject.Configuration[0].ConfigurationType = typeApplication; |
423 | break; | 527 | break; |
424 | } | 528 | } |
425 | vcProject.Configuration.Name = ( project->isActiveConfig( "debug" ) ? "Debug|" : "Release|" ); | 529 | |
426 | vcProject.Configuration.Name += ( vcProject.Configuration.idl.TargetEnvironment == midlTargetWin64 ? "Win64" : "Win32" ); | 530 | // Release version of the Configuration --------------- |
427 | vcProject.Configuration.ATLMinimizesCRunTimeLibraryUsage = ( project->first("ATLMinimizesCRunTimeLibraryUsage").isEmpty() ? _False : _True ); | 531 | VCConfiguration &RConf = vcProject.Configuration[0]; |
428 | vcProject.Configuration.BuildBrowserInformation = triState( temp.isEmpty() ? (short)unset : temp.toShort() ); | 532 | RConf.Name = "Release"; |
533 | RConf.Name += ( RConf.idl.TargetEnvironment == midlTargetWin64 ? "|Win64" : "|Win32" ); | ||
534 | RConf.ATLMinimizesCRunTimeLibraryUsage = ( project->first("ATLMinimizesCRunTimeLibraryUsage").isEmpty() ? _False : _True ); | ||
535 | RConf.BuildBrowserInformation = triState( temp.isEmpty() ? (short)unset : temp.toShort() ); | ||
429 | temp = project->first("CharacterSet"); | 536 | temp = project->first("CharacterSet"); |
430 | vcProject.Configuration.CharacterSet = charSet( temp.isEmpty() ? (short)charSetNotSet : temp.toShort() ); | 537 | RConf.CharacterSet = charSet( temp.isEmpty() ? (short)charSetNotSet : temp.toShort() ); |
431 | vcProject.Configuration.DeleteExtensionsOnClean = project->first("DeleteExtensionsOnClean"); | 538 | RConf.DeleteExtensionsOnClean = project->first("DeleteExtensionsOnClean"); |
432 | vcProject.Configuration.ImportLibrary = vcProject.Configuration.linker.ImportLibrary; | 539 | RConf.ImportLibrary = RConf.linker.ImportLibrary; |
433 | vcProject.Configuration.IntermediateDirectory = project->first("OBJECTS_DIR"); | 540 | RConf.IntermediateDirectory = project->first("OBJECTS_DIR"); |
434 | // temp = (projectTarget == StaticLib) ? project->first("DESTDIR"):project->first("DLLDESTDIR"); | 541 | RConf.OutputDirectory = "."; |
435 | vcProject.Configuration.OutputDirectory = "."; //( temp.isEmpty() ? QString(".") : temp ); | 542 | RConf.PrimaryOutput = project->first("PrimaryOutput"); |
436 | vcProject.Configuration.PrimaryOutput = project->first("PrimaryOutput"); | 543 | RConf.WholeProgramOptimization = RConf.compiler.WholeProgramOptimization; |
437 | vcProject.Configuration.WholeProgramOptimization = vcProject.Configuration.compiler.WholeProgramOptimization; | ||
438 | temp = project->first("UseOfATL"); | 544 | temp = project->first("UseOfATL"); |
439 | if ( !temp.isEmpty() ) | 545 | if ( !temp.isEmpty() ) |
440 | vcProject.Configuration.UseOfATL = useOfATL( temp.toShort() ); | 546 | RConf.UseOfATL = useOfATL( temp.toShort() ); |
441 | temp = project->first("UseOfMfc"); | 547 | temp = project->first("UseOfMfc"); |
442 | if ( !temp.isEmpty() ) | 548 | if ( !temp.isEmpty() ) |
443 | vcProject.Configuration.UseOfMfc = useOfMfc( temp.toShort() ); | 549 | RConf.UseOfMfc = useOfMfc( temp.toShort() ); |
444 | 550 | ||
445 | // Configuration does not need parameters from | 551 | // Configuration does not need parameters from |
446 | // these sub XML items; | 552 | // these sub XML items; |
447 | initCustomBuildTool(); | 553 | initCustomBuildTool(); |
448 | initPreBuildEventTools(); | 554 | initPreBuildEventTools(); |
449 | initPostBuildEventTools(); | 555 | initPostBuildEventTools(); |
450 | initPreLinkEventTools(); | 556 | initPreLinkEventTools(); |
557 | |||
558 | // Debug version of the Configuration ----------------- | ||
559 | VCConfiguration DConf = vcProject.Configuration[0]; // Create copy configuration for debug | ||
560 | DConf.Name = "Debug"; | ||
561 | DConf.Name += ( DConf.idl.TargetEnvironment == midlTargetWin64 ? "|Win64" : "|Win32" ); | ||
562 | |||
563 | // Set definite values in both configurations | ||
564 | DConf.compiler.PreprocessorDefinitions.remove("NDEBUG"); | ||
565 | RConf.compiler.PreprocessorDefinitions += "NDEBUG"; | ||
566 | RConf.linker.GenerateDebugInformation = _False; | ||
567 | DConf.linker.GenerateDebugInformation = _True; | ||
568 | |||
569 | // Modify configurations, based on Qt build | ||
570 | if ( project->isActiveConfig("debug") ) { | ||
571 | RConf.IntermediateDirectory = | ||
572 | RConf.compiler.AssemblerListingLocation = | ||
573 | RConf.compiler.ObjectFile = "Release\\"; | ||
574 | RConf.librarian.OutputFile = | ||
575 | RConf.linker.OutputFile = RConf.IntermediateDirectory + "\\" + project->first("MSVCPROJ_TARGET"); | ||
576 | RConf.linker.parseOptions(project->variables()["QMAKE_LFLAGS_RELEASE"]); | ||
577 | RConf.compiler.parseOptions(project->variables()["QMAKE_CFLAGS_RELEASE"]); | ||
578 | } else { | ||
579 | DConf.IntermediateDirectory = | ||
580 | DConf.compiler.AssemblerListingLocation = | ||
581 | DConf.compiler.ObjectFile = "Debug\\"; | ||
582 | DConf.librarian.OutputFile = | ||
583 | DConf.linker.OutputFile = DConf.IntermediateDirectory + "\\" + project->first("MSVCPROJ_TARGET"); | ||
584 | DConf.linker.DelayLoadDLLs.clear(); | ||
585 | DConf.compiler.parseOptions(project->variables()["QMAKE_CFLAGS_DEBUG"]); | ||
586 | } | ||
587 | |||
588 | // Add Debug configuration to project | ||
589 | vcProject.Configuration += DConf; | ||
451 | } | 590 | } |
452 | 591 | ||
453 | void VcprojGenerator::initCompilerTool() | 592 | void VcprojGenerator::initCompilerTool() |
454 | { | 593 | { |
455 | QString placement = project->first("OBJECTS_DIR"); | 594 | QString placement = project->first("OBJECTS_DIR"); |
456 | if ( placement.isEmpty() ) | 595 | if ( placement.isEmpty() ) |
457 | placement = ".\\"; | 596 | placement = ".\\"; |
458 | 597 | ||
459 | vcProject.Configuration.compiler.AssemblerListingLocation = placement ; | 598 | VCConfiguration &RConf = vcProject.Configuration[0]; |
460 | vcProject.Configuration.compiler.ProgramDataBaseFileName = placement ; | 599 | RConf.compiler.AssemblerListingLocation = placement ; |
461 | vcProject.Configuration.compiler.ObjectFile = placement ; | 600 | RConf.compiler.ProgramDataBaseFileName = ".\\" ; |
462 | vcProject.Configuration.compiler.PrecompiledHeaderFile = placement + project->first("QMAKE_ORIG_TARGET") + ".pch"; | 601 | RConf.compiler.ObjectFile = placement ; |
602 | // PCH | ||
603 | if ( usePCH ) { | ||
604 | RConf.compiler.UsePrecompiledHeader = pchUseUsingSpecific; | ||
605 | RConf.compiler.PrecompiledHeaderFile = "$(IntDir)\\" + precompPch; | ||
606 | RConf.compiler.PrecompiledHeaderThrough = precompHFilename; | ||
607 | RConf.compiler.ForcedIncludeFiles = precompHFilename; | ||
608 | // Minimal build option triggers an Internal Compiler Error | ||
609 | // when used in conjunction with /FI and /Yu, so remove it | ||
610 | project->variables()["QMAKE_CFLAGS_DEBUG"].remove("-Gm"); | ||
611 | project->variables()["QMAKE_CFLAGS_DEBUG"].remove("/Gm"); | ||
612 | project->variables()["QMAKE_CXXFLAGS_DEBUG"].remove("-Gm"); | ||
613 | project->variables()["QMAKE_CXXFLAGS_DEBUG"].remove("/Gm"); | ||
614 | } | ||
463 | 615 | ||
464 | if ( project->isActiveConfig("debug") ){ | 616 | if ( project->isActiveConfig("debug") ){ |
465 | // Debug version | 617 | // Debug version |
466 | vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS"] ); | 618 | RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS"] ); |
467 | vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_DEBUG"] ); | 619 | RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_DEBUG"] ); |
468 | if ( project->isActiveConfig("thread") ) { | 620 | if ( project->isActiveConfig("thread") ) { |
469 | if ( (projectTarget == Application) || (projectTarget == StaticLib) ) | 621 | if ( (projectTarget == Application) || (projectTarget == StaticLib) ) |
470 | vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT_DBG"] ); | 622 | RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT_DBG"] ); |
471 | else | 623 | else |
472 | vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"] ); | 624 | RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"] ); |
473 | } else { | 625 | } else { |
474 | vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_ST_DBG"] ); | 626 | RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT_DBG"] ); |
475 | } | 627 | } |
476 | } else { | 628 | } else { |
477 | // Release version | 629 | // Release version |
478 | vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS"] ); | 630 | RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS"] ); |
479 | vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_RELEASE"] ); | 631 | RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_RELEASE"] ); |
480 | vcProject.Configuration.compiler.PreprocessorDefinitions += "QT_NO_DEBUG"; | 632 | RConf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG"; |
481 | vcProject.Configuration.compiler.PreprocessorDefinitions += "NDEBUG"; | 633 | RConf.compiler.PreprocessorDefinitions += "NDEBUG"; |
482 | if ( project->isActiveConfig("thread") ) { | 634 | if ( project->isActiveConfig("thread") ) { |
483 | if ( (projectTarget == Application) || (projectTarget == StaticLib) ) | 635 | if ( (projectTarget == Application) || (projectTarget == StaticLib) ) |
484 | vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT"] ); | 636 | RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT"] ); |
485 | else | 637 | else |
486 | vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT_DLL"] ); | 638 | RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT_DLL"] ); |
487 | } else { | 639 | } else { |
488 | vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_ST"] ); | 640 | RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_MT"] ); |
489 | } | 641 | } |
490 | } | 642 | } |
491 | 643 | ||
492 | // Common for both release and debug | 644 | // Common for both release and debug |
493 | if ( project->isActiveConfig("warn_off") ) | 645 | if ( project->isActiveConfig("warn_off") ) |
494 | vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_WARN_OFF"] ); | 646 | RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_WARN_OFF"] ); |
495 | else if ( project->isActiveConfig("warn_on") ) | 647 | else if ( project->isActiveConfig("warn_on") ) |
496 | vcProject.Configuration.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_WARN_ON"] ); | 648 | RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_WARN_ON"] ); |
497 | if ( project->isActiveConfig("windows") ) | 649 | if ( project->isActiveConfig("windows") ) |
498 | vcProject.Configuration.compiler.PreprocessorDefinitions += project->variables()["MSVCPROJ_WINCONDEF"]; | 650 | RConf.compiler.PreprocessorDefinitions += project->variables()["MSVCPROJ_WINCONDEF"]; |
499 | 651 | ||
500 | // Can this be set for ALL configs? | 652 | // Can this be set for ALL configs? |
501 | // If so, use qmake.conf! | 653 | // If so, use qmake.conf! |
502 | if ( projectTarget == SharedLib ) | 654 | if ( projectTarget == SharedLib ) |
503 | vcProject.Configuration.compiler.PreprocessorDefinitions += "_WINDOWS"; | 655 | RConf.compiler.PreprocessorDefinitions += "_WINDOWS"; |
504 | 656 | ||
505 | vcProject.Configuration.compiler.PreprocessorDefinitions += project->variables()["DEFINES"]; | 657 | RConf.compiler.PreprocessorDefinitions += project->variables()["DEFINES"]; |
506 | vcProject.Configuration.compiler.PreprocessorDefinitions += project->variables()["PRL_EXPORT_DEFINES"]; | 658 | RConf.compiler.PreprocessorDefinitions += project->variables()["PRL_EXPORT_DEFINES"]; |
507 | vcProject.Configuration.compiler.parseOptions( project->variables()["MSVCPROJ_INCPATH"] ); | 659 | QStringList::iterator it; |
660 | for(it=RConf.compiler.PreprocessorDefinitions.begin(); | ||
661 | it!=RConf.compiler.PreprocessorDefinitions.end(); | ||
662 | ++it) | ||
663 | (*it).replace('\"', """); | ||
664 | |||
665 | RConf.compiler.parseOptions( project->variables()["MSVCPROJ_INCPATH"] ); | ||
508 | } | 666 | } |
509 | 667 | ||
510 | void VcprojGenerator::initLibrarianTool() | 668 | void VcprojGenerator::initLibrarianTool() |
511 | { | 669 | { |
512 | vcProject.Configuration.librarian.OutputFile = project->first( "DESTDIR" ); | 670 | VCConfiguration &RConf = vcProject.Configuration[0]; |
513 | if( vcProject.Configuration.librarian.OutputFile.isEmpty() ) | 671 | RConf.librarian.OutputFile = project->first( "DESTDIR" ); |
514 | vcProject.Configuration.librarian.OutputFile = ".\\"; | 672 | if( RConf.librarian.OutputFile.isEmpty() ) |
673 | RConf.librarian.OutputFile = ".\\"; | ||
515 | 674 | ||
516 | if( !vcProject.Configuration.librarian.OutputFile.endsWith("\\") ) | 675 | if( !RConf.librarian.OutputFile.endsWith("\\") ) |
517 | vcProject.Configuration.librarian.OutputFile += '\\'; | 676 | RConf.librarian.OutputFile += '\\'; |
518 | 677 | ||
519 | vcProject.Configuration.librarian.OutputFile += project->first("MSVCPROJ_TARGET"); | 678 | RConf.librarian.OutputFile += project->first("MSVCPROJ_TARGET"); |
520 | } | 679 | } |
521 | 680 | ||
522 | void VcprojGenerator::initLinkerTool() | 681 | void VcprojGenerator::initLinkerTool() |
523 | { | 682 | { |
524 | vcProject.Configuration.linker.parseOptions( project->variables()["MSVCPROJ_LFLAGS"] ); | 683 | VCConfiguration &RConf = vcProject.Configuration[0]; |
525 | vcProject.Configuration.linker.AdditionalDependencies += project->variables()["MSVCPROJ_LIBS"]; | 684 | RConf.linker.parseOptions( project->variables()["MSVCPROJ_LFLAGS"] ); |
685 | RConf.linker.AdditionalDependencies += project->variables()["MSVCPROJ_LIBS"]; | ||
526 | 686 | ||
527 | switch ( projectTarget ) { | 687 | switch ( projectTarget ) { |
528 | case Application: | 688 | case Application: |
529 | vcProject.Configuration.linker.OutputFile = project->first( "DESTDIR" ); | 689 | RConf.linker.OutputFile = project->first( "DESTDIR" ); |
530 | break; | 690 | break; |
531 | case SharedLib: | 691 | case SharedLib: |
532 | vcProject.Configuration.linker.parseOptions( project->variables()["MSVCPROJ_LIBOPTIONS"] ); | 692 | RConf.linker.parseOptions( project->variables()["MSVCPROJ_LIBOPTIONS"] ); |
533 | vcProject.Configuration.linker.OutputFile = project->first( "DLLDESTDIR" ); | 693 | RConf.linker.OutputFile = project->first( "DESTDIR" ); |
534 | break; | 694 | break; |
535 | case StaticLib: //unhandled - added to remove warnings.. | 695 | case StaticLib: //unhandled - added to remove warnings.. |
536 | break; | 696 | break; |
537 | } | 697 | } |
538 | 698 | ||
539 | if( vcProject.Configuration.linker.OutputFile.isEmpty() ) | 699 | if( RConf.linker.OutputFile.isEmpty() ) |
540 | vcProject.Configuration.linker.OutputFile = ".\\"; | 700 | RConf.linker.OutputFile = ".\\"; |
541 | 701 | ||
542 | if( !vcProject.Configuration.linker.OutputFile.endsWith("\\") ) | 702 | if( !RConf.linker.OutputFile.endsWith("\\") ) |
543 | vcProject.Configuration.linker.OutputFile += '\\'; | 703 | RConf.linker.OutputFile += '\\'; |
544 | 704 | ||
545 | vcProject.Configuration.linker.OutputFile += project->first("MSVCPROJ_TARGET"); | 705 | RConf.linker.OutputFile += project->first("MSVCPROJ_TARGET"); |
546 | vcProject.Configuration.linker.ProgramDatabaseFile = project->first("OBJECTS_DIR") + project->first("QMAKE_ORIG_TARGET") + ".pdb"; | ||
547 | 706 | ||
548 | if ( project->isActiveConfig("debug") ){ | 707 | if ( project->isActiveConfig("debug") ){ |
549 | vcProject.Configuration.linker.parseOptions( project->variables()["QMAKE_LFLAGS_DEBUG"] ); | 708 | RConf.linker.parseOptions( project->variables()["QMAKE_LFLAGS_DEBUG"] ); |
550 | } else { | 709 | } else { |
551 | vcProject.Configuration.linker.parseOptions( project->variables()["QMAKE_LFLAGS_RELEASE"] ); | 710 | RConf.linker.parseOptions( project->variables()["QMAKE_LFLAGS_RELEASE"] ); |
552 | } | 711 | } |
553 | 712 | ||
554 | if ( project->isActiveConfig("dll") ){ | 713 | if ( project->isActiveConfig("dll") ){ |
555 | vcProject.Configuration.linker.parseOptions( project->variables()["QMAKE_LFLAGS_QT_DLL"] ); | 714 | RConf.linker.parseOptions( project->variables()["QMAKE_LFLAGS_QT_DLL"] ); |
556 | } | 715 | } |
557 | 716 | ||
558 | if ( project->isActiveConfig("console") ){ | 717 | if ( project->isActiveConfig("console") ){ |
559 | vcProject.Configuration.linker.parseOptions( project->variables()["QMAKE_LFLAGS_CONSOLE"] ); | 718 | RConf.linker.parseOptions( project->variables()["QMAKE_LFLAGS_CONSOLE"] ); |
560 | } else { | 719 | } else { |
561 | vcProject.Configuration.linker.parseOptions( project->variables()["QMAKE_LFLAGS_WINDOWS"] ); | 720 | RConf.linker.parseOptions( project->variables()["QMAKE_LFLAGS_WINDOWS"] ); |
562 | } | 721 | } |
563 | 722 | ||
564 | } | 723 | } |
565 | 724 | ||
566 | void VcprojGenerator::initIDLTool() | 725 | void VcprojGenerator::initIDLTool() |
567 | { | 726 | { |
568 | } | 727 | } |
569 | 728 | ||
570 | void VcprojGenerator::initCustomBuildTool() | 729 | void VcprojGenerator::initCustomBuildTool() |
571 | { | 730 | { |
572 | } | 731 | } |
573 | 732 | ||
574 | void VcprojGenerator::initPreBuildEventTools() | 733 | void VcprojGenerator::initPreBuildEventTools() |
575 | { | 734 | { |
576 | QString collectionName = project->first("QMAKE_IMAGE_COLLECTION"); | ||
577 | if( !collectionName.isEmpty() ) { | ||
578 | QStringList& list = project->variables()["IMAGES"]; | ||
579 | vcProject.Configuration.preBuild.Description = "Generate imagecollection"; | ||
580 | //vcProject.Configuration.preBuild.AdditionalDependencies += list; | ||
581 | |||
582 | QFile imgs( ".imgcol" ); | ||
583 | imgs.open( IO_WriteOnly ); | ||
584 | QTextStream s( &imgs ); | ||
585 | QStringList::ConstIterator it = list.begin(); | ||
586 | while( it!=list.end() ) { | ||
587 | s << *it << " "; | ||
588 | it++; | ||
589 | } | ||
590 | |||
591 | vcProject.Configuration.preBuild.CommandLine = project->first("QMAKE_UIC") + " -embed " + project->first("QMAKE_ORIG_TARGET") + " -f .imgcol -o " + collectionName; | ||
592 | //vcProject.Configuration.preBuild.Outputs = collectionName; | ||
593 | |||
594 | } | ||
595 | } | 735 | } |
596 | 736 | ||
597 | void VcprojGenerator::initPostBuildEventTools() | 737 | void VcprojGenerator::initPostBuildEventTools() |
598 | { | 738 | { |
739 | VCConfiguration &RConf = vcProject.Configuration[0]; | ||
599 | if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() ) { | 740 | if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() ) { |
600 | vcProject.Configuration.postBuild.Description = var("QMAKE_POST_LINK"); | 741 | RConf.postBuild.Description = var("QMAKE_POST_LINK"); |
601 | vcProject.Configuration.postBuild.CommandLine = var("QMAKE_POST_LINK"); | 742 | RConf.postBuild.CommandLine = var("QMAKE_POST_LINK"); |
743 | RConf.postBuild.Description.replace(" && ", " && "); | ||
744 | RConf.postBuild.CommandLine.replace(" && ", " && "); | ||
745 | } | ||
746 | if ( !project->variables()["MSVCPROJ_COPY_DLL"].isEmpty() ) { | ||
747 | if ( !RConf.postBuild.CommandLine.isEmpty() ) | ||
748 | RConf.postBuild.CommandLine += " && "; | ||
749 | RConf.postBuild.Description += var("MSVCPROJ_COPY_DLL_DESC"); | ||
750 | RConf.postBuild.CommandLine += var("MSVCPROJ_COPY_DLL"); | ||
602 | } | 751 | } |
603 | if( project->isActiveConfig( "activeqt" ) ) { | 752 | if( project->isActiveConfig( "activeqt" ) ) { |
604 | QString name = project->first( "QMAKE_ORIG_TARGET" ); | 753 | QString name = project->first( "QMAKE_ORIG_TARGET" ); |
605 | QString nameext = project->first( "TARGET" ); | 754 | QString nameext = project->first( "TARGET" ); |
606 | QString objdir = project->first( "OBJECTS_DIR" ); | 755 | QString objdir = project->first( "OBJECTS_DIR" ); |
607 | QString idc = project->first( "QMAKE_IDC" ); | 756 | QString idc = project->first( "QMAKE_IDC" ); |
608 | 757 | ||
609 | vcProject.Configuration.postBuild.Description = "Finalizing ActiveQt server..."; | 758 | RConf.postBuild.Description = "Finalizing ActiveQt server..."; |
610 | if ( !vcProject.Configuration.postBuild.CommandLine.isEmpty() ) | 759 | if ( !RConf.postBuild.CommandLine.isEmpty() ) |
611 | vcProject.Configuration.postBuild.CommandLine += " && "; | 760 | RConf.postBuild.CommandLine += " && "; |
612 | 761 | ||
613 | if( project->isActiveConfig( "dll" ) ) { // In process | 762 | if( project->isActiveConfig( "dll" ) ) { // In process |
614 | vcProject.Configuration.postBuild.CommandLine += | 763 | RConf.postBuild.CommandLine += |
615 | // call idc to generate .idl file from .dll | 764 | // call idc to generate .idl file from .dll |
616 | idc + " " + vcProject.Configuration.OutputDirectory + "\\" + nameext + " -idl " + objdir + name + ".idl -version 1.0 && " + | 765 | idc + " "$(TargetPath)" -idl " + objdir + name + ".idl -version 1.0 && " + |
617 | // call midl to create implementations of the .idl file | 766 | // call midl to create implementations of the .idl file |
618 | project->first( "QMAKE_IDL" ) + " " + objdir + name + ".idl /nologo /o " + objdir + name + ".midl /tlb " + objdir + name + ".tlb /iid " + objdir + | 767 | project->first( "QMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb && " + |
619 | "dump.midl /dlldata " + objdir + "dump.midl /cstub " + objdir + "dump.midl /header " + objdir + "dump.midl /proxy " + objdir + "dump.midl /sstub " + | ||
620 | objdir + "dump.midl && " + | ||
621 | // call idc to replace tlb... | 768 | // call idc to replace tlb... |
622 | idc + " " + vcProject.Configuration.OutputDirectory + "\\" + nameext + " /tlb " + objdir + name + ".tlb && " + | 769 | idc + " "$(TargetPath)" /tlb " + objdir + name + ".tlb && " + |
623 | // register server | 770 | // register server |
624 | idc + " " + vcProject.Configuration.OutputDirectory + "\\" + nameext + " /regserver"; | 771 | idc + " "$(TargetPath)" /regserver"; |
625 | } else { // out of process | 772 | } else { // out of process |
626 | vcProject.Configuration.postBuild.CommandLine = | 773 | RConf.postBuild.CommandLine = |
627 | // call application to dump idl | 774 | // call application to dump idl |
628 | vcProject.Configuration.OutputDirectory + "\\" + nameext + " -dumpidl " + objdir + name + ".idl -version 1.0 && " + | 775 | ""$(TargetPath)" -dumpidl " + objdir + name + ".idl -version 1.0 && " + |
629 | // call midl to create implementations of the .idl file | 776 | // call midl to create implementations of the .idl file |
630 | project->first( "QMAKE_IDL" ) + " " + objdir + name + ".idl /nologo /o " + objdir + name + ".midl /tlb " + objdir + name + ".tlb /iid " + objdir + | 777 | project->first( "QMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb && " + |
631 | "dump.midl /dlldata " + objdir + "dump.midl /cstub " + objdir + "dump.midl /header " + objdir + "dump.midl /proxy " + objdir + "dump.midl /sstub " + | ||
632 | objdir + "dump.midl && " + | ||
633 | // call idc to replace tlb... | 778 | // call idc to replace tlb... |
634 | idc + " " + vcProject.Configuration.OutputDirectory + "\\" + nameext + " /tlb " + objdir + name + ".tlb && " + | 779 | idc + " "$(TargetPath)" /tlb " + objdir + name + ".tlb && " + |
635 | // call app to register | 780 | // call app to register |
636 | vcProject.Configuration.OutputDirectory + "\\" + nameext + " -regserver"; | 781 | ""$(TargetPath)" -regserver"; |
637 | } | 782 | } |
638 | } | 783 | } |
639 | } | 784 | } |
640 | 785 | ||
641 | void VcprojGenerator::initPreLinkEventTools() | 786 | void VcprojGenerator::initPreLinkEventTools() |
642 | { | 787 | { |
643 | } | 788 | } |
644 | 789 | ||
790 | |||
791 | // ------------------------------------------------------------------ | ||
792 | // Helper functions to do proper sorting of the | ||
793 | // qstringlists, for both flat and non-flat modes. | ||
794 | inline bool XLessThanY( QString &x, QString &y, bool flat_mode ) | ||
795 | { | ||
796 | if ( flat_mode ) { | ||
797 | QString subX = x.mid( x.findRev('\\')+1 ); | ||
798 | QString subY = y.mid( y.findRev('\\')+1 ); | ||
799 | return QString::compare(subX, subY) < 0; | ||
800 | } | ||
801 | |||
802 | int xPos = 0; | ||
803 | int yPos = 0; | ||
804 | int xSlashPos; | ||
805 | int ySlashPos; | ||
806 | for (;;) { | ||
807 | xSlashPos = x.find('\\', xPos); | ||
808 | ySlashPos = y.find('\\', yPos); | ||
809 | |||
810 | if (xSlashPos == -1 && ySlashPos != -1) { | ||
811 | return false; | ||
812 | } else if (xSlashPos != -1 && ySlashPos == -1) { | ||
813 | return true; | ||
814 | } else if (xSlashPos == -1 /* && yySlashPos == -1 */) { | ||
815 | QString subX = x.mid(xPos); | ||
816 | QString subY = y.mid(yPos); | ||
817 | return QString::compare(subX, subY) < 0; | ||
818 | } else { | ||
819 | QString subX = x.mid(xPos, xSlashPos - xPos); | ||
820 | QString subY = y.mid(yPos, ySlashPos - yPos); | ||
821 | int cmp = QString::compare(subX, subY); | ||
822 | if (cmp != 0) | ||
823 | return cmp < 0; | ||
824 | } | ||
825 | xPos = xSlashPos + 1; | ||
826 | yPos = ySlashPos + 1; | ||
827 | } | ||
828 | return false; | ||
829 | } | ||
830 | void nonflatDir_BubbleSort( QStringList& list, bool flat_mode ) | ||
831 | { | ||
832 | QStringList::Iterator b = list.begin(); | ||
833 | QStringList::Iterator e = list.end(); | ||
834 | QStringList::Iterator last = e; | ||
835 | --last; // goto last | ||
836 | if ( last == b )// shortcut | ||
837 | return; | ||
838 | while( b != last ) {// sort them | ||
839 | bool swapped = FALSE; | ||
840 | QStringList::Iterator swap_pos = b; | ||
841 | QStringList::Iterator x = e; | ||
842 | QStringList::Iterator y = x; | ||
843 | --y; | ||
844 | QString swap_str; | ||
845 | do { | ||
846 | --x; | ||
847 | --y; | ||
848 | if ( XLessThanY(*x,*y, flat_mode) ) { | ||
849 | swapped = TRUE; | ||
850 | swap_str = (*x); // Swap ------- | ||
851 | (*x) = (*y); | ||
852 | (*y) = swap_str; // ------------ | ||
853 | swap_pos = y; | ||
854 | } | ||
855 | } while( y != b ); | ||
856 | if ( !swapped ) | ||
857 | return; | ||
858 | b = swap_pos; | ||
859 | ++b; | ||
860 | } | ||
861 | } | ||
862 | // ------------------------------------------------------------------ | ||
863 | |||
645 | void VcprojGenerator::initSourceFiles() | 864 | void VcprojGenerator::initSourceFiles() |
646 | { | 865 | { |
866 | vcProject.SourceFiles.flat_files = project->isActiveConfig("flat"); | ||
647 | vcProject.SourceFiles.Name = "Source Files"; | 867 | vcProject.SourceFiles.Name = "Source Files"; |
648 | vcProject.SourceFiles.Filter = "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"; | 868 | vcProject.SourceFiles.Filter = "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"; |
649 | vcProject.SourceFiles.Files += project->variables()["SOURCES"]; | 869 | vcProject.SourceFiles.Files += project->variables()["SOURCES"]; |
650 | vcProject.SourceFiles.Files.sort(); | 870 | nonflatDir_BubbleSort( vcProject.SourceFiles.Files, |
871 | vcProject.SourceFiles.flat_files ); | ||
651 | vcProject.SourceFiles.Project = this; | 872 | vcProject.SourceFiles.Project = this; |
652 | vcProject.SourceFiles.Config = &(vcProject.Configuration); | 873 | vcProject.SourceFiles.Config = &(vcProject.Configuration); |
653 | vcProject.SourceFiles.CustomBuild = none; | 874 | vcProject.SourceFiles.CustomBuild = none; |
654 | } | 875 | } |
655 | 876 | ||
656 | void VcprojGenerator::initHeaderFiles() | 877 | void VcprojGenerator::initHeaderFiles() |
657 | { | 878 | { |
879 | vcProject.HeaderFiles.flat_files = project->isActiveConfig("flat"); | ||
658 | vcProject.HeaderFiles.Name = "Header Files"; | 880 | vcProject.HeaderFiles.Name = "Header Files"; |
659 | vcProject.HeaderFiles.Filter = "h;hpp;hxx;hm;inl"; | 881 | vcProject.HeaderFiles.Filter = "h;hpp;hxx;hm;inl"; |
660 | vcProject.HeaderFiles.Files += project->variables()["HEADERS"]; | 882 | vcProject.HeaderFiles.Files += project->variables()["HEADERS"]; |
661 | vcProject.HeaderFiles.Files.sort(); | 883 | if (usePCH) { // Generated PCH cpp file |
884 | if (!vcProject.HeaderFiles.Files.contains(precompH)) | ||
885 | vcProject.HeaderFiles.Files += precompH; | ||
886 | } | ||
887 | nonflatDir_BubbleSort( vcProject.HeaderFiles.Files, | ||
888 | vcProject.HeaderFiles.flat_files ); | ||
662 | vcProject.HeaderFiles.Project = this; | 889 | vcProject.HeaderFiles.Project = this; |
663 | vcProject.HeaderFiles.Config = &(vcProject.Configuration); | 890 | vcProject.HeaderFiles.Config = &(vcProject.Configuration); |
664 | vcProject.HeaderFiles.CustomBuild = moc; | 891 | vcProject.HeaderFiles.CustomBuild = moc; |
665 | } | 892 | } |
666 | 893 | ||
667 | void VcprojGenerator::initMOCFiles() | 894 | void VcprojGenerator::initMOCFiles() |
668 | { | 895 | { |
896 | vcProject.MOCFiles.flat_files = project->isActiveConfig("flat"); | ||
669 | vcProject.MOCFiles.Name = "Generated MOC Files"; | 897 | vcProject.MOCFiles.Name = "Generated MOC Files"; |
670 | vcProject.MOCFiles.Filter = "cpp;c;cxx;moc"; | 898 | vcProject.MOCFiles.Filter = "cpp;c;cxx;moc"; |
671 | vcProject.MOCFiles.Files += project->variables()["SRCMOC"]; | 899 | vcProject.MOCFiles.Files += project->variables()["SRCMOC"]; |
672 | vcProject.MOCFiles.Files.sort(); | 900 | nonflatDir_BubbleSort( vcProject.MOCFiles.Files, |
901 | vcProject.MOCFiles.flat_files ); | ||
673 | vcProject.MOCFiles.Project = this; | 902 | vcProject.MOCFiles.Project = this; |
674 | vcProject.MOCFiles.Config = &(vcProject.Configuration); | 903 | vcProject.MOCFiles.Config = &(vcProject.Configuration); |
675 | vcProject.MOCFiles.CustomBuild = moc; | 904 | vcProject.MOCFiles.CustomBuild = moc; |
676 | } | 905 | } |
677 | 906 | ||
678 | void VcprojGenerator::initUICFiles() | 907 | void VcprojGenerator::initUICFiles() |
679 | { | 908 | { |
680 | vcProject.UICFiles.Name = "Generated UI Files"; | 909 | vcProject.UICFiles.flat_files = project->isActiveConfig("flat"); |
910 | vcProject.UICFiles.Name = "Generated Form Files"; | ||
681 | vcProject.UICFiles.Filter = "cpp;c;cxx;h;hpp;hxx;"; | 911 | vcProject.UICFiles.Filter = "cpp;c;cxx;h;hpp;hxx;"; |
682 | vcProject.UICFiles.Project = this; | 912 | vcProject.UICFiles.Project = this; |
683 | vcProject.UICFiles.Files += project->variables()["UICDECLS"]; | 913 | vcProject.UICFiles.Files += project->variables()["UICDECLS"]; |
684 | vcProject.UICFiles.Files += project->variables()["UICIMPLS"]; | 914 | vcProject.UICFiles.Files += project->variables()["UICIMPLS"]; |
685 | vcProject.UICFiles.Files.sort(); | 915 | nonflatDir_BubbleSort( vcProject.UICFiles.Files, |
916 | vcProject.UICFiles.flat_files ); | ||
686 | vcProject.UICFiles.Config = &(vcProject.Configuration); | 917 | vcProject.UICFiles.Config = &(vcProject.Configuration); |
687 | vcProject.UICFiles.CustomBuild = none; | 918 | vcProject.UICFiles.CustomBuild = none; |
688 | } | 919 | } |
689 | 920 | ||
690 | void VcprojGenerator::initFormsFiles() | 921 | void VcprojGenerator::initFormsFiles() |
691 | { | 922 | { |
923 | vcProject.FormFiles.flat_files = project->isActiveConfig("flat"); | ||
692 | vcProject.FormFiles.Name = "Forms"; | 924 | vcProject.FormFiles.Name = "Forms"; |
693 | vcProject.FormFiles.ParseFiles = _False; | 925 | vcProject.FormFiles.ParseFiles = _False; |
694 | vcProject.FormFiles.Filter = "ui"; | 926 | vcProject.FormFiles.Filter = "ui"; |
695 | vcProject.FormFiles.Files += project->variables()["FORMS"]; | 927 | vcProject.FormFiles.Files += project->variables()["FORMS"]; |
696 | vcProject.FormFiles.Files.sort(); | 928 | nonflatDir_BubbleSort( vcProject.FormFiles.Files, |
929 | vcProject.FormFiles.flat_files ); | ||
697 | vcProject.FormFiles.Project = this; | 930 | vcProject.FormFiles.Project = this; |
698 | vcProject.FormFiles.Config = &(vcProject.Configuration); | 931 | vcProject.FormFiles.Config = &(vcProject.Configuration); |
699 | vcProject.FormFiles.CustomBuild = uic; | 932 | vcProject.FormFiles.CustomBuild = uic; |
700 | } | 933 | } |
701 | 934 | ||
702 | void VcprojGenerator::initTranslationFiles() | 935 | void VcprojGenerator::initTranslationFiles() |
703 | { | 936 | { |
937 | vcProject.TranslationFiles.flat_files = project->isActiveConfig("flat"); | ||
704 | vcProject.TranslationFiles.Name = "Translations Files"; | 938 | vcProject.TranslationFiles.Name = "Translations Files"; |
705 | vcProject.TranslationFiles.ParseFiles = _False; | 939 | vcProject.TranslationFiles.ParseFiles = _False; |
706 | vcProject.TranslationFiles.Filter = "ts"; | 940 | vcProject.TranslationFiles.Filter = "ts"; |
707 | vcProject.TranslationFiles.Files += project->variables()["TRANSLATIONS"]; | 941 | vcProject.TranslationFiles.Files += project->variables()["TRANSLATIONS"]; |
708 | vcProject.TranslationFiles.Files.sort(); | 942 | nonflatDir_BubbleSort( vcProject.TranslationFiles.Files, |
943 | vcProject.TranslationFiles.flat_files ); | ||
709 | vcProject.TranslationFiles.Project = this; | 944 | vcProject.TranslationFiles.Project = this; |
710 | vcProject.TranslationFiles.Config = &(vcProject.Configuration); | 945 | vcProject.TranslationFiles.Config = &(vcProject.Configuration); |
711 | vcProject.TranslationFiles.CustomBuild = none; | 946 | vcProject.TranslationFiles.CustomBuild = none; |
712 | } | 947 | } |
713 | 948 | ||
714 | void VcprojGenerator::initLexYaccFiles() | 949 | void VcprojGenerator::initLexYaccFiles() |
715 | { | 950 | { |
951 | vcProject.LexYaccFiles.flat_files = project->isActiveConfig("flat"); | ||
716 | vcProject.LexYaccFiles.Name = "Lex / Yacc Files"; | 952 | vcProject.LexYaccFiles.Name = "Lex / Yacc Files"; |
717 | vcProject.LexYaccFiles.ParseFiles = _False; | 953 | vcProject.LexYaccFiles.ParseFiles = _False; |
718 | vcProject.LexYaccFiles.Filter = "l;y"; | 954 | vcProject.LexYaccFiles.Filter = "l;y"; |
719 | vcProject.LexYaccFiles.Files += project->variables()["LEXSOURCES"]; | 955 | vcProject.LexYaccFiles.Files += project->variables()["LEXSOURCES"]; |
720 | vcProject.LexYaccFiles.Files += project->variables()["YACCSOURCES"]; | 956 | vcProject.LexYaccFiles.Files += project->variables()["YACCSOURCES"]; |
721 | vcProject.LexYaccFiles.Files.sort(); | 957 | nonflatDir_BubbleSort( vcProject.LexYaccFiles.Files, |
958 | vcProject.LexYaccFiles.flat_files ); | ||
722 | vcProject.LexYaccFiles.Project = this; | 959 | vcProject.LexYaccFiles.Project = this; |
960 | vcProject.LexYaccFiles.Config = &(vcProject.Configuration); | ||
723 | vcProject.LexYaccFiles.CustomBuild = lexyacc; | 961 | vcProject.LexYaccFiles.CustomBuild = lexyacc; |
724 | } | 962 | } |
725 | 963 | ||
726 | void VcprojGenerator::initResourceFiles() | 964 | void VcprojGenerator::initResourceFiles() |
727 | { | 965 | { |
966 | vcProject.ResourceFiles.flat_files = project->isActiveConfig("flat"); | ||
728 | vcProject.ResourceFiles.Name = "Resources"; | 967 | vcProject.ResourceFiles.Name = "Resources"; |
729 | vcProject.ResourceFiles.ParseFiles = _False; | 968 | vcProject.ResourceFiles.ParseFiles = _False; |
730 | vcProject.ResourceFiles.Filter = "cpp;ico;png;jpg;jpeg;gif;xpm;bmp;rc;ts"; | 969 | vcProject.ResourceFiles.Filter = "cpp;ico;png;jpg;jpeg;gif;xpm;bmp;rc;ts"; |
731 | vcProject.ResourceFiles.Files += project->variables()["RC_FILE"]; | 970 | vcProject.ResourceFiles.Files += project->variables()["RC_FILE"]; |
732 | vcProject.ResourceFiles.Files += project->variables()["QMAKE_IMAGE_COLLECTION"]; | 971 | vcProject.ResourceFiles.Files += project->variables()["QMAKE_IMAGE_COLLECTION"]; |
733 | vcProject.ResourceFiles.Files += project->variables()["IMAGES"]; | 972 | vcProject.ResourceFiles.Files += project->variables()["IMAGES"]; |
734 | vcProject.ResourceFiles.Files += project->variables()["IDLSOURCES"]; | 973 | vcProject.ResourceFiles.Files += project->variables()["IDLSOURCES"]; |
735 | vcProject.ResourceFiles.Files.sort(); | 974 | nonflatDir_BubbleSort( vcProject.ResourceFiles.Files, |
975 | vcProject.ResourceFiles.flat_files ); | ||
736 | vcProject.ResourceFiles.Project = this; | 976 | vcProject.ResourceFiles.Project = this; |
737 | vcProject.ResourceFiles.CustomBuild = none; | 977 | vcProject.ResourceFiles.Config = &(vcProject.Configuration); |
978 | vcProject.ResourceFiles.CustomBuild = resource; | ||
738 | } | 979 | } |
739 | 980 | ||
740 | /* \internal | 981 | /* \internal |
741 | Sets up all needed variables from the environment and all the different caches and .conf files | 982 | Sets up all needed variables from the environment and all the different caches and .conf files |
742 | */ | 983 | */ |
743 | 984 | ||
744 | void VcprojGenerator::initOld() | 985 | void VcprojGenerator::initOld() |
745 | { | 986 | { |
746 | if( init_flag ) | 987 | if( init_flag ) |
747 | return; | 988 | return; |
748 | 989 | ||
749 | init_flag = TRUE; | 990 | init_flag = TRUE; |
750 | QStringList::Iterator it; | 991 | QStringList::Iterator it; |
751 | 992 | ||
752 | if ( project->isActiveConfig("stl") ) { | 993 | if ( project->isActiveConfig("stl") ) { |
753 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"]; | 994 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_ON"]; |
754 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"]; | 995 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_ON"]; |
755 | } else { | 996 | } else { |
756 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"]; | 997 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_STL_OFF"]; |
757 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"]; | 998 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_STL_OFF"]; |
758 | } | 999 | } |
759 | if ( project->isActiveConfig("exceptions") ) { | 1000 | if ( project->isActiveConfig("exceptions") ) { |
760 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"]; | 1001 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_ON"]; |
761 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"]; | 1002 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_ON"]; |
762 | } else { | 1003 | } else { |
763 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"]; | 1004 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_EXCEPTIONS_OFF"]; |
764 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"]; | 1005 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_EXCEPTIONS_OFF"]; |
765 | } | 1006 | } |
766 | if ( project->isActiveConfig("rtti") ) { | 1007 | if ( project->isActiveConfig("rtti") ) { |
767 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"]; | 1008 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_ON"]; |
768 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"]; | 1009 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_ON"]; |
769 | } else { | 1010 | } else { |
770 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"]; | 1011 | project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_RTTI_OFF"]; |
771 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"]; | 1012 | project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RTTI_OFF"]; |
772 | } | 1013 | } |
773 | 1014 | ||
774 | // this should probably not be here, but I'm using it to wrap the .t files | 1015 | // this should probably not be here, but I'm using it to wrap the .t files |
775 | if(project->first("TEMPLATE") == "vcapp" ) | 1016 | if(project->first("TEMPLATE") == "vcapp" ) |
776 | project->variables()["QMAKE_APP_FLAG"].append("1"); | 1017 | project->variables()["QMAKE_APP_FLAG"].append("1"); |
777 | else if(project->first("TEMPLATE") == "vclib") | 1018 | else if(project->first("TEMPLATE") == "vclib") |
778 | project->variables()["QMAKE_LIB_FLAG"].append("1"); | 1019 | project->variables()["QMAKE_LIB_FLAG"].append("1"); |
779 | if ( project->variables()["QMAKESPEC"].isEmpty() ) | 1020 | if ( project->variables()["QMAKESPEC"].isEmpty() ) |
780 | project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); | 1021 | project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); |
781 | 1022 | ||
782 | bool is_qt = | 1023 | bool is_qt = |
783 | ( project->first("TARGET") == "qt"QTDLL_POSTFIX || | 1024 | ( project->first("TARGET") == "qt"QTDLL_POSTFIX || |
784 | project->first("TARGET") == "qt-mt"QTDLL_POSTFIX ); | 1025 | project->first("TARGET") == "qt-mt"QTDLL_POSTFIX ); |
785 | 1026 | ||
786 | QStringList &configs = project->variables()["CONFIG"]; | 1027 | QStringList &configs = project->variables()["CONFIG"]; |
787 | 1028 | ||
788 | if ( project->isActiveConfig( "shared" ) ) | 1029 | if ( project->isActiveConfig( "shared" ) ) |
789 | project->variables()["DEFINES"].append( "QT_DLL" ); | 1030 | project->variables()["DEFINES"].append( "QT_DLL" ); |
790 | 1031 | ||
791 | if ( project->isActiveConfig( "qt_dll" ) && | 1032 | if ( project->isActiveConfig( "qt_dll" ) && |
792 | configs.findIndex("qt") == -1 ) | 1033 | configs.findIndex("qt") == -1 ) |
793 | configs.append("qt"); | 1034 | configs.append("qt"); |
794 | 1035 | ||
795 | if ( project->isActiveConfig( "qt" ) ) { | 1036 | if ( project->isActiveConfig( "qt" ) ) { |
796 | if ( project->isActiveConfig( "plugin" ) ) { | 1037 | if ( project->isActiveConfig( "plugin" ) ) { |
797 | project->variables()["CONFIG"].append( "dll" ); | 1038 | project->variables()["CONFIG"].append( "dll" ); |
798 | project->variables()["DEFINES"].append( "QT_PLUGIN" ); | 1039 | project->variables()["DEFINES"].append( "QT_PLUGIN" ); |
799 | } | 1040 | } |
800 | if ( ( project->variables()["DEFINES"].findIndex( "QT_NODLL" ) == -1 ) && | 1041 | if ( ( project->variables()["DEFINES"].findIndex( "QT_NODLL" ) == -1 ) && |
801 | (( project->variables()["DEFINES"].findIndex( "QT_MAKEDLL" ) != -1 || | 1042 | (( project->variables()["DEFINES"].findIndex( "QT_MAKEDLL" ) != -1 || |
802 | project->variables()["DEFINES"].findIndex( "QT_DLL" ) != -1 ) || | 1043 | project->variables()["DEFINES"].findIndex( "QT_DLL" ) != -1 ) || |
803 | ( getenv( "QT_DLL" ) && !getenv( "QT_NODLL" ))) ) { | 1044 | ( getenv( "QT_DLL" ) && !getenv( "QT_NODLL" ))) ) { |
804 | project->variables()["QMAKE_QT_DLL"].append( "1" ); | 1045 | project->variables()["QMAKE_QT_DLL"].append( "1" ); |
805 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) | 1046 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) |
806 | project->variables()["CONFIG"].append( "dll" ); | 1047 | project->variables()["CONFIG"].append( "dll" ); |
807 | } | 1048 | } |
808 | } | 1049 | } |
809 | 1050 | ||
810 | // If we are a dll, then we cannot be a staticlib at the same time... | 1051 | // If we are a dll, then we cannot be a staticlib at the same time... |
811 | if ( project->isActiveConfig( "dll" ) || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { | 1052 | if ( project->isActiveConfig( "dll" ) || !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { |
812 | project->variables()["CONFIG"].remove( "staticlib" ); | 1053 | project->variables()["CONFIG"].remove( "staticlib" ); |
813 | project->variables()["QMAKE_APP_OR_DLL"].append( "1" ); | 1054 | project->variables()["QMAKE_APP_OR_DLL"].append( "1" ); |
814 | } else { | 1055 | } else { |
815 | project->variables()["CONFIG"].append( "staticlib" ); | 1056 | project->variables()["CONFIG"].append( "staticlib" ); |
816 | } | 1057 | } |
817 | 1058 | ||
818 | // If we need 'qt' and/or 'opengl', then we need windows and not console | 1059 | // If we need 'qt' and/or 'opengl', then we need windows and not console |
819 | if ( project->isActiveConfig( "qt" ) || project->isActiveConfig( "opengl" ) ) { | 1060 | if ( project->isActiveConfig( "qt" ) || project->isActiveConfig( "opengl" ) ) { |
820 | project->variables()["CONFIG"].append( "windows" ); | 1061 | project->variables()["CONFIG"].append( "windows" ); |
821 | } | 1062 | } |
822 | 1063 | ||
823 | // Decode version, and add it to $$MSVCPROJ_VERSION -------------- | 1064 | // Decode version, and add it to $$MSVCPROJ_VERSION -------------- |
824 | if ( !project->variables()["VERSION"].isEmpty() ) { | 1065 | if ( !project->variables()["VERSION"].isEmpty() ) { |
825 | QString version = project->variables()["VERSION"][0]; | 1066 | QString version = project->variables()["VERSION"][0]; |
826 | int firstDot = version.find( "." ); | 1067 | int firstDot = version.find( "." ); |
827 | QString major = version.left( firstDot ); | 1068 | QString major = version.left( firstDot ); |
828 | QString minor = version.right( version.length() - firstDot - 1 ); | 1069 | QString minor = version.right( version.length() - firstDot - 1 ); |
829 | minor.replace( QRegExp( "\\." ), "" ); | 1070 | minor.replace( QRegExp( "\\." ), "" ); |
830 | project->variables()["MSVCPROJ_VERSION"].append( "/VERSION:" + major + "." + minor ); | 1071 | project->variables()["MSVCPROJ_VERSION"].append( "/VERSION:" + major + "." + minor ); |
831 | } | 1072 | } |
832 | 1073 | ||
833 | // QT ------------------------------------------------------------ | 1074 | // QT ------------------------------------------------------------ |
834 | if ( project->isActiveConfig("qt") ) { | 1075 | if ( project->isActiveConfig("qt") ) { |
835 | project->variables()["CONFIG"].append("moc"); | 1076 | project->variables()["CONFIG"].append("moc"); |
836 | project->variables()["INCLUDEPATH"] +=project->variables()["QMAKE_INCDIR_QT"]; | 1077 | project->variables()["INCLUDEPATH"] +=project->variables()["QMAKE_INCDIR_QT"]; |
837 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"]; | 1078 | project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"]; |
838 | 1079 | ||
839 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { | 1080 | if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { |
840 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { | 1081 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { |
841 | project->variables()["DEFINES"].append("QT_MAKEDLL"); | 1082 | project->variables()["DEFINES"].append("QT_MAKEDLL"); |
842 | project->variables()["QMAKE_LFLAGS"].append("/BASE:0x39D00000"); | 1083 | project->variables()["QMAKE_LFLAGS"].append("/BASE:0x39D00000"); |
843 | } | 1084 | } |
844 | } else { | 1085 | } else { |
845 | if(project->isActiveConfig("thread")) | 1086 | if(project->isActiveConfig("thread")) |
846 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; | 1087 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; |
847 | else | 1088 | else |
848 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; | 1089 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; |
849 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { | 1090 | if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { |
850 | int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt"); | 1091 | int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt"); |
851 | if( hver==-1 ) { | 1092 | if( hver==-1 ) { |
852 | hver = findHighestVersion( project->first("QMAKE_LIBDIR_QT"), "qt-mt" ); | 1093 | hver = findHighestVersion( project->first("QMAKE_LIBDIR_QT"), "qt-mt" ); |
853 | } | 1094 | } |
854 | 1095 | ||
855 | if(hver != -1) { | 1096 | if(hver != -1) { |
856 | QString ver; | 1097 | QString ver; |
857 | ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver); | 1098 | ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver); |
858 | QStringList &libs = project->variables()["QMAKE_LIBS"]; | 1099 | QStringList &libs = project->variables()["QMAKE_LIBS"]; |
859 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) | 1100 | for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) |
860 | (*libit).replace(QRegExp("qt(-mt)?\\.lib"), ver); | 1101 | (*libit).replace(QRegExp("qt(-mt)?\\.lib"), ver); |
861 | } | 1102 | } |
862 | } | 1103 | } |
863 | if ( project->isActiveConfig( "activeqt" ) ) { | 1104 | if ( project->isActiveConfig( "activeqt" ) ) { |
864 | project->variables().remove("QMAKE_LIBS_QT_ENTRY"); | 1105 | project->variables().remove("QMAKE_LIBS_QT_ENTRY"); |
865 | project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib"; | 1106 | project->variables()["QMAKE_LIBS_QT_ENTRY"] = "qaxserver.lib"; |
866 | if ( project->isActiveConfig( "dll" ) ) { | 1107 | if ( project->isActiveConfig( "dll" ) ) { |
867 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; | 1108 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_ENTRY"]; |
868 | project->variables()["MSVCPROJ_LFLAGS"].append("/DEF:"+project->first("DEF_FILE")); | ||
869 | } | 1109 | } |
870 | } | 1110 | } |
871 | if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { | 1111 | if ( !project->isActiveConfig("dll") && !project->isActiveConfig("plugin") ) { |
872 | project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"]; | 1112 | project->variables()["QMAKE_LIBS"] +=project->variables()["QMAKE_LIBS_QT_ENTRY"]; |
873 | } | 1113 | } |
874 | } | 1114 | } |
875 | } | 1115 | } |
876 | 1116 | ||
877 | // Set target directories ---------------------------------------- | 1117 | // Set target directories ---------------------------------------- |
878 | // if ( !project->first("OBJECTS_DIR").isEmpty() ) | 1118 | // if ( !project->first("OBJECTS_DIR").isEmpty() ) |
879 | //project->variables()["MSVCPROJ_OBJECTSDIR"] = project->first("OBJECTS_DIR"); | 1119 | //project->variables()["MSVCPROJ_OBJECTSDIR"] = project->first("OBJECTS_DIR"); |
880 | // else | 1120 | // else |
881 | //project->variables()["MSVCPROJ_OBJECTSDIR"] = project->isActiveConfig( "release" )?"Release":"Debug"; | 1121 | //project->variables()["MSVCPROJ_OBJECTSDIR"] = project->isActiveConfig( "release" )?"Release":"Debug"; |
882 | // if ( !project->first("DESTDIR").isEmpty() ) | 1122 | // if ( !project->first("DESTDIR").isEmpty() ) |
883 | //project->variables()["MSVCPROJ_TARGETDIR"] = project->first("DESTDIR"); | 1123 | //project->variables()["MSVCPROJ_TARGETDIR"] = project->first("DESTDIR"); |
884 | // else | 1124 | // else |
885 | //project->variables()["MSVCPROJ_TARGETDIR"] = project->isActiveConfig( "release" )?"Release":"Debug"; | 1125 | //project->variables()["MSVCPROJ_TARGETDIR"] = project->isActiveConfig( "release" )?"Release":"Debug"; |
886 | 1126 | ||
887 | // OPENGL -------------------------------------------------------- | 1127 | // OPENGL -------------------------------------------------------- |
888 | if ( project->isActiveConfig("opengl") ) { | 1128 | if ( project->isActiveConfig("opengl") ) { |
889 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"]; | 1129 | project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"]; |
890 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"]; | 1130 | project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"]; |
891 | } | 1131 | } |
892 | 1132 | ||
893 | // THREAD -------------------------------------------------------- | 1133 | // THREAD -------------------------------------------------------- |
894 | if ( project->isActiveConfig("thread") ) { | 1134 | if ( project->isActiveConfig("thread") ) { |
895 | if(project->isActiveConfig("qt")) | 1135 | if(project->isActiveConfig("qt")) |
896 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" ); | 1136 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" ); |
897 | if ( !project->variables()["DEFINES"].contains("QT_DLL") && is_qt | 1137 | if ( !project->variables()["DEFINES"].contains("QT_DLL") && is_qt |
898 | && project->first("TARGET") != "qtmain" ) | 1138 | && project->first("TARGET") != "qtmain" ) |
899 | project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:libc"); | 1139 | project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:libc"); |
900 | } | 1140 | } |
901 | 1141 | ||
902 | // ACCESSIBILITY ------------------------------------------------- | 1142 | // ACCESSIBILITY ------------------------------------------------- |
903 | if(project->isActiveConfig("qt")) { | 1143 | if(project->isActiveConfig("qt")) { |
904 | if ( project->isActiveConfig("accessibility" ) ) | 1144 | if ( project->isActiveConfig("accessibility" ) ) |
905 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); | 1145 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); |
906 | if ( project->isActiveConfig("tablet") ) | 1146 | if ( project->isActiveConfig("tablet") ) |
907 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT"); | 1147 | project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT"); |
908 | } | 1148 | } |
909 | 1149 | ||
910 | // DLL ----------------------------------------------------------- | 1150 | // DLL ----------------------------------------------------------- |
911 | if ( project->isActiveConfig("dll") ) { | 1151 | if ( project->isActiveConfig("dll") ) { |
912 | if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { | 1152 | if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { |
913 | QString ver_xyz(project->first("VERSION")); | 1153 | QString ver_xyz(project->first("VERSION")); |
914 | ver_xyz.replace(QRegExp("\\."), ""); | 1154 | ver_xyz.replace(QRegExp("\\."), ""); |
915 | project->variables()["TARGET_EXT"].append(ver_xyz + ".dll"); | 1155 | project->variables()["TARGET_EXT"].append(ver_xyz + ".dll"); |
916 | } else { | 1156 | } else { |
917 | project->variables()["TARGET_EXT"].append(".dll"); | 1157 | project->variables()["TARGET_EXT"].append(".dll"); |
918 | } | 1158 | } |
919 | } | 1159 | } |
920 | // EXE / LIB ----------------------------------------------------- | 1160 | // EXE / LIB ----------------------------------------------------- |
921 | else { | 1161 | else { |
922 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) | 1162 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) |
923 | project->variables()["TARGET_EXT"].append(".exe"); | 1163 | project->variables()["TARGET_EXT"].append(".exe"); |
924 | else | 1164 | else |
925 | project->variables()["TARGET_EXT"].append(".lib"); | 1165 | project->variables()["TARGET_EXT"].append(".lib"); |
926 | } | 1166 | } |
927 | 1167 | ||
928 | project->variables()["MSVCPROJ_VER"] = "7.00"; | 1168 | project->variables()["MSVCPROJ_VER"] = "7.00"; |
929 | project->variables()["MSVCPROJ_DEBUG_OPT"] = "/GZ /ZI"; | 1169 | project->variables()["MSVCPROJ_DEBUG_OPT"] = "/GZ /ZI"; |
930 | 1170 | ||
931 | // INCREMENTAL:NO ------------------------------------------------ | 1171 | // INCREMENTAL:NO ------------------------------------------------ |
932 | if(!project->isActiveConfig("incremental")) { | 1172 | if(!project->isActiveConfig("incremental")) { |
933 | project->variables()["QMAKE_LFLAGS"].append(QString("/INCREMENTAL:no")); | 1173 | project->variables()["QMAKE_LFLAGS"].append(QString("/INCREMENTAL:no")); |
934 | if ( is_qt ) | 1174 | if ( is_qt ) |
935 | project->variables()["MSVCPROJ_DEBUG_OPT"] = "/GZ /Zi"; | 1175 | project->variables()["MSVCPROJ_DEBUG_OPT"] = "/GZ /Zi"; |
936 | } | 1176 | } |
937 | 1177 | ||
938 | // MOC ----------------------------------------------------------- | 1178 | // MOC ----------------------------------------------------------- |
939 | if ( project->isActiveConfig("moc") ) | 1179 | if ( project->isActiveConfig("moc") ) |
940 | setMocAware(TRUE); | 1180 | setMocAware(TRUE); |
941 | 1181 | ||
1182 | // /VERSION:x.yz ------------------------------------------------- | ||
1183 | if ( !project->variables()["VERSION"].isEmpty() ) { | ||
1184 | QString version = project->variables()["VERSION"][0]; | ||
1185 | int firstDot = version.find( "." ); | ||
1186 | QString major = version.left( firstDot ); | ||
1187 | QString minor = version.right( version.length() - firstDot - 1 ); | ||
1188 | minor.replace( ".", "" ); | ||
1189 | project->variables()["QMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor ); | ||
1190 | } | ||
942 | 1191 | ||
943 | project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"]; | 1192 | project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"]; |
944 | // Update -lname to name.lib, and -Ldir to | 1193 | // Update -lname to name.lib, and -Ldir to |
945 | QStringList &libList = project->variables()["QMAKE_LIBS"]; | 1194 | QStringList &libList = project->variables()["QMAKE_LIBS"]; |
946 | for( it = libList.begin(); it != libList.end(); ) { | 1195 | for( it = libList.begin(); it != libList.end(); ) { |
947 | QString s = *it; | 1196 | QString s = *it; |
948 | if( s.startsWith( "-l" ) ) { | 1197 | if( s.startsWith( "-l" ) ) { |
949 | it = libList.remove( it ); | 1198 | it = libList.remove( it ); |
950 | it = libList.insert( it, s.mid( 2 ) + ".lib" ); | 1199 | it = libList.insert( it, s.mid( 2 ) + ".lib" ); |
951 | } else if( s.startsWith( "-L" ) ) { | 1200 | } else if( s.startsWith( "-L" ) ) { |
1201 | project->variables()["QMAKE_LIBDIR"] += (*it).mid(2); | ||
952 | it = libList.remove( it ); | 1202 | it = libList.remove( it ); |
953 | } else { | 1203 | } else { |
954 | it++; | 1204 | it++; |
955 | } | 1205 | } |
956 | } | 1206 | } |
957 | 1207 | ||
958 | // Run through all variables containing filepaths, and ----------- | 1208 | // Run through all variables containing filepaths, and ----------- |
959 | // slash-slosh them correctly depending on current OS ----------- | 1209 | // slash-slosh them correctly depending on current OS ----------- |
960 | project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ', "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH"); | 1210 | project->variables()["QMAKE_FILETAGS"] += QStringList::split(' ', "HEADERS SOURCES DEF_FILE RC_FILE TARGET QMAKE_LIBS DESTDIR DLLDESTDIR INCLUDEPATH"); |
961 | QStringList &l = project->variables()["QMAKE_FILETAGS"]; | 1211 | QStringList &l = project->variables()["QMAKE_FILETAGS"]; |
962 | for(it = l.begin(); it != l.end(); ++it) { | 1212 | for(it = l.begin(); it != l.end(); ++it) { |
963 | QStringList &gdmf = project->variables()[(*it)]; | 1213 | QStringList &gdmf = project->variables()[(*it)]; |
964 | for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner) | 1214 | for(QStringList::Iterator inner = gdmf.begin(); inner != gdmf.end(); ++inner) |
965 | (*inner) = Option::fixPathToTargetOS((*inner), FALSE); | 1215 | (*inner) = Option::fixPathToTargetOS((*inner), FALSE); |
966 | } | 1216 | } |
967 | 1217 | ||
968 | // Get filename w/o extention ----------------------------------- | 1218 | // Get filename w/o extention ----------------------------------- |
969 | QString msvcproj_project = ""; | 1219 | QString msvcproj_project = ""; |
970 | QString targetfilename = ""; | 1220 | QString targetfilename = ""; |
971 | if ( project->variables()["TARGET"].count() ) { | 1221 | if ( project->variables()["TARGET"].count() ) { |
972 | msvcproj_project = project->variables()["TARGET"].first(); | 1222 | msvcproj_project = project->variables()["TARGET"].first(); |
973 | targetfilename = msvcproj_project; | 1223 | targetfilename = msvcproj_project; |
974 | } | 1224 | } |
975 | 1225 | ||
976 | // Save filename w/o extention in $$QMAKE_ORIG_TARGET ------------ | 1226 | // Save filename w/o extention in $$QMAKE_ORIG_TARGET ------------ |
977 | project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; | 1227 | project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; |
978 | 1228 | ||
979 | // TARGET (add extention to $$TARGET) | 1229 | // TARGET (add extention to $$TARGET) |
980 | //project->variables()["MSVCPROJ_DEFINES"].append(varGlue(".first() += project->first("TARGET_EXT"); | 1230 | //project->variables()["MSVCPROJ_DEFINES"].append(varGlue(".first() += project->first("TARGET_EXT"); |
981 | 1231 | ||
982 | // Init base class too ------------------------------------------- | 1232 | // Init base class too ------------------------------------------- |
983 | MakefileGenerator::init(); | 1233 | MakefileGenerator::init(); |
984 | 1234 | ||
985 | 1235 | ||
986 | if ( msvcproj_project.isEmpty() ) | 1236 | if ( msvcproj_project.isEmpty() ) |
987 | msvcproj_project = Option::output.name(); | 1237 | msvcproj_project = Option::output.name(); |
988 | 1238 | ||
989 | msvcproj_project = msvcproj_project.right( msvcproj_project.length() - msvcproj_project.findRev( "\\" ) - 1 ); | 1239 | msvcproj_project = msvcproj_project.right( msvcproj_project.length() - msvcproj_project.findRev( "\\" ) - 1 ); |
990 | msvcproj_project = msvcproj_project.left( msvcproj_project.findRev( "." ) ); | 1240 | msvcproj_project = msvcproj_project.left( msvcproj_project.findRev( "." ) ); |
991 | msvcproj_project.replace(QRegExp("-"), ""); | 1241 | msvcproj_project.replace(QRegExp("-"), ""); |
992 | 1242 | ||
993 | project->variables()["MSVCPROJ_PROJECT"].append(msvcproj_project); | 1243 | project->variables()["MSVCPROJ_PROJECT"].append(msvcproj_project); |
994 | QStringList &proj = project->variables()["MSVCPROJ_PROJECT"]; | 1244 | QStringList &proj = project->variables()["MSVCPROJ_PROJECT"]; |
995 | 1245 | ||
996 | for(it = proj.begin(); it != proj.end(); ++it) | 1246 | for(it = proj.begin(); it != proj.end(); ++it) |
997 | (*it).replace(QRegExp("\\.[a-zA-Z0-9_]*$"), ""); | 1247 | (*it).replace(QRegExp("\\.[a-zA-Z0-9_]*$"), ""); |
998 | 1248 | ||
999 | // SUBSYSTEM ----------------------------------------------------- | 1249 | // SUBSYSTEM ----------------------------------------------------- |
1000 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { | 1250 | if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) { |
1001 | project->variables()["MSVCPROJ_TEMPLATE"].append("win32app" + project->first( "VCPROJ_EXTENSION" ) ); | 1251 | project->variables()["MSVCPROJ_TEMPLATE"].append("win32app" + project->first( "VCPROJ_EXTENSION" ) ); |
1002 | if ( project->isActiveConfig("console") ) { | 1252 | if ( project->isActiveConfig("console") ) { |
1003 | project->variables()["MSVCPROJ_CONSOLE"].append("CONSOLE"); | 1253 | project->variables()["MSVCPROJ_CONSOLE"].append("CONSOLE"); |
1004 | project->variables()["MSVCPROJ_WINCONDEF"].append("_CONSOLE"); | 1254 | project->variables()["MSVCPROJ_WINCONDEF"].append("_CONSOLE"); |
1005 | project->variables()["MSVCPROJ_VCPROJTYPE"].append("0x0103"); | 1255 | project->variables()["MSVCPROJ_VCPROJTYPE"].append("0x0103"); |
1006 | project->variables()["MSVCPROJ_SUBSYSTEM"].append("CONSOLE"); | 1256 | project->variables()["MSVCPROJ_SUBSYSTEM"].append("CONSOLE"); |
1007 | } else { | 1257 | } else { |
1008 | project->variables()["MSVCPROJ_CONSOLE"].clear(); | 1258 | project->variables()["MSVCPROJ_CONSOLE"].clear(); |
1009 | project->variables()["MSVCPROJ_WINCONDEF"].append("_WINDOWS"); | 1259 | project->variables()["MSVCPROJ_WINCONDEF"].append("_WINDOWS"); |
1010 | project->variables()["MSVCPROJ_VCPROJTYPE"].append("0x0101"); | 1260 | project->variables()["MSVCPROJ_VCPROJTYPE"].append("0x0101"); |
1011 | project->variables()["MSVCPROJ_SUBSYSTEM"].append("WINDOWS"); | 1261 | project->variables()["MSVCPROJ_SUBSYSTEM"].append("WINDOWS"); |
1012 | } | 1262 | } |
1013 | } else { | 1263 | } else { |
1014 | if ( project->isActiveConfig("dll") ) { | 1264 | if ( project->isActiveConfig("dll") ) { |
1015 | project->variables()["MSVCPROJ_TEMPLATE"].append("win32dll" + project->first( "VCPROJ_EXTENSION" ) ); | 1265 | project->variables()["MSVCPROJ_TEMPLATE"].append("win32dll" + project->first( "VCPROJ_EXTENSION" ) ); |
1016 | } else { | 1266 | } else { |
1017 | project->variables()["MSVCPROJ_TEMPLATE"].append("win32lib" + project->first( "VCPROJ_EXTENSION" ) ); | 1267 | project->variables()["MSVCPROJ_TEMPLATE"].append("win32lib" + project->first( "VCPROJ_EXTENSION" ) ); |
1018 | } | 1268 | } |
1019 | } | 1269 | } |
1020 | 1270 | ||
1021 | // $$QMAKE.. -> $$MSVCPROJ.. ------------------------------------- | 1271 | // $$QMAKE.. -> $$MSVCPROJ.. ------------------------------------- |
1022 | project->variables()["MSVCPROJ_LIBS"] += project->variables()["QMAKE_LIBS"]; | 1272 | project->variables()["MSVCPROJ_LIBS"] += project->variables()["QMAKE_LIBS"]; |
1023 | project->variables()["MSVCPROJ_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"]; | 1273 | project->variables()["MSVCPROJ_LIBS"] += project->variables()["QMAKE_LIBS_WINDOWS"]; |
1024 | project->variables()["MSVCPROJ_LFLAGS" ] += project->variables()["QMAKE_LFLAGS"]; | 1274 | project->variables()["MSVCPROJ_LFLAGS" ] += project->variables()["QMAKE_LFLAGS"]; |
1025 | if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() ) { | 1275 | if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() ) { |
1026 | QStringList strl = project->variables()["QMAKE_LIBDIR"]; | 1276 | QStringList strl = project->variables()["QMAKE_LIBDIR"]; |
1027 | QStringList::iterator stri; | 1277 | QStringList::iterator stri; |
1028 | for ( stri = strl.begin(); stri != strl.end(); ++stri ) { | 1278 | for ( stri = strl.begin(); stri != strl.end(); ++stri ) { |
1029 | if ( !(*stri).startsWith("/LIBPATH:") ) | 1279 | if ( !(*stri).startsWith("/LIBPATH:") ) |
1030 | (*stri).prepend( "/LIBPATH:" ); | 1280 | (*stri).prepend( "/LIBPATH:" ); |
1031 | } | 1281 | } |
1032 | project->variables()["MSVCPROJ_LFLAGS"] += strl; | 1282 | project->variables()["MSVCPROJ_LFLAGS"] += strl; |
1033 | } | 1283 | } |
1034 | project->variables()["MSVCPROJ_CXXFLAGS" ] += project->variables()["QMAKE_CXXFLAGS"]; | 1284 | project->variables()["MSVCPROJ_CXXFLAGS" ] += project->variables()["QMAKE_CXXFLAGS"]; |
1035 | // We don't use this... Direct manipulation of compiler object | 1285 | // We don't use this... Direct manipulation of compiler object |
1036 | //project->variables()["MSVCPROJ_DEFINES"].append(varGlue("DEFINES","/D ","" " /D ","")); | 1286 | //project->variables()["MSVCPROJ_DEFINES"].append(varGlue("DEFINES","/D ","" " /D ","")); |
1037 | //project->variables()["MSVCPROJ_DEFINES"].append(varGlue("PRL_EXPORT_DEFINES","/D ","" " /D ","")); | 1287 | //project->variables()["MSVCPROJ_DEFINES"].append(varGlue("PRL_EXPORT_DEFINES","/D ","" " /D ","")); |
1038 | QStringList &incs = project->variables()["INCLUDEPATH"]; | 1288 | QStringList &incs = project->variables()["INCLUDEPATH"]; |
1039 | for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { | 1289 | for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { |
1040 | QString inc = (*incit); | 1290 | QString inc = (*incit); |
1041 | inc.replace(QRegExp("\""), ""); | 1291 | inc.replace(QRegExp("\""), ""); |
1042 | project->variables()["MSVCPROJ_INCPATH"].append("/I" + inc ); | 1292 | project->variables()["MSVCPROJ_INCPATH"].append("/I" + inc ); |
1043 | } | 1293 | } |
1044 | project->variables()["MSVCPROJ_INCPATH"].append("/I" + specdir()); | 1294 | project->variables()["MSVCPROJ_INCPATH"].append("/I" + specdir()); |
1045 | 1295 | ||
1046 | QString dest; | 1296 | QString dest; |
1047 | project->variables()["MSVCPROJ_TARGET"] = project->first("TARGET"); | 1297 | project->variables()["MSVCPROJ_TARGET"] = project->first("TARGET"); |
1048 | Option::fixPathToTargetOS(project->first("TARGET")); | 1298 | Option::fixPathToTargetOS(project->first("TARGET")); |
1049 | dest = project->first("TARGET") + project->first( "TARGET_EXT" ); | 1299 | dest = project->first("TARGET") + project->first( "TARGET_EXT" ); |
1050 | if ( project->first("TARGET").startsWith("$(QTDIR)") ) | 1300 | if ( project->first("TARGET").startsWith("$(QTDIR)") ) |
1051 | dest.replace( QRegExp("\\$\\(QTDIR\\)"), getenv("QTDIR") ); | 1301 | dest.replace( QRegExp("\\$\\(QTDIR\\)"), getenv("QTDIR") ); |
1052 | project->variables()["MSVCPROJ_TARGET"] = dest; | 1302 | project->variables()["MSVCPROJ_TARGET"] = dest; |
1053 | if ( project->isActiveConfig("dll") ) { | ||
1054 | QString imp = project->first( "DESTDIR" ); | ||
1055 | if( !imp.isNull() && !imp.endsWith( "\\" ) ) | ||
1056 | imp += "\\"; | ||
1057 | imp += dest; | ||
1058 | imp.replace(QRegExp("\\.dll"), ".lib"); | ||
1059 | project->variables()["MSVCPROJ_LIBOPTIONS"] += QString("/IMPLIB:") + imp; | ||
1060 | } | ||
1061 | 1303 | ||
1062 | // DLL COPY ------------------------------------------------------ | 1304 | // DLL COPY ------------------------------------------------------ |
1063 | if ( project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty() ) { | 1305 | if ( project->isActiveConfig("dll") && !project->variables()["DLLDESTDIR"].isEmpty() ) { |
1064 | QStringList dlldirs = project->variables()["DLLDESTDIR"]; | 1306 | QStringList dlldirs = project->variables()["DLLDESTDIR"]; |
1065 | QString copydll = "# Begin Special Build Tool\n" | 1307 | QString copydll(""); |
1066 | "TargetPath=" + dest + "\n" | 1308 | QStringList::Iterator dlldir; |
1067 | "SOURCE=$(InputPath)\n" | 1309 | for ( dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) { |
1068 | "PostBuild_Desc=Copy DLL to " + project->first("DLLDESTDIR") + "\n" | 1310 | if ( !copydll.isEmpty() ) |
1069 | "PostBuild_Cmds="; | 1311 | copydll += " && "; |
1070 | 1312 | copydll += "copy "$(TargetPath)" "" + *dlldir + """; | |
1071 | for ( QStringList::Iterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir ) { | ||
1072 | copydll += "copy \"" + dest + "\" \"" + *dlldir + "\"\t"; | ||
1073 | } | 1313 | } |
1074 | 1314 | ||
1075 | copydll += "\n# End Special Build Tool"; | 1315 | QString deststr( "Copy " + dest + " to " ); |
1076 | project->variables()["MSVCPROJ_COPY_DLL_REL"].append( copydll ); | 1316 | for ( dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ) { |
1077 | project->variables()["MSVCPROJ_COPY_DLL_DBG"].append( copydll ); | 1317 | deststr += *dlldir; |
1318 | ++dlldir; | ||
1319 | if ( dlldir != dlldirs.end() ) | ||
1320 | deststr += ", "; | ||
1321 | } | ||
1322 | |||
1323 | project->variables()["MSVCPROJ_COPY_DLL"].append( copydll ); | ||
1324 | project->variables()["MSVCPROJ_COPY_DLL_DESC"].append( deststr ); | ||
1078 | } | 1325 | } |
1079 | 1326 | ||
1080 | // ACTIVEQT ------------------------------------------------------ | 1327 | // ACTIVEQT ------------------------------------------------------ |
1081 | if ( project->isActiveConfig("activeqt") ) { | 1328 | if ( project->isActiveConfig("activeqt") ) { |
1082 | QString idl = project->variables()["QMAKE_IDL"].first(); | 1329 | QString idl = project->variables()["QMAKE_IDL"].first(); |
1083 | QString idc = project->variables()["QMAKE_IDC"].first(); | 1330 | QString idc = project->variables()["QMAKE_IDC"].first(); |
1084 | QString version = project->variables()["VERSION"].first(); | 1331 | QString version = project->variables()["VERSION"].first(); |
1085 | if ( version.isEmpty() ) | 1332 | if ( version.isEmpty() ) |
1086 | version = "1.0"; | 1333 | version = "1.0"; |
1087 | 1334 | ||
1088 | project->variables()["MSVCPROJ_IDLSOURCES"].append( "tmp\\" + targetfilename + ".idl" ); | 1335 | QString objdir = project->first( "OBJECTS_DIR" ); |
1089 | project->variables()["MSVCPROJ_IDLSOURCES"].append( "tmp\\" + targetfilename + ".tlb" ); | 1336 | project->variables()["MSVCPROJ_IDLSOURCES"].append( objdir + targetfilename + ".idl" ); |
1090 | project->variables()["MSVCPROJ_IDLSOURCES"].append( "tmp\\" + targetfilename + ".midl" ); | ||
1091 | if ( project->isActiveConfig( "dll" ) ) { | 1337 | if ( project->isActiveConfig( "dll" ) ) { |
1092 | QString regcmd = "# Begin Special Build Tool\n" | 1338 | QString regcmd = "# Begin Special Build Tool\n" |
1093 | "TargetPath=" + targetfilename + "\n" | 1339 | "TargetPath=" + targetfilename + "\n" |
1094 | "SOURCE=$(InputPath)\n" | 1340 | "SOURCE=$(InputPath)\n" |
1095 | "PostBuild_Desc=Finalizing ActiveQt server...\n" | 1341 | "PostBuild_Desc=Finalizing ActiveQt server...\n" |
1096 | "PostBuild_Cmds=" + | 1342 | "PostBuild_Cmds=" + |
1097 | idc + " %1 -idl tmp\\" + targetfilename + ".idl -version " + version + | 1343 | idc + " %1 -idl " + objdir + targetfilename + ".idl -version " + version + |
1098 | "\t" + idl + " tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl" | 1344 | "\t" + idl + " /nologo " + objdir + targetfilename + ".idl /tlb " + objdir + targetfilename + ".tlb" + |
1099 | "\t" + idc + " %1 /tlb tmp\\" + targetfilename + ".tlb" | 1345 | "\t" + idc + " %1 /tlb " + objdir + targetfilename + ".tlb" |
1100 | "\tregsvr32 /s %1\n" | 1346 | "\tregsvr32 /s %1\n" |
1101 | "# End Special Build Tool"; | 1347 | "# End Special Build Tool"; |
1102 | 1348 | ||
1103 | QString executable = project->variables()["MSVCPROJ_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first(); | 1349 | QString executable = project->variables()["MSVCPROJ_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first(); |
1104 | project->variables()["MSVCPROJ_COPY_DLL_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) ); | 1350 | project->variables()["MSVCPROJ_COPY_DLL_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) ); |
1105 | 1351 | ||
1106 | executable = project->variables()["MSVCPROJ_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first(); | 1352 | executable = project->variables()["MSVCPROJ_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first(); |
1107 | project->variables()["MSVCPROJ_COPY_DLL_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) ); | 1353 | project->variables()["MSVCPROJ_COPY_DLL_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) ); |
1108 | } else { | 1354 | } else { |
1109 | QString regcmd = "# Begin Special Build Tool\n" | 1355 | QString regcmd = "# Begin Special Build Tool\n" |
1110 | "TargetPath=" + targetfilename + "\n" | 1356 | "TargetPath=" + targetfilename + "\n" |
1111 | "SOURCE=$(InputPath)\n" | 1357 | "SOURCE=$(InputPath)\n" |
1112 | "PostBuild_Desc=Finalizing ActiveQt server...\n" | 1358 | "PostBuild_Desc=Finalizing ActiveQt server...\n" |
1113 | "PostBuild_Cmds=" | 1359 | "PostBuild_Cmds=" |
1114 | "%1 -dumpidl tmp\\" + targetfilename + ".idl -version " + version + | 1360 | "%1 -dumpidl " + objdir + targetfilename + ".idl -version " + version + |
1115 | "\t" + idl + " tmp\\" + targetfilename + ".idl /nologo /o tmp\\" + targetfilename + ".midl /tlb tmp\\" + targetfilename + ".tlb /iid tmp\\dump.midl /dlldata tmp\\dump.midl /cstub tmp\\dump.midl /header tmp\\dump.midl /proxy tmp\\dump.midl /sstub tmp\\dump.midl" | 1361 | "\t" + idl + " /nologo " + objdir + targetfilename + ".idl /tlb " + objdir + targetfilename + ".tlb" |
1116 | "\t" + idc + " %1 /tlb tmp\\" + targetfilename + ".tlb" | 1362 | "\t" + idc + " %1 /tlb " + objdir + targetfilename + ".tlb" |
1117 | "\t%1 -regserver\n" | 1363 | "\t%1 -regserver\n" |
1118 | "# End Special Build Tool"; | 1364 | "# End Special Build Tool"; |
1119 | 1365 | ||
1120 | QString executable = project->variables()["MSVCPROJ_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first(); | 1366 | QString executable = project->variables()["MSVCPROJ_TARGETDIRREL"].first() + "\\" + project->variables()["TARGET"].first(); |
1121 | project->variables()["MSVCPROJ_REGSVR_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) ); | 1367 | project->variables()["MSVCPROJ_REGSVR_REL"].append( regcmd.arg(executable).arg(executable).arg(executable) ); |
1122 | 1368 | ||
1123 | executable = project->variables()["MSVCPROJ_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first(); | 1369 | executable = project->variables()["MSVCPROJ_TARGETDIRDEB"].first() + "\\" + project->variables()["TARGET"].first(); |
1124 | project->variables()["MSVCPROJ_REGSVR_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) ); | 1370 | project->variables()["MSVCPROJ_REGSVR_DBG"].append( regcmd.arg(executable).arg(executable).arg(executable) ); |
1125 | } | 1371 | } |
1126 | |||
1127 | } | 1372 | } |
1128 | 1373 | ||
1374 | if ( !project->variables()["DEF_FILE"].isEmpty() ) | ||
1375 | project->variables()["MSVCPROJ_LFLAGS"].append("/DEF:"+project->first("DEF_FILE")); | ||
1376 | |||
1129 | // FORMS --------------------------------------------------------- | 1377 | // FORMS --------------------------------------------------------- |
1130 | QStringList &list = project->variables()["FORMS"]; | 1378 | QStringList &list = project->variables()["FORMS"]; |
1131 | for( it = list.begin(); it != list.end(); ++it ) { | 1379 | for( it = list.begin(); it != list.end(); ++it ) { |
1132 | if ( QFile::exists( *it + ".h" ) ) | 1380 | if ( QFile::exists( *it + ".h" ) ) |
1133 | project->variables()["SOURCES"].append( *it + ".h" ); | 1381 | project->variables()["SOURCES"].append( *it + ".h" ); |
1134 | } | 1382 | } |
1135 | 1383 | ||
1136 | project->variables()["QMAKE_INTERNAL_PRL_LIBS"] << "MSVCPROJ_LFLAGS" << "MSVCPROJ_LIBS"; | 1384 | project->variables()["QMAKE_INTERNAL_PRL_LIBS"] << "MSVCPROJ_LFLAGS" << "MSVCPROJ_LIBS"; |
1137 | 1385 | ||
1138 | // Verbose output if "-d -d"... | 1386 | // Verbose output if "-d -d"... |
1139 | outputVariables(); | 1387 | outputVariables(); |
1140 | } | 1388 | } |
1141 | 1389 | ||
1142 | // ------------------------------------------------------------------------------------------------ | 1390 | // ------------------------------------------------------------------------------------------------ |
1143 | // ------------------------------------------------------------------------------------------------ | 1391 | // ------------------------------------------------------------------------------------------------ |
1144 | 1392 | ||
1145 | bool VcprojGenerator::openOutput(QFile &file) const | 1393 | bool VcprojGenerator::openOutput(QFile &file) const |
1146 | { | 1394 | { |
1147 | QString outdir; | 1395 | QString outdir; |
1148 | if(!file.name().isEmpty()) { | 1396 | if(!file.name().isEmpty()) { |
1149 | QFileInfo fi(file); | 1397 | QFileInfo fi(file); |
1150 | if(fi.isDir()) | 1398 | if(fi.isDir()) |
1151 | outdir = file.name() + QDir::separator(); | 1399 | outdir = file.name() + QDir::separator(); |
1152 | } | 1400 | } |
1153 | if(!outdir.isEmpty() || file.name().isEmpty()) { | 1401 | if(!outdir.isEmpty() || file.name().isEmpty()) { |
1154 | QString ext = project->first("VCPROJ_EXTENSION"); | 1402 | QString ext = project->first("VCPROJ_EXTENSION"); |
1155 | if(project->first("TEMPLATE") == "vcsubdirs") | 1403 | if(project->first("TEMPLATE") == "vcsubdirs") |
1156 | ext = project->first("VCSOLUTION_EXTENSION"); | 1404 | ext = project->first("VCSOLUTION_EXTENSION"); |
1157 | file.setName(outdir + project->first("TARGET") + ext); | 1405 | file.setName(outdir + project->first("TARGET") + ext); |
1158 | } | 1406 | } |
1159 | if(QDir::isRelativePath(file.name())) { | 1407 | if(QDir::isRelativePath(file.name())) { |
1160 | file.setName( Option::fixPathToLocalOS(QDir::currentDirPath() + Option::dir_sep + fixFilename(file.name())) ); | 1408 | file.setName( Option::fixPathToLocalOS(QDir::currentDirPath() + Option::dir_sep + fixFilename(file.name())) ); |
1161 | } | 1409 | } |
1162 | return Win32MakefileGenerator::openOutput(file); | 1410 | return Win32MakefileGenerator::openOutput(file); |
1163 | } | 1411 | } |
1164 | 1412 | ||
1165 | QString VcprojGenerator::fixFilename(QString ofile) const | 1413 | QString VcprojGenerator::fixFilename(QString ofile) const |
1166 | { | 1414 | { |
1167 | int slashfind = ofile.findRev('\\'); | 1415 | int slashfind = ofile.findRev('\\'); |
1168 | if (slashfind == -1) { | 1416 | if (slashfind == -1) { |
1169 | ofile = ofile.replace('-', '_'); | 1417 | ofile = ofile.replace('-', '_'); |
1170 | } else { | 1418 | } else { |
1171 | int hypenfind = ofile.find('-', slashfind); | 1419 | int hypenfind = ofile.find('-', slashfind); |
1172 | while (hypenfind != -1 && slashfind < hypenfind) { | 1420 | while (hypenfind != -1 && slashfind < hypenfind) { |
1173 | ofile = ofile.replace(hypenfind, 1, '_'); | 1421 | ofile = ofile.replace(hypenfind, 1, '_'); |
1174 | hypenfind = ofile.find('-', hypenfind + 1); | 1422 | hypenfind = ofile.find('-', hypenfind + 1); |
1175 | } | 1423 | } |
1176 | } | 1424 | } |
1177 | return ofile; | 1425 | return ofile; |
1178 | } | 1426 | } |
1179 | 1427 | ||
1180 | QString VcprojGenerator::findTemplate(QString file) | 1428 | QString VcprojGenerator::findTemplate(QString file) |
1181 | { | 1429 | { |
1182 | QString ret; | 1430 | QString ret; |
1183 | if(!QFile::exists((ret = file)) && | 1431 | if(!QFile::exists((ret = file)) && |
1184 | !QFile::exists((ret = QString(Option::mkfile::qmakespec + "/" + file))) && | 1432 | !QFile::exists((ret = QString(Option::mkfile::qmakespec + "/" + file))) && |
1185 | !QFile::exists((ret = QString(getenv("QTDIR")) + "/mkspecs/win32-msvc.net/" + file)) && | 1433 | !QFile::exists((ret = QString(getenv("QTDIR")) + "/mkspecs/win32-msvc.net/" + file)) && |
1186 | !QFile::exists((ret = (QString(getenv("HOME")) + "/.tmake/" + file)))) | 1434 | !QFile::exists((ret = (QString(getenv("HOME")) + "/.tmake/" + file)))) |
1187 | return ""; | 1435 | return ""; |
1188 | debug_msg(1, "Generator: MSVC.NET: Found template \'%s\'", ret.latin1() ); | 1436 | debug_msg(1, "Generator: MSVC.NET: Found template \'%s\'", ret.latin1() ); |
1189 | return ret; | 1437 | return ret; |
1190 | } | 1438 | } |
1191 | 1439 | ||
1192 | 1440 | ||
1193 | void VcprojGenerator::processPrlVariable(const QString &var, const QStringList &l) | 1441 | void VcprojGenerator::processPrlVariable(const QString &var, const QStringList &l) |
1194 | { | 1442 | { |
1195 | if(var == "QMAKE_PRL_DEFINES") { | 1443 | if(var == "QMAKE_PRL_DEFINES") { |
1196 | QStringList &out = project->variables()["MSVCPROJ_DEFINES"]; | 1444 | QStringList &out = project->variables()["MSVCPROJ_DEFINES"]; |
1197 | for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { | 1445 | for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { |
1198 | if(out.findIndex((*it)) == -1) | 1446 | if(out.findIndex((*it)) == -1) |
1199 | out.append((" /D " + *it )); | 1447 | out.append((" /D " + *it )); |
1200 | } | 1448 | } |
1201 | } else { | 1449 | } else { |
1202 | MakefileGenerator::processPrlVariable(var, l); | 1450 | MakefileGenerator::processPrlVariable(var, l); |
1203 | } | 1451 | } |
1204 | } | 1452 | } |
1205 | 1453 | ||
1206 | void VcprojGenerator::outputVariables() | 1454 | void VcprojGenerator::outputVariables() |
1207 | { | 1455 | { |
1208 | #if 0 | 1456 | #if 0 |
1209 | qDebug( "Generator: MSVC.NET: List of current variables:" ); | 1457 | qDebug( "Generator: MSVC.NET: List of current variables:" ); |
1210 | for ( QMap<QString, QStringList>::ConstIterator it = project->variables().begin(); it != project->variables().end(); ++it) { | 1458 | for ( QMap<QString, QStringList>::ConstIterator it = project->variables().begin(); it != project->variables().end(); ++it) { |
1211 | qDebug( "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() ); | 1459 | qDebug( "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() ); |
1212 | } | 1460 | } |
1213 | #endif | 1461 | #endif |
1214 | } | 1462 | } |
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index 69e0c02..d1ca666 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h | |||
@@ -1,115 +1,119 @@ | |||
1 | |||
1 | /**************************************************************************** | 2 | /**************************************************************************** |
2 | ** $Id$ | 3 | ** |
3 | ** | 4 | ** |
4 | ** Definition of VcprojGenerator class. | 5 | ** Definition of VcprojGenerator class. |
5 | ** | 6 | ** |
6 | ** Created : 970521 | 7 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
7 | ** | ||
8 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. | ||
9 | ** | 8 | ** |
10 | ** This file is part of the network module of the Qt GUI Toolkit. | 9 | ** This file is part of qmake. |
11 | ** | 10 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 11 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 12 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 13 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 14 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 15 | ** This file may be distributed and/or modified under the terms of the |
17 | ** GNU General Public License version 2 as published by the Free Software | 16 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 17 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 18 | ** packaging of this file. |
20 | ** | 19 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 20 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
22 | ** file in accordance with the Qt Commercial License Agreement provided | 21 | ** file in accordance with the Qt Commercial License Agreement provided |
23 | ** with the Software. | 22 | ** with the Software. |
24 | ** | 23 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 24 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 25 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 26 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 27 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 28 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 29 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 30 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 31 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 32 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 33 | ** not clear to you. |
35 | ** | 34 | ** |
36 | **********************************************************************/ | 35 | **********************************************************************/ |
36 | |||
37 | #ifndef __MSVC_VCPROJ_H__ | 37 | #ifndef __MSVC_VCPROJ_H__ |
38 | #define __MSVC_VCPROJ_H__ | 38 | #define __MSVC_VCPROJ_H__ |
39 | 39 | ||
40 | #include "winmakefile.h" | 40 | #include "winmakefile.h" |
41 | #include "msvc_objectmodel.h" | 41 | #include "msvc_objectmodel.h" |
42 | 42 | ||
43 | enum target { | 43 | enum target { |
44 | Application, | 44 | Application, |
45 | SharedLib, | 45 | SharedLib, |
46 | StaticLib | 46 | StaticLib |
47 | }; | 47 | }; |
48 | 48 | ||
49 | struct QUuid; | 49 | struct QUuid; |
50 | class VcprojGenerator : public Win32MakefileGenerator | 50 | class VcprojGenerator : public Win32MakefileGenerator |
51 | { | 51 | { |
52 | bool init_flag; | 52 | bool init_flag; |
53 | bool writeVcprojParts(QTextStream &); | 53 | bool writeVcprojParts(QTextStream &); |
54 | 54 | ||
55 | bool writeMakefile(QTextStream &); | 55 | bool writeMakefile(QTextStream &); |
56 | virtual void writeSubDirs(QTextStream &t); | 56 | virtual void writeSubDirs(QTextStream &t); |
57 | QString findTemplate(QString file); | 57 | QString findTemplate(QString file); |
58 | void init(); | 58 | void init(); |
59 | 59 | ||
60 | public: | 60 | public: |
61 | VcprojGenerator(QMakeProject *p); | 61 | VcprojGenerator(QMakeProject *p); |
62 | ~VcprojGenerator(); | 62 | ~VcprojGenerator(); |
63 | 63 | ||
64 | QString defaultMakefile() const; | 64 | QString defaultMakefile() const; |
65 | virtual bool doDepends() const { return FALSE; } //never necesary | 65 | virtual bool doDepends() const { return FALSE; } //never necesary |
66 | QString precompH, precompHFilename, | ||
67 | precompObj, precompPch; | ||
68 | bool usePCH; | ||
66 | 69 | ||
67 | protected: | 70 | protected: |
68 | virtual bool openOutput(QFile &file) const; | 71 | virtual bool openOutput(QFile &file) const; |
69 | virtual void processPrlVariable(const QString &, const QStringList &); | 72 | virtual void processPrlVariable(const QString &, const QStringList &); |
70 | virtual bool findLibraries(); | 73 | virtual bool findLibraries(); |
71 | virtual void outputVariables(); | 74 | virtual void outputVariables(); |
72 | QString fixFilename(QString ofile) const; | 75 | QString fixFilename(QString ofile) const; |
73 | 76 | ||
74 | void initOld(); | 77 | void initOld(); |
75 | void initProject(); | 78 | void initProject(); |
76 | void initConfiguration(); | 79 | void initConfiguration(); |
77 | void initCompilerTool(); | 80 | void initCompilerTool(); |
78 | void initLinkerTool(); | 81 | void initLinkerTool(); |
79 | void initLibrarianTool(); | 82 | void initLibrarianTool(); |
80 | void initIDLTool(); | 83 | void initIDLTool(); |
81 | void initCustomBuildTool(); | 84 | void initCustomBuildTool(); |
82 | void initPreBuildEventTools(); | 85 | void initPreBuildEventTools(); |
83 | void initPostBuildEventTools(); | 86 | void initPostBuildEventTools(); |
84 | void initPreLinkEventTools(); | 87 | void initPreLinkEventTools(); |
85 | void initSourceFiles(); | 88 | void initSourceFiles(); |
86 | void initHeaderFiles(); | 89 | void initHeaderFiles(); |
87 | void initMOCFiles(); | 90 | void initMOCFiles(); |
88 | void initUICFiles(); | 91 | void initUICFiles(); |
89 | void initFormsFiles(); | 92 | void initFormsFiles(); |
90 | void initTranslationFiles(); | 93 | void initTranslationFiles(); |
91 | void initLexYaccFiles(); | 94 | void initLexYaccFiles(); |
92 | void initResourceFiles(); | 95 | void initResourceFiles(); |
93 | 96 | ||
94 | VCProject vcProject; | 97 | VCProject vcProject; |
95 | target projectTarget; | 98 | target projectTarget; |
96 | 99 | ||
97 | private: | 100 | private: |
101 | QUuid getProjectUUID(const QString &filename=QString::null); | ||
98 | QUuid increaseUUID(const QUuid &id); | 102 | QUuid increaseUUID(const QUuid &id); |
99 | friend class VCFilter; | 103 | friend class VCFilter; |
100 | }; | 104 | }; |
101 | 105 | ||
102 | inline VcprojGenerator::~VcprojGenerator() | 106 | inline VcprojGenerator::~VcprojGenerator() |
103 | { } | 107 | { } |
104 | 108 | ||
105 | inline QString VcprojGenerator::defaultMakefile() const | 109 | inline QString VcprojGenerator::defaultMakefile() const |
106 | { | 110 | { |
107 | return project->first("TARGET") + project->first("VCPROJ_EXTENSION"); | 111 | return project->first("TARGET") + project->first("VCPROJ_EXTENSION"); |
108 | } | 112 | } |
109 | 113 | ||
110 | inline bool VcprojGenerator::findLibraries() | 114 | inline bool VcprojGenerator::findLibraries() |
111 | { | 115 | { |
112 | return Win32MakefileGenerator::findLibraries("MSVCVCPROJ_LIBS"); | 116 | return Win32MakefileGenerator::findLibraries("MSVCVCPROJ_LIBS"); |
113 | } | 117 | } |
114 | 118 | ||
115 | #endif /* __MSVC_VCPROJ_H__ */ | 119 | #endif /* __MSVC_VCPROJ_H__ */ |
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index bc3fed9..cd733c6 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp | |||
@@ -1,400 +1,475 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of ________ class. | 4 | ** Implementation of Win32MakefileGenerator class. |
5 | ** | 5 | ** |
6 | ** Created : 970521 | 6 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. | 8 | ** This file is part of qmake. |
9 | ** | ||
10 | ** This file is part of the network module of the Qt GUI Toolkit. | ||
11 | ** | 9 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 13 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 14 | ** This file may be distributed and/or modified under the terms of the |
17 | ** GNU General Public License version 2 as published by the Free Software | 15 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 17 | ** packaging of this file. |
20 | ** | 18 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
22 | ** file in accordance with the Qt Commercial License Agreement provided | 20 | ** file in accordance with the Qt Commercial License Agreement provided |
23 | ** with the Software. | 21 | ** with the Software. |
24 | ** | 22 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 25 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 30 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 32 | ** not clear to you. |
35 | ** | 33 | ** |
36 | **********************************************************************/ | 34 | **********************************************************************/ |
37 | 35 | ||
38 | #include "winmakefile.h" | 36 | #include "winmakefile.h" |
39 | #include "option.h" | 37 | #include "option.h" |
40 | #include "project.h" | 38 | #include "project.h" |
39 | #include "meta.h" | ||
41 | #include <qtextstream.h> | 40 | #include <qtextstream.h> |
42 | #include <qstring.h> | 41 | #include <qstring.h> |
43 | #include <qdict.h> | 42 | #include <qdict.h> |
44 | #include <qregexp.h> | 43 | #include <qregexp.h> |
45 | #include <qstringlist.h> | 44 | #include <qstringlist.h> |
46 | #include <qdir.h> | 45 | #include <qdir.h> |
47 | 46 | ||
48 | 47 | ||
49 | Win32MakefileGenerator::Win32MakefileGenerator(QMakeProject *p) : MakefileGenerator(p) | 48 | Win32MakefileGenerator::Win32MakefileGenerator(QMakeProject *p) : MakefileGenerator(p) |
50 | { | 49 | { |
51 | 50 | ||
52 | } | 51 | } |
53 | 52 | ||
54 | 53 | ||
55 | struct SubDir | 54 | struct SubDir |
56 | { | 55 | { |
57 | QString directory, profile, target, makefile; | 56 | QString directory, profile, target, makefile; |
58 | }; | 57 | }; |
59 | 58 | ||
60 | void | 59 | void |
61 | Win32MakefileGenerator::writeSubDirs(QTextStream &t) | 60 | Win32MakefileGenerator::writeSubDirs(QTextStream &t) |
62 | { | 61 | { |
63 | QPtrList<SubDir> subdirs; | 62 | QPtrList<SubDir> subdirs; |
64 | { | 63 | { |
65 | QStringList subdirs_in = project->variables()["SUBDIRS"]; | 64 | QStringList subdirs_in = project->variables()["SUBDIRS"]; |
66 | for(QStringList::Iterator it = subdirs_in.begin(); it != subdirs_in.end(); ++it) { | 65 | for(QStringList::Iterator it = subdirs_in.begin(); it != subdirs_in.end(); ++it) { |
67 | QString file = (*it); | 66 | QString file = (*it); |
68 | file = fileFixify(file); | 67 | file = fileFixify(file); |
69 | SubDir *sd = new SubDir; | 68 | SubDir *sd = new SubDir; |
70 | subdirs.append(sd); | 69 | subdirs.append(sd); |
71 | sd->makefile = "$(MAKEFILE)"; | 70 | sd->makefile = "$(MAKEFILE)"; |
72 | if((*it).right(4) == ".pro") { | 71 | if((*it).right(4) == ".pro") { |
73 | int slsh = file.findRev(Option::dir_sep); | 72 | int slsh = file.findRev(Option::dir_sep); |
74 | if(slsh != -1) { | 73 | if(slsh != -1) { |
75 | sd->directory = file.left(slsh+1); | 74 | sd->directory = file.left(slsh+1); |
76 | sd->profile = file.mid(slsh+1); | 75 | sd->profile = file.mid(slsh+1); |
77 | } else { | 76 | } else { |
78 | sd->profile = file; | 77 | sd->profile = file; |
79 | } | 78 | } |
80 | } else { | 79 | } else { |
81 | sd->directory = file; | 80 | sd->directory = file; |
82 | } | 81 | } |
83 | while(sd->directory.right(1) == Option::dir_sep) | 82 | while(sd->directory.right(1) == Option::dir_sep) |
84 | sd->directory = sd->directory.left(sd->directory.length() - 1); | 83 | sd->directory = sd->directory.left(sd->directory.length() - 1); |
85 | if(!sd->profile.isEmpty()) { | 84 | if(!sd->profile.isEmpty()) { |
86 | QString basename = sd->directory; | 85 | QString basename = sd->directory; |
87 | int new_slsh = basename.findRev(Option::dir_sep); | 86 | int new_slsh = basename.findRev(Option::dir_sep); |
88 | if(new_slsh != -1) | 87 | if(new_slsh != -1) |
89 | basename = basename.mid(new_slsh+1); | 88 | basename = basename.mid(new_slsh+1); |
90 | if(sd->profile != basename + ".pro") | 89 | if(sd->profile != basename + ".pro") |
91 | sd->makefile += "." + sd->profile.left(sd->profile.length() - 4); //no need for the .pro | 90 | sd->makefile += "." + sd->profile.left(sd->profile.length() - 4); //no need for the .pro |
92 | } | 91 | } |
93 | sd->target = "sub-" + (*it); | 92 | sd->target = "sub-" + (*it); |
94 | sd->target.replace('/', '-'); | 93 | sd->target.replace('/', '-'); |
95 | sd->target.replace('.', '_'); | 94 | sd->target.replace('.', '_'); |
96 | } | 95 | } |
97 | } | 96 | } |
98 | QPtrListIterator<SubDir> it(subdirs); | 97 | QPtrListIterator<SubDir> it(subdirs); |
99 | 98 | ||
100 | if(!project->isEmpty("MAKEFILE")) | 99 | t << "MAKEFILE = " << (project->isEmpty("MAKEFILE") ? QString("Makefile") : var("MAKEFILE")) << endl; |
101 | t << "MAKEFILE=" << var("MAKEFILE") << endl; | ||
102 | t << "QMAKE =" << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl; | 100 | t << "QMAKE =" << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl; |
103 | t << "SUBTARGETS= "; | 101 | t << "SUBTARGETS= "; |
104 | for( it.toFirst(); it.current(); ++it) | 102 | for( it.toFirst(); it.current(); ++it) |
105 | t << " \\\n\t\t" << it.current()->target; | 103 | t << " \\\n\t\t" << it.current()->target; |
106 | t << endl << endl; | 104 | t << endl << endl; |
107 | t << "all: qmake_all $(SUBTARGETS)" << endl << endl; | 105 | t << "all: $(MAKEFILE) $(SUBTARGETS)" << endl << endl; |
108 | 106 | ||
109 | for( it.toFirst(); it.current(); ++it) { | 107 | for( it.toFirst(); it.current(); ++it) { |
110 | bool have_dir = !(*it)->directory.isEmpty(); | 108 | bool have_dir = !(*it)->directory.isEmpty(); |
111 | 109 | ||
112 | //make the makefile | 110 | //make the makefile |
113 | QString mkfile = (*it)->makefile; | 111 | QString mkfile = (*it)->makefile; |
114 | if(have_dir) | 112 | if(have_dir) |
115 | mkfile.prepend((*it)->directory + Option::dir_sep); | 113 | mkfile.prepend((*it)->directory + Option::dir_sep); |
116 | t << mkfile << ":"; | 114 | t << mkfile << ":"; |
117 | if(project->variables()["QMAKE_NOFORCE"].isEmpty()) | ||
118 | t << " FORCE"; | ||
119 | if(have_dir) | 115 | if(have_dir) |
120 | t << "\n\t" << "cd " << (*it)->directory; | 116 | t << "\n\t" << "cd " << (*it)->directory; |
121 | t << "\n\t" << "$(QMAKE) " << (*it)->profile << " " << buildArgs(); | 117 | t << "\n\t" << "$(QMAKE) " << (*it)->profile << " " << buildArgs(); |
122 | t << " -o " << (*it)->makefile; | 118 | t << " -o " << (*it)->makefile; |
123 | if(have_dir) { | 119 | if(have_dir) { |
124 | int subLevels = it.current()->directory.contains(Option::dir_sep) + 1; | 120 | int subLevels = it.current()->directory.contains(Option::dir_sep) + 1; |
125 | t << "\n\t" << "@cd .."; | 121 | t << "\n\t" << "@cd .."; |
126 | for(int i = 1; i < subLevels; i++ ) | 122 | for(int i = 1; i < subLevels; i++ ) |
127 | t << Option::dir_sep << ".."; | 123 | t << Option::dir_sep << ".."; |
128 | } | 124 | } |
129 | t << endl; | 125 | t << endl; |
130 | 126 | ||
131 | //now actually build | 127 | //now actually build |
132 | t << (*it)->target << ": " << mkfile; | 128 | t << (*it)->target << ": " << mkfile; |
133 | if(project->variables()["QMAKE_NOFORCE"].isEmpty()) | 129 | if(project->variables()["QMAKE_NOFORCE"].isEmpty()) |
134 | t << " FORCE"; | 130 | t << " FORCE"; |
135 | if(have_dir) | 131 | if(have_dir) |
136 | t << "\n\t" << "cd " << (*it)->directory; | 132 | t << "\n\t" << "cd " << (*it)->directory; |
137 | t << "\n\t" << "$(MAKE)"; | 133 | t << "\n\t" << "$(MAKE)"; |
138 | t << " -f " << (*it)->makefile; | 134 | t << " -f " << (*it)->makefile; |
139 | if(have_dir) { | 135 | if(have_dir) { |
140 | int subLevels = it.current()->directory.contains(Option::dir_sep) + 1; | 136 | int subLevels = it.current()->directory.contains(Option::dir_sep) + 1; |
141 | t << "\n\t" << "@cd .."; | 137 | t << "\n\t" << "@cd .."; |
142 | for(int i = 1; i < subLevels; i++ ) | 138 | for(int i = 1; i < subLevels; i++ ) |
143 | t << Option::dir_sep << ".."; | 139 | t << Option::dir_sep << ".."; |
144 | } | 140 | } |
145 | t << endl << endl; | 141 | t << endl << endl; |
146 | } | 142 | } |
147 | 143 | ||
144 | if (project->isActiveConfig("ordered")) { // generate dependencies | ||
145 | for( it.toFirst(); it.current(); ) { | ||
146 | QString tar = it.current()->target; | ||
147 | ++it; | ||
148 | if (it.current()) | ||
149 | t << it.current()->target << ": " << tar << endl; | ||
150 | } | ||
151 | t << endl; | ||
152 | } | ||
153 | |||
148 | if(project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].findIndex("qmake_all") == -1) | 154 | if(project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].findIndex("qmake_all") == -1) |
149 | project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].append("qmake_all"); | 155 | project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].append("qmake_all"); |
150 | writeMakeQmake(t); | 156 | writeMakeQmake(t); |
151 | 157 | ||
152 | t << "qmake_all:"; | 158 | t << "qmake_all:"; |
153 | if ( !subdirs.isEmpty() ) { | 159 | if ( !subdirs.isEmpty() ) { |
154 | for( it.toFirst(); it.current(); ++it) { | 160 | for( it.toFirst(); it.current(); ++it) { |
155 | QString subdir = (*it)->directory; | 161 | QString subdir = (*it)->directory; |
156 | QString profile = (*it)->profile; | 162 | QString profile = (*it)->profile; |
157 | int subLevels = subdir.contains(Option::dir_sep) + 1; | 163 | int subLevels = subdir.contains(Option::dir_sep) + 1; |
158 | t << "\n\t" | 164 | t << "\n\t" |
159 | << "cd " << subdir << "\n\t"; | 165 | << "cd " << subdir << "\n\t"; |
160 | int lastSlash = subdir.findRev(Option::dir_sep); | 166 | int lastSlash = subdir.findRev(Option::dir_sep); |
161 | if(lastSlash != -1) | 167 | if(lastSlash != -1) |
162 | subdir = subdir.mid( lastSlash + 1 ); | 168 | subdir = subdir.mid( lastSlash + 1 ); |
163 | t << "$(QMAKE) " | 169 | t << "$(QMAKE) " |
164 | << ( !profile.isEmpty() ? profile : subdir + ".pro" ) | 170 | << ( !profile.isEmpty() ? profile : subdir + ".pro" ) |
165 | << " -o " << (*it)->makefile | 171 | << " -o " << (*it)->makefile |
166 | << " " << buildArgs() << "\n\t" | 172 | << " " << buildArgs() << "\n\t" |
167 | << "@cd .."; | 173 | << "@cd .."; |
168 | for(int i = 1; i < subLevels; i++ ) | 174 | for(int i = 1; i < subLevels; i++ ) |
169 | t << Option::dir_sep << ".."; | 175 | t << Option::dir_sep << ".."; |
170 | } | 176 | } |
171 | } else { | 177 | } else { |
172 | // Borland make does not like empty an empty command section, so insert | 178 | // Borland make does not like empty an empty command section, so insert |
173 | // a dummy command. | 179 | // a dummy command. |
174 | t << "\n\t" << "@cd ."; | 180 | t << "\n\t" << "@cd ."; |
175 | } | 181 | } |
176 | t << endl << endl; | 182 | t << endl << endl; |
177 | 183 | ||
178 | QString targs[] = { QString("clean"), QString("install"), QString("mocclean"), QString::null }; | 184 | QStringList targs; |
179 | for(int x = 0; targs[x] != QString::null; x++) { | 185 | targs << "clean" << "install_subdirs" << "mocables" << "uicables" << "uiclean" << "mocclean"; |
180 | t << targs[x] << ": qmake_all"; | 186 | targs += project->values("SUBDIR_TARGETS"); |
181 | if(targs[x] == "clean") | 187 | for(QStringList::Iterator targ_it = targs.begin(); targ_it != targs.end(); ++targ_it) { |
182 | t << varGlue("QMAKE_CLEAN","\n\t-del ","\n\t-del ", ""); | 188 | t << (*targ_it) << ": qmake_all"; |
189 | QString targ = (*targ_it); | ||
190 | if(targ == "install_subdirs") | ||
191 | targ = "install"; | ||
192 | else if(targ == "uninstall_subdirs") | ||
193 | targ = "uninstall"; | ||
194 | if(targ == "clean") | ||
195 | t << varGlue("QMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ", ""); | ||
183 | if (!subdirs.isEmpty()) { | 196 | if (!subdirs.isEmpty()) { |
184 | for( it.toFirst(); it.current(); ++it) { | 197 | for( it.toFirst(); it.current(); ++it) { |
185 | int subLevels = (*it)->directory.contains(Option::dir_sep) + 1; | 198 | int subLevels = (*it)->directory.contains(Option::dir_sep) + 1; |
186 | bool have_dir = !(*it)->directory.isEmpty(); | 199 | bool have_dir = !(*it)->directory.isEmpty(); |
187 | if(have_dir) | 200 | if(have_dir) |
188 | t << "\n\t" << "cd " << (*it)->directory; | 201 | t << "\n\t" << "cd " << (*it)->directory; |
189 | QString in_file = " -f " + (*it)->makefile; | 202 | QString in_file = " -f " + (*it)->makefile; |
190 | t << "\n\t" << "$(MAKE) " << in_file << " " << targs[x]; | 203 | t << "\n\t" << "$(MAKE) " << in_file << " " << targ; |
191 | if(have_dir) { | 204 | if(have_dir) { |
192 | t << "\n\t" << "@cd .."; | 205 | t << "\n\t" << "@cd .."; |
193 | for(int i = 1; i < subLevels; i++ ) | 206 | for(int i = 1; i < subLevels; i++ ) |
194 | t << Option::dir_sep << ".."; | 207 | t << Option::dir_sep << ".."; |
195 | } | 208 | } |
196 | } | 209 | } |
197 | } else { | 210 | } else { |
198 | // Borland make does not like empty an empty command section, so | 211 | // Borland make does not like empty an empty command section, so |
199 | // insert a dummy command. | 212 | // insert a dummy command. |
200 | t << "\n\t" << "@cd ."; | 213 | t << "\n\t" << "@cd ."; |
201 | } | 214 | } |
202 | t << endl << endl; | 215 | t << endl << endl; |
203 | } | 216 | } |
204 | 217 | ||
218 | //installations | ||
219 | project->variables()["INSTALLDEPS"] += "install_subdirs"; | ||
220 | project->variables()["UNINSTALLDEPS"] += "uninstall_subdirs"; | ||
221 | writeInstalls(t, "INSTALLS"); | ||
222 | |||
223 | // user defined targets | ||
224 | QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"]; | ||
225 | for(QStringList::Iterator sit = qut.begin(); sit != qut.end(); ++sit) { | ||
226 | QString targ = var((*sit) + ".target"), | ||
227 | cmd = var((*sit) + ".commands"), deps; | ||
228 | if(targ.isEmpty()) | ||
229 | targ = (*sit); | ||
230 | QStringList &deplist = project->variables()[(*sit) + ".depends"]; | ||
231 | for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) { | ||
232 | QString dep = var((*dep_it) + ".target"); | ||
233 | if(dep.isEmpty()) | ||
234 | dep = (*dep_it); | ||
235 | deps += " " + dep; | ||
236 | } | ||
237 | if(!project->variables()["QMAKE_NOFORCE"].isEmpty() && | ||
238 | project->variables()[(*sit) + ".CONFIG"].findIndex("phony") != -1) | ||
239 | deps += QString(" ") + "FORCE"; | ||
240 | t << "\n\n" << targ << ":" << deps << "\n\t" | ||
241 | << cmd; | ||
242 | } | ||
243 | |||
205 | if(project->variables()["QMAKE_NOFORCE"].isEmpty()) | 244 | if(project->variables()["QMAKE_NOFORCE"].isEmpty()) |
206 | t << "FORCE:" << endl << endl; | 245 | t << "FORCE:" << endl << endl; |
207 | } | 246 | } |
208 | 247 | ||
209 | 248 | ||
210 | int | 249 | int |
211 | Win32MakefileGenerator::findHighestVersion(const QString &d, const QString &stem) | 250 | Win32MakefileGenerator::findHighestVersion(const QString &d, const QString &stem) |
212 | { | 251 | { |
213 | QString bd = Option::fixPathToLocalOS(d, TRUE); | 252 | QString bd = Option::fixPathToLocalOS(d, TRUE); |
214 | if(!QFile::exists(bd)) | 253 | if(!QFile::exists(bd)) |
215 | return -1; | 254 | return -1; |
216 | if(!project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].isEmpty()) | 255 | if(!project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].isEmpty()) |
217 | return project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].first().toInt(); | 256 | return project->variables()["QMAKE_" + stem.upper() + "_VERSION_OVERRIDE"].first().toInt(); |
218 | 257 | ||
219 | QDir dir(bd); | 258 | QDir dir(bd); |
220 | int biggest=-1; | 259 | int biggest=-1; |
221 | QStringList entries = dir.entryList(); | 260 | QStringList entries = dir.entryList(); |
222 | QString dllStem = stem + QTDLL_POSTFIX; | 261 | QString dllStem = stem + QTDLL_POSTFIX; |
223 | QRegExp regx( "(" + dllStem + "([0-9]*)).lib", FALSE ); | 262 | QRegExp regx( "(" + dllStem + "([0-9]*)).lib", FALSE ); |
224 | for(QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { | 263 | for(QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { |
225 | if(regx.exactMatch((*it))) | 264 | if(regx.exactMatch((*it))) |
226 | biggest = QMAX(biggest, (regx.cap(1) == dllStem || | 265 | biggest = QMAX(biggest, (regx.cap(1) == dllStem || |
227 | regx.cap(2).isEmpty()) ? -1 : regx.cap(2).toInt()); | 266 | regx.cap(2).isEmpty()) ? -1 : regx.cap(2).toInt()); |
228 | } | 267 | } |
229 | if(dir.exists(dllStem + Option::prl_ext)) { | 268 | QMakeMetaInfo libinfo; |
230 | QMakeProject proj; | 269 | if(libinfo.readLib(bd + dllStem)) { |
231 | if(proj.read(bd + dllStem + Option::prl_ext, QDir::currentDirPath(), TRUE)) { | 270 | if(!libinfo.isEmpty("QMAKE_PRL_VERSION")) |
232 | if(!proj.isEmpty("QMAKE_PRL_VERSION")) | 271 | biggest = QMAX(biggest, libinfo.first("QMAKE_PRL_VERSION").replace(".", "").toInt()); |
233 | biggest = QMAX(biggest, proj.first("QMAKE_PRL_VERSION").replace(".", "").toInt()); | ||
234 | } | ||
235 | } | 272 | } |
236 | return biggest; | 273 | return biggest; |
237 | } | 274 | } |
238 | 275 | ||
276 | QString | ||
277 | Win32MakefileGenerator::findDependency(const QString &dep) | ||
278 | { | ||
279 | { | ||
280 | QStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"]; | ||
281 | for(QStringList::Iterator it = qut.begin(); it != qut.end(); ++it) { | ||
282 | QString targ = var((*it) + ".target"); | ||
283 | if(targ.isEmpty()) | ||
284 | targ = (*it); | ||
285 | if(targ.endsWith(dep)) | ||
286 | return targ; | ||
287 | } | ||
288 | } | ||
289 | { | ||
290 | QStringList &quc = project->variables()["QMAKE_EXTRA_WIN_COMPILERS"]; | ||
291 | for(QStringList::Iterator it = quc.begin(); it != quc.end(); ++it) { | ||
292 | QString tmp_out = project->variables()[(*it) + ".output"].first(); | ||
293 | QString tmp_cmd = project->variables()[(*it) + ".commands"].join(" "); | ||
294 | if(tmp_out.isEmpty() || tmp_cmd.isEmpty()) | ||
295 | continue; | ||
296 | QStringList &tmp = project->variables()[(*it) + ".input"]; | ||
297 | for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) { | ||
298 | QStringList &inputs = project->variables()[(*it2)]; | ||
299 | for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) { | ||
300 | QString out = tmp_out; | ||
301 | QFileInfo fi(Option::fixPathToLocalOS((*input))); | ||
302 | out.replace("${QMAKE_FILE_BASE}", fi.baseName()); | ||
303 | out.replace("${QMAKE_FILE_NAME}", fi.fileName()); | ||
304 | if(out.endsWith(dep)) | ||
305 | return out; | ||
306 | } | ||
307 | } | ||
308 | } | ||
309 | } | ||
310 | return MakefileGenerator::findDependency(dep); | ||
311 | } | ||
239 | 312 | ||
240 | bool | 313 | bool |
241 | Win32MakefileGenerator::findLibraries(const QString &where) | 314 | Win32MakefileGenerator::findLibraries(const QString &where) |
242 | { | 315 | { |
243 | 316 | ||
244 | QStringList &l = project->variables()[where]; | 317 | QStringList &l = project->variables()[where]; |
245 | QPtrList<MakefileDependDir> dirs; | 318 | QPtrList<MakefileDependDir> dirs; |
246 | { | 319 | { |
247 | QStringList &libpaths = project->variables()["QMAKE_LIBDIR"]; | 320 | QStringList &libpaths = project->variables()["QMAKE_LIBDIR"]; |
248 | for(QStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) { | 321 | for(QStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) { |
249 | QString r = (*libpathit), l = r; | 322 | QString r = (*libpathit), l = r; |
250 | fixEnvVariables(l); | 323 | fixEnvVariables(l); |
251 | dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"",""))); | 324 | dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"",""))); |
252 | } | 325 | } |
253 | } | 326 | } |
254 | dirs.setAutoDelete(TRUE); | 327 | dirs.setAutoDelete(TRUE); |
255 | for(QStringList::Iterator it = l.begin(); it != l.end(); ) { | 328 | for(QStringList::Iterator it = l.begin(); it != l.end(); ) { |
256 | QChar quote; | 329 | QChar quote; |
257 | bool modified_opt = FALSE, remove = FALSE; | 330 | bool modified_opt = FALSE, remove = FALSE; |
258 | QString opt = (*it).stripWhiteSpace(); | 331 | QString opt = (*it).stripWhiteSpace(); |
259 | if((opt[0] == '\'' || opt[0] == '"') && opt[(int)opt.length()-1] == opt[0]) { | 332 | if((opt[0] == '\'' || opt[0] == '"') && opt[(int)opt.length()-1] == opt[0]) { |
260 | quote = opt[0]; | 333 | quote = opt[0]; |
261 | opt = opt.mid(1, opt.length()-2); | 334 | opt = opt.mid(1, opt.length()-2); |
262 | } | 335 | } |
263 | if(opt.startsWith("/LIBPATH:")) { | 336 | if(opt.startsWith("/LIBPATH:")) { |
264 | QString r = opt.mid(9), l = Option::fixPathToLocalOS(r); | 337 | QString r = opt.mid(9), l = Option::fixPathToLocalOS(r); |
265 | dirs.append(new MakefileDependDir(r.replace("\"",""), | 338 | dirs.append(new MakefileDependDir(r.replace("\"",""), |
266 | l.replace("\"",""))); | 339 | l.replace("\"",""))); |
267 | } else if(opt.startsWith("-L") || opt.startsWith("/L")) { | 340 | } else if(opt.startsWith("-L") || opt.startsWith("/L")) { |
268 | QString r = opt.mid(2), l = Option::fixPathToLocalOS(r); | 341 | QString r = opt.mid(2), l = Option::fixPathToLocalOS(r); |
269 | dirs.append(new MakefileDependDir(r.replace("\"",""), | 342 | dirs.append(new MakefileDependDir(r.replace("\"",""), |
270 | l.replace("\"",""))); | 343 | l.replace("\"",""))); |
271 | remove = TRUE; //we eat this switch | 344 | remove = TRUE; //we eat this switch |
272 | } else if(opt.startsWith("-l") || opt.startsWith("/l")) { | 345 | } else if(opt.startsWith("-l") || opt.startsWith("/l")) { |
273 | QString lib = opt.right(opt.length() - 2), out; | 346 | QString lib = opt.right(opt.length() - 2), out; |
274 | if(!lib.isEmpty()) { | 347 | if(!lib.isEmpty()) { |
275 | for(MakefileDependDir *mdd = dirs.first(); mdd; mdd = dirs.next() ) { | 348 | for(MakefileDependDir *mdd = dirs.first(); mdd; mdd = dirs.next() ) { |
276 | QString extension; | 349 | QString extension; |
277 | int ver = findHighestVersion(mdd->local_dir, lib); | 350 | int ver = findHighestVersion(mdd->local_dir, lib); |
278 | if(ver > 0) | 351 | if(ver > 0) |
279 | extension += QString::number(ver); | 352 | extension += QString::number(ver); |
280 | extension += ".lib"; | 353 | extension += ".lib"; |
281 | if(QFile::exists(mdd->local_dir + Option::dir_sep + lib + Option::prl_ext) || | 354 | if(QMakeMetaInfo::libExists(mdd->local_dir + Option::dir_sep + lib) || |
282 | QFile::exists(mdd->local_dir + Option::dir_sep + lib + extension)) { | 355 | QFile::exists(mdd->local_dir + Option::dir_sep + lib + extension)) { |
283 | out = mdd->real_dir + Option::dir_sep + lib + extension; | 356 | out = mdd->real_dir + Option::dir_sep + lib + extension; |
284 | break; | 357 | break; |
285 | } | 358 | } |
286 | } | 359 | } |
287 | } | 360 | } |
288 | if(out.isEmpty()) { | 361 | if(out.isEmpty()) { |
289 | remove = TRUE; //just eat it since we cannot find one.. | 362 | remove = TRUE; //just eat it since we cannot find one.. |
290 | } else { | 363 | } else { |
291 | modified_opt = TRUE; | 364 | modified_opt = TRUE; |
292 | (*it) = out; | 365 | (*it) = out; |
293 | } | 366 | } |
294 | } else if(!QFile::exists(Option::fixPathToLocalOS(opt))) { | 367 | } else if(!QFile::exists(Option::fixPathToLocalOS(opt))) { |
295 | QPtrList<MakefileDependDir> lib_dirs; | 368 | QPtrList<MakefileDependDir> lib_dirs; |
296 | QString file = opt; | 369 | QString file = opt; |
297 | int slsh = file.findRev(Option::dir_sep); | 370 | int slsh = file.findRev(Option::dir_sep); |
298 | if(slsh != -1) { | 371 | if(slsh != -1) { |
299 | QString r = file.left(slsh+1), l = r; | 372 | QString r = file.left(slsh+1), l = r; |
300 | fixEnvVariables(l); | 373 | fixEnvVariables(l); |
301 | lib_dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"",""))); | 374 | lib_dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"",""))); |
302 | file = file.right(file.length() - slsh - 1); | 375 | file = file.right(file.length() - slsh - 1); |
303 | } else { | 376 | } else { |
304 | lib_dirs = dirs; | 377 | lib_dirs = dirs; |
305 | } | 378 | } |
306 | if(file.endsWith(".lib")) { | 379 | if (!project->variables()["QMAKE_QT_DLL"].isEmpty()) { |
307 | file = file.left(file.length() - 4); | 380 | if(file.endsWith(".lib")) { |
308 | if(!file.at(file.length()-1).isNumber()) { | 381 | file = file.left(file.length() - 4); |
309 | for(MakefileDependDir *mdd = lib_dirs.first(); mdd; mdd = lib_dirs.next() ) { | 382 | if(!file.at(file.length()-1).isNumber()) { |
310 | QString lib_tmpl(file + "%1" + ".lib"); | 383 | for(MakefileDependDir *mdd = lib_dirs.first(); mdd; mdd = lib_dirs.next() ) { |
311 | int ver = findHighestVersion(mdd->local_dir, file); | 384 | QString lib_tmpl(file + "%1" + ".lib"); |
312 | if(ver != -1) { | 385 | int ver = findHighestVersion(mdd->local_dir, file); |
313 | if(ver) | 386 | if(ver != -1) { |
314 | lib_tmpl = lib_tmpl.arg(ver); | 387 | if(ver) |
315 | else | 388 | lib_tmpl = lib_tmpl.arg(ver); |
316 | lib_tmpl = lib_tmpl.arg(""); | 389 | else |
317 | if(slsh != -1) { | 390 | lib_tmpl = lib_tmpl.arg(""); |
318 | QString dir = mdd->real_dir; | 391 | if(slsh != -1) { |
319 | if(!dir.endsWith(Option::dir_sep)) | 392 | QString dir = mdd->real_dir; |
320 | dir += Option::dir_sep; | 393 | if(!dir.endsWith(Option::dir_sep)) |
321 | lib_tmpl.prepend(dir); | 394 | dir += Option::dir_sep; |
395 | lib_tmpl.prepend(dir); | ||
396 | } | ||
397 | modified_opt = TRUE; | ||
398 | (*it) = lib_tmpl; | ||
399 | break; | ||
322 | } | 400 | } |
323 | modified_opt = TRUE; | ||
324 | (*it) = lib_tmpl; | ||
325 | break; | ||
326 | } | 401 | } |
327 | } | 402 | } |
328 | } | 403 | } |
329 | } | 404 | } |
330 | } | 405 | } |
331 | if(remove) { | 406 | if(remove) { |
332 | it = l.remove(it); | 407 | it = l.remove(it); |
333 | } else { | 408 | } else { |
334 | if(!quote.isNull() && modified_opt) | 409 | if(!quote.isNull() && modified_opt) |
335 | (*it) = quote + (*it) + quote; | 410 | (*it) = quote + (*it) + quote; |
336 | ++it; | 411 | ++it; |
337 | } | 412 | } |
338 | } | 413 | } |
339 | return TRUE; | 414 | return TRUE; |
340 | } | 415 | } |
341 | 416 | ||
342 | void | 417 | void |
343 | Win32MakefileGenerator::processPrlFiles() | 418 | Win32MakefileGenerator::processPrlFiles() |
344 | { | 419 | { |
345 | QDict<void> processed; | 420 | QDict<void> processed; |
346 | QPtrList<MakefileDependDir> libdirs; | 421 | QPtrList<MakefileDependDir> libdirs; |
347 | libdirs.setAutoDelete(TRUE); | 422 | libdirs.setAutoDelete(TRUE); |
348 | { | 423 | { |
349 | QStringList &libpaths = project->variables()["QMAKE_LIBDIR"]; | 424 | QStringList &libpaths = project->variables()["QMAKE_LIBDIR"]; |
350 | for(QStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) { | 425 | for(QStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) { |
351 | QString r = (*libpathit), l = r; | 426 | QString r = (*libpathit), l = r; |
352 | fixEnvVariables(l); | 427 | fixEnvVariables(l); |
353 | libdirs.append(new MakefileDependDir(r.replace("\"",""), | 428 | libdirs.append(new MakefileDependDir(r.replace("\"",""), |
354 | l.replace("\"",""))); | 429 | l.replace("\"",""))); |
355 | } | 430 | } |
356 | } | 431 | } |
357 | for(bool ret = FALSE; TRUE; ret = FALSE) { | 432 | for(bool ret = FALSE; TRUE; ret = FALSE) { |
358 | //read in any prl files included.. | 433 | //read in any prl files included.. |
359 | QStringList l_out; | 434 | QStringList l_out; |
360 | QString where = "QMAKE_LIBS"; | 435 | QString where = "QMAKE_LIBS"; |
361 | if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) | 436 | if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) |
362 | where = project->first("QMAKE_INTERNAL_PRL_LIBS"); | 437 | where = project->first("QMAKE_INTERNAL_PRL_LIBS"); |
363 | QStringList &l = project->variables()[where]; | 438 | QStringList &l = project->variables()[where]; |
364 | for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) { | 439 | for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) { |
365 | QString opt = (*it); | 440 | QString opt = (*it); |
366 | if(opt.startsWith("/")) { | 441 | if(opt.startsWith("/")) { |
367 | if(opt.startsWith("/LIBPATH:")) { | 442 | if(opt.startsWith("/LIBPATH:")) { |
368 | QString r = opt.mid(9), l = r; | 443 | QString r = opt.mid(9), l = r; |
369 | fixEnvVariables(l); | 444 | fixEnvVariables(l); |
370 | libdirs.append(new MakefileDependDir(r.replace("\"",""), | 445 | libdirs.append(new MakefileDependDir(r.replace("\"",""), |
371 | l.replace("\"",""))); | 446 | l.replace("\"",""))); |
372 | } | 447 | } |
373 | } else { | 448 | } else { |
374 | if(!processed[opt]) { | 449 | if(!processed[opt]) { |
375 | if(processPrlFile(opt)) { | 450 | if(processPrlFile(opt)) { |
376 | processed.insert(opt, (void*)1); | 451 | processed.insert(opt, (void*)1); |
377 | ret = TRUE; | 452 | ret = TRUE; |
378 | } else { | 453 | } else { |
379 | for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) { | 454 | for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) { |
380 | QString prl = mdd->local_dir + Option::dir_sep + opt; | 455 | QString prl = mdd->local_dir + Option::dir_sep + opt; |
381 | if(processed[prl]) { | 456 | if(processed[prl]) { |
382 | break; | 457 | break; |
383 | } else if(processPrlFile(prl)) { | 458 | } else if(processPrlFile(prl)) { |
384 | processed.insert(prl, (void*)1); | 459 | processed.insert(prl, (void*)1); |
385 | ret = TRUE; | 460 | ret = TRUE; |
386 | break; | 461 | break; |
387 | } | 462 | } |
388 | } | 463 | } |
389 | } | 464 | } |
390 | } | 465 | } |
391 | } | 466 | } |
392 | if(!opt.isEmpty()) | 467 | if(!opt.isEmpty()) |
393 | l_out.append(opt); | 468 | l_out.append(opt); |
394 | } | 469 | } |
395 | if(ret) | 470 | if(ret) |
396 | l = l_out; | 471 | l = l_out; |
397 | else | 472 | else |
398 | break; | 473 | break; |
399 | } | 474 | } |
400 | } | 475 | } |
diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h index 75ba0e0..dac4a99 100644 --- a/qmake/generators/win32/winmakefile.h +++ b/qmake/generators/win32/winmakefile.h | |||
@@ -1,72 +1,72 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Definition of ________ class. | 4 | ** Definition of Win32MakefileGenerator class. |
5 | ** | 5 | ** |
6 | ** Created : 970521 | 6 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. | 8 | ** This file is part of qmake. |
9 | ** | ||
10 | ** This file is part of the network module of the Qt GUI Toolkit. | ||
11 | ** | 9 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 10 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 13 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 14 | ** This file may be distributed and/or modified under the terms of the |
17 | ** GNU General Public License version 2 as published by the Free Software | 15 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 17 | ** packaging of this file. |
20 | ** | 18 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition licenses may use this | 19 | ** Licensees holding valid Qt Enterprise Edition licenses may use this |
22 | ** file in accordance with the Qt Commercial License Agreement provided | 20 | ** file in accordance with the Qt Commercial License Agreement provided |
23 | ** with the Software. | 21 | ** with the Software. |
24 | ** | 22 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 25 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 30 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 32 | ** not clear to you. |
35 | ** | 33 | ** |
36 | **********************************************************************/ | 34 | **********************************************************************/ |
35 | |||
37 | #ifndef __WINMAKEFILE_H__ | 36 | #ifndef __WINMAKEFILE_H__ |
38 | #define __WINMAKEFILE_H__ | 37 | #define __WINMAKEFILE_H__ |
39 | 38 | ||
40 | #include "makefile.h" | 39 | #include "makefile.h" |
41 | 40 | ||
42 | // In the Qt evaluation and educational version, we have a postfix in the | 41 | // In the Qt evaluation and educational version, we have a postfix in the |
43 | // library name (e.g. qtmteval301.dll). QTDLL_POSTFIX is used for this. | 42 | // library name (e.g. qtmteval301.dll). QTDLL_POSTFIX is used for this. |
44 | // A script modifies these lines when building eval/edu version, so be careful | 43 | // A script modifies these lines when building eval/edu version, so be careful |
45 | // when changing them. | 44 | // when changing them. |
46 | #ifndef QTDLL_POSTFIX | 45 | #ifndef QTDLL_POSTFIX |
47 | #define QTDLL_POSTFIX "" | 46 | #define QTDLL_POSTFIX "" |
48 | #endif | 47 | #endif |
49 | 48 | ||
50 | class Win32MakefileGenerator : public MakefileGenerator | 49 | class Win32MakefileGenerator : public MakefileGenerator |
51 | { | 50 | { |
52 | protected: | 51 | protected: |
53 | virtual void writeSubDirs(QTextStream &t); | 52 | virtual void writeSubDirs(QTextStream &t); |
54 | int findHighestVersion(const QString &dir, const QString &stem); | 53 | int findHighestVersion(const QString &dir, const QString &stem); |
55 | bool findLibraries(const QString &); | 54 | bool findLibraries(const QString &); |
55 | QString findDependency(const QString &); | ||
56 | virtual bool findLibraries(); | 56 | virtual bool findLibraries(); |
57 | virtual void processPrlFiles(); | 57 | virtual void processPrlFiles(); |
58 | 58 | ||
59 | public: | 59 | public: |
60 | Win32MakefileGenerator(QMakeProject *p); | 60 | Win32MakefileGenerator(QMakeProject *p); |
61 | ~Win32MakefileGenerator(); | 61 | ~Win32MakefileGenerator(); |
62 | }; | 62 | }; |
63 | 63 | ||
64 | inline Win32MakefileGenerator::~Win32MakefileGenerator() | 64 | inline Win32MakefileGenerator::~Win32MakefileGenerator() |
65 | { } | 65 | { } |
66 | 66 | ||
67 | inline bool Win32MakefileGenerator::findLibraries() | 67 | inline bool Win32MakefileGenerator::findLibraries() |
68 | { return findLibraries("QMAKE_LIBS"); } | 68 | { return findLibraries("QMAKE_LIBS"); } |
69 | 69 | ||
70 | 70 | ||
71 | 71 | ||
72 | #endif /* __WINMAKEFILE_H__ */ | 72 | #endif /* __WINMAKEFILE_H__ */ |