Pastebin launched a little side project called VERYVIRAL.com, check it out ;-) Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on Sep 21st, 2011  |  syntax: Diff  |  size: 16.59 KB  |  views: 48  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. From e62e3fac05fad31d5d553d5444c2c24a866b82d9 Mon Sep 17 00:00:00 2001
  2. From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
  3. Date: Fri, 24 Jun 2011 17:59:25 +0200
  4. Subject: [PATCH] merge Makefile.win32-g++{,-sh}
  5.  
  6. this boils down to configure generating a different copy command.
  7. and as we already have that, make the nmake file use that as well.
  8. ---
  9. qmake/Makefile.win32             |    2 +-
  10.  qmake/Makefile.win32-g++         |    4 +-
  11.  qmake/Makefile.win32-g++-sh      |  359 --------------------------------------
  12.  tools/configure/configureapp.cpp |   12 +-
  13.  4 files changed, 9 insertions(+), 368 deletions(-)
  14.  delete mode 100644 qmake/Makefile.win32-g++-sh
  15.  
  16. diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
  17. index d40000e..31d2797 100644
  18. --- a/qmake/Makefile.win32
  19. +++ b/qmake/Makefile.win32
  20. @@ -127,7 +127,7 @@ first all: qmake.exe
  21.  
  22.  qmake.exe: $(OBJS) $(QTOBJS)
  23.         $(LINKQMAKE) qmake_pch.obj
  24. -       -copy qmake.exe $(BUILD_PATH)\bin\qmake.exe
  25. +       -$(COPYQMAKE)
  26.  
  27.  clean::
  28.         -del $(QTOBJS)
  29. diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
  30. index d40dc29..ba0a5b6 100644
  31. --- a/qmake/Makefile.win32-g++
  32. +++ b/qmake/Makefile.win32-g++
  33. @@ -2,8 +2,6 @@ ifeq "$(SOURCE_PATH)" ""
  34.  SOURCE_PATH = ..
  35.  endif
  36.  
  37. -#cmd version
  38. -
  39.  ifeq "$(BUILD_PATH)" ""
  40.  BUILD_PATH = ..
  41.  endif
  42. @@ -101,7 +99,7 @@ QTOBJS= \
  43.  
  44.  qmake.exe: $(OBJS) $(QTOBJS)
  45.         $(LINKQMAKE)
  46. -       -copy qmake.exe $(BUILD_PATH)\bin\qmake.exe
  47. +       -$(COPYQMAKE)
  48.  
  49.  Makefile: Makefile.win32-g++
  50.         @echo "Out of date, please rerun configure"
  51. diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh
  52. deleted file mode 100644
  53. index 49ccfbc..0000000
  54. --- a/qmake/Makefile.win32-g++-sh
  55. +++ /dev/null
  56. @@ -1,359 +0,0 @@
  57. -ifeq "$(SOURCE_PATH)" ""
  58. -SOURCE_PATH = ..
  59. -endif
  60. -
  61. -#sh version
  62. -
  63. -ifeq "$(BUILD_PATH)" ""
  64. -BUILD_PATH = ..
  65. -endif
  66. -
  67. -#
  68. -# specific stuff for mingw g++ make
  69. -#
  70. -CXX        =   g++
  71. -CFLAGS     =   -c -o$@ -O \
  72. -               -I. -Igenerators -Igenerators/unix \
  73. -               -Igenerators/win32 -Igenerators/mac \
  74. -               -Igenerators/symbian -Igenerators/integrity \
  75. -               -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
  76. -               -I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
  77. -               -I$(BUILD_PATH)/src/corelib/global \
  78. -               -I$(BUILD_PATH)/src/corelib/xml \
  79. -               -I$(SOURCE_PATH)/mkspecs/win32-g++  \
  80. -               -I$(SOURCE_PATH)/tools/shared \
  81. -               -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
  82. -               -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
  83. -               -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
  84. -               -DQT_BOOTSTRAPPED -DQLIBRARYINFO_EPOCROOT
  85. -CXXFLAGS    =   $(CFLAGS)
  86. -LFLAGS     = -static-libgcc -static-libstdc++ -s
  87. -LIBS       = -lole32 -luuid -ladvapi32 -lkernel32
  88. -LINKQMAKE   =  g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
  89. -ADDCLEAN    =
  90. -
  91. -
  92. -#qmake code
  93. -OBJS        = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \
  94. -              option.o winmakefile.o projectgenerator.o property.o meta.o \
  95. -              makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
  96. -              borland_bmake.o msvc_nmake.o msvc_vcproj.o msvc_vcxproj.o \
  97. -              msvc_objectmodel.o msbuild_objectmodel.o symmake.o initprojectdeploy_symbian.o \
  98. -              symmake_abld.o symmake_sbsv2.o symbiancommon.o registry.o epocroot.o gbuild.o
  99. -
  100. -ifdef QMAKE_OPENSOURCE_EDITION
  101. -CFLAGS      += -DQMAKE_OPENSOURCE_EDITION
  102. -endif
  103. -
  104. -#qt code
  105. -QTOBJS= \
  106. -       qbitarray.o \
  107. -       qbuffer.o \
  108. -       qbytearray.o \
  109. -       qcryptographichash.o \
  110. -       qvsnprintf.o \
  111. -       qbytearraymatcher.o \
  112. -       qconfig.o \
  113. -       qdatetime.o \
  114. -       qdir.o \
  115. -       qdiriterator.o \
  116. -       qfile.o \
  117. -       qtemporaryfile.o \
  118. -       qfileinfo.o \
  119. -       qabstractfileengine.o \
  120. -       qfilesystementry.o \
  121. -       qfilesystemengine.o \
  122. -       qfilesystemengine_win.o \
  123. -       qfilesystemiterator_win.o \
  124. -       qfsfileengine.o \
  125. -       qfsfileengine_iterator.o \
  126. -       qfsfileengine_win.o \
  127. -       qglobal.o \
  128. -       qhash.o \
  129. -       qiodevice.o \
  130. -       qlibraryinfo.o \
  131. -       qlist.o \
  132. -       qlinkedlist.o \
  133. -       qlocale.o \
  134. -       qlocale_tools.o \
  135. -       qlocale_win.o \
  136. -       qmalloc.o \
  137. -       qmap.o \
  138. -       qregexp.o \
  139. -       qtextcodec.o \
  140. -       qutfcodec.o \
  141. -       qstring.o \
  142. -       qstringlist.o \
  143. -       qsystemlibrary.o \
  144. -       qsystemerror.o \
  145. -       qtextstream.o \
  146. -       quuid.o \
  147. -       qvector.o \
  148. -       qurl.o \
  149. -       qsettings.o \
  150. -       qsettings_win.o \
  151. -       qvariant.o \
  152. -       qmetatype.o \
  153. -       qxmlstream.o \
  154. -       qxmlutils.o \
  155. -       qnumeric.o
  156. -
  157. -qmake.exe: $(OBJS) $(QTOBJS)
  158. -       $(LINKQMAKE)
  159. -       -cp qmake.exe $(BUILD_PATH)/bin/qmake.exe
  160. -
  161. -Makefile: Makefile.win32-g++-sh
  162. -       @echo "Out of date, please rerun configure"
  163. -
  164. -clean::
  165. -       -del $(OBJS) $(QTOBJS) $(ADDCLEAN)
  166. -
  167. -distclean:: clean
  168. -       -del qmake
  169. -
  170. -.c.o:
  171. -       $(CXX) $(CFLAGS) $<
  172. -
  173. -.cpp.o:
  174. -       $(CXX) $(CXXFLAGS) $<
  175. -
  176. -qconfig.o: $(BUILD_PATH)/src/corelib/global/qconfig.cpp
  177. -       $(CXX) $(CXXFLAGS) $(BUILD_PATH)/src/corelib/global/qconfig.cpp
  178. -
  179. -qsettings_win.o: $(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp
  180. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp
  181. -
  182. -qsettings.o: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp
  183. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qsettings.cpp
  184. -
  185. -qvariant.o: $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp
  186. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp
  187. -
  188. -qurl.o: $(SOURCE_PATH)/src/corelib/io/qurl.cpp
  189. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qurl.cpp
  190. -
  191. -qtextstream.o: $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp
  192. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp
  193. -
  194. -qdatastream.o: $(SOURCE_PATH)/src/corelib/io/qdatastream.cpp
  195. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qdatastream.cpp
  196. -
  197. -qiodevice.o: $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp
  198. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp
  199. -
  200. -qlibraryinfo.o: $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp
  201. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp
  202. -
  203. -qnumeric.o: $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp
  204. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp
  205. -
  206. -qmalloc.o: $(SOURCE_PATH)/src/corelib/global/qmalloc.cpp
  207. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qmalloc.cpp
  208. -
  209. -qglobal.o: $(SOURCE_PATH)/src/corelib/global/qglobal.cpp
  210. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qglobal.cpp
  211. -
  212. -qhash.o: $(SOURCE_PATH)/src/corelib/tools/qhash.cpp
  213. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qhash.cpp
  214. -
  215. -qbytearray.o: $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp
  216. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp
  217. -
  218. -qcryptographichash.o: $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp
  219. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp
  220. -
  221. -qvsnprintf.o: $(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp
  222. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp
  223. -
  224. -qbytearraymatcher.o: $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp
  225. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp
  226. -
  227. -qutfcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp
  228. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp
  229. -
  230. -qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp
  231. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring.cpp
  232. -
  233. -qlocale.o: $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp
  234. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp
  235. -
  236. -qlocale_tools.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp
  237. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp
  238. -
  239. -qlocale_win.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp
  240. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp
  241. -
  242. -quuid.o: $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp
  243. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp
  244. -
  245. -qbuffer.o: $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
  246. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
  247. -
  248. -qlist.o: $(SOURCE_PATH)/src/corelib/tools/qlist.cpp
  249. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlist.cpp
  250. -
  251. -qlinkedlist.o: $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp
  252. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp
  253. -
  254. -qfile.o: $(SOURCE_PATH)/src/corelib/io/qfile.cpp
  255. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfile.cpp
  256. -
  257. -qtemporaryfile.o: $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp
  258. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp
  259. -
  260. -qabstractfileengine.o: $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp
  261. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp
  262. -
  263. -qfilesystementry.o: $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp
  264. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp
  265. -
  266. -qfilesystemengine.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemengine.cpp
  267. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystemengine.cpp
  268. -
  269. -qfilesystemengine_win.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_win.cpp
  270. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_win.cpp
  271. -
  272. -qfilesystemiterator_win.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_win.cpp
  273. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_win.cpp
  274. -
  275. -qfsfileengine_win.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp
  276. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp
  277. -
  278. -qfsfileengine.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp
  279. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp
  280. -
  281. -qfsfileengine_iterator.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp
  282. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp
  283. -
  284. -qtextcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp
  285. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp
  286. -
  287. -qregexp.o: $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp
  288. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp
  289. -
  290. -qvector.o: $(SOURCE_PATH)/src/corelib/tools/qvector.cpp
  291. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qvector.cpp
  292. -
  293. -qbitarray.o: $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp
  294. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp
  295. -
  296. -qdir.o: $(SOURCE_PATH)/src/corelib/io/qdir.cpp
  297. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qdir.cpp
  298. -
  299. -qdiriterator.o: $(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp
  300. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp
  301. -
  302. -qmetatype.o: $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp
  303. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp
  304. -
  305. -qfileinfo.o: $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp
  306. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp
  307. -
  308. -qdatetime.o: $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp
  309. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp
  310. -
  311. -qstringlist.o: $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp
  312. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp
  313. -
  314. -qsystemerror.o: $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp
  315. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp
  316. -
  317. -qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp
  318. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp
  319. -
  320. -qmap.o: $(SOURCE_PATH)/src/corelib/tools/qmap.cpp
  321. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qmap.cpp
  322. -
  323. -makefile.o: $(SOURCE_PATH)/qmake/generators/makefile.cpp
  324. -       $(CXX) $(CXXFLAGS) generators/makefile.cpp
  325. -
  326. -unixmake.o: $(SOURCE_PATH)/qmake/generators/unix/unixmake.cpp
  327. -       $(CXX) $(CXXFLAGS) generators/unix/unixmake.cpp
  328. -
  329. -unixmake2.o: $(SOURCE_PATH)/qmake/generators/unix/unixmake2.cpp
  330. -       $(CXX) $(CXXFLAGS) generators/unix/unixmake2.cpp
  331. -
  332. -winmakefile.o: $(SOURCE_PATH)/qmake/generators/win32/winmakefile.cpp
  333. -       $(CXX) $(CXXFLAGS) generators/win32/winmakefile.cpp
  334. -
  335. -borland_bmake.o: $(SOURCE_PATH)/qmake/generators/win32/borland_bmake.cpp
  336. -       $(CXX) $(CXXFLAGS) generators/win32/borland_bmake.cpp
  337. -
  338. -mingw_make.o: $(SOURCE_PATH)/qmake/generators/win32/mingw_make.cpp
  339. -       $(CXX) $(CXXFLAGS) generators/win32/mingw_make.cpp
  340. -
  341. -msvc_nmake.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_nmake.cpp
  342. -       $(CXX) $(CXXFLAGS) generators/win32/msvc_nmake.cpp
  343. -
  344. -msvc_vcproj.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcproj.cpp
  345. -       $(CXX) $(CXXFLAGS) generators/win32/msvc_vcproj.cpp
  346. -
  347. -msvc_objectmodel.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_objectmodel.cpp
  348. -       $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
  349. -
  350. -msvc_vcxproj.o: $(SOURCE_PATH)/qmake/generators/win32/msvc_vcxproj.cpp
  351. -       $(CXX) $(CXXFLAGS) generators/win32/msvc_vcxproj.cpp
  352. -
  353. -msbuild_objectmodel.o: $(SOURCE_PATH)/qmake/generators/win32/msbuild_objectmodel.cpp
  354. -       $(CXX) $(CXXFLAGS) generators/win32/msbuild_objectmodel.cpp
  355. -
  356. -symmake.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake.cpp
  357. -       $(CXX) $(CXXFLAGS) generators/symbian/symmake.cpp
  358. -
  359. -symmake_abld.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_abld.cpp
  360. -       $(CXX) $(CXXFLAGS) generators/symbian/symmake_abld.cpp
  361. -
  362. -symmake_sbsv2.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp
  363. -       $(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
  364. -
  365. -symbiancommon.o: $(SOURCE_PATH)/qmake/generators/symbian/symbiancommon.cpp
  366. -       $(CXX) $(CXXFLAGS) generators/symbian/symbiancommon.cpp
  367. -
  368. -initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
  369. -       $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
  370. -
  371. -registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp
  372. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp
  373. -
  374. -epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
  375. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
  376. -
  377. -gbuild.o: $(SOURCE_PATH)/qmake/generators/integrity/gbuild.cpp
  378. -       $(CXX) $(CXXFLAGS) generators/integrity/gbuild.cpp
  379. -
  380. -
  381. -project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
  382. -       $(CXX) $(CXXFLAGS) project.cpp
  383. -
  384. -meta.o: $(SOURCE_PATH)/qmake/meta.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
  385. -       $(CXX) $(CXXFLAGS) meta.cpp
  386. -
  387. -main.o: $(SOURCE_PATH)/qmake/main.cpp $(SOURCE_PATH)/qmake/project.h
  388. -       $(CXX) $(CXXFLAGS) main.cpp
  389. -
  390. -option.o: $(SOURCE_PATH)/qmake/option.cpp $(SOURCE_PATH)/qmake/option.h
  391. -       $(CXX) $(CXXFLAGS) option.cpp
  392. -
  393. -property.o: $(SOURCE_PATH)/qmake/property.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
  394. -       $(CXX) $(CXXFLAGS) property.cpp
  395. -
  396. -projectgenerator.o: $(SOURCE_PATH)/qmake/generators/projectgenerator.cpp
  397. -       $(CXX) $(CXXFLAGS) generators/projectgenerator.cpp
  398. -
  399. -pbuilder_pbx.o: $(SOURCE_PATH)/qmake/generators/mac/pbuilder_pbx.cpp
  400. -       $(CXX) $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp
  401. -
  402. -makefiledeps.o: $(SOURCE_PATH)/qmake/generators/makefiledeps.cpp
  403. -       $(CXX) $(CXXFLAGS) generators/makefiledeps.cpp
  404. -
  405. -metamakefile.o: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp $(SOURCE_PATH)/qmake/generators/symbian/symbian_makefile.h
  406. -       $(CXX) $(CXXFLAGS) generators/metamakefile.cpp
  407. -
  408. -xmloutput.o: $(SOURCE_PATH)/qmake/generators/xmloutput.cpp
  409. -       $(CXX) $(CXXFLAGS) generators/xmloutput.cpp
  410. -
  411. -qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
  412. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
  413. -
  414. -qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
  415. -       $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
  416. diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
  417. index b9868e6..9afa4fb 100644
  418. --- a/tools/configure/configureapp.cpp
  419. +++ b/tools/configure/configureapp.cpp
  420. @@ -1275,11 +1275,9 @@ void Configure::parseCmdLine()
  421.              dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32";
  422.          } else if (dictionary[ "QMAKESPEC" ] == QString("win32-g++")) {
  423.              if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "mingw32-make";
  424. -            if (Environment::detectExecutable("sh.exe")) {
  425. -                dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-g++-sh";
  426. -            } else {
  427. -                dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-g++";
  428. -            }
  429. +            if (Environment::detectExecutable("sh.exe"))
  430. +                dictionary[ "GMAKE_WITH_SH" ] = "yes";
  431. +            dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-g++";
  432.          } else {
  433.              if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "make";
  434.              dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32";
  435. @@ -3633,6 +3631,10 @@ void Configure::buildQmake()
  436.                      << "BUILD_PATH = " << QDir::convertSeparators(buildPath) << endl
  437.                      << "SOURCE_PATH = " << QDir::convertSeparators(sourcePath) << endl;
  438.                  stream << "QMAKESPEC = " << dictionary["QMAKESPEC"] << endl;
  439. +                if (dictionary.contains("GMAKE_WITH_SH"))
  440. +                    stream << "COPYQMAKE = cp qmake.exe $(BUILD_PATH)/bin/qmake.exe" << endl;
  441. +                else
  442. +                    stream << "COPYQMAKE = copy qmake.exe $(BUILD_PATH)\\bin\\qmake.exe" << endl;
  443.  
  444.                  if (dictionary["EDITION"] == "OpenSource" ||
  445.                      dictionary["QT_EDITION"].contains("OPENSOURCE"))
  446. --
  447. 1.7.6.45.g07d23