equal
deleted
inserted
replaced
32 -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \ |
32 -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \ |
33 -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \ |
33 -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \ |
34 -I$(BUILD_PATH)\src\corelib\global \ |
34 -I$(BUILD_PATH)\src\corelib\global \ |
35 -I$(BUILD_PATH)\src\corelib\xml \ |
35 -I$(BUILD_PATH)\src\corelib\xml \ |
36 -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC) \ |
36 -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC) \ |
|
37 -I$(SOURCE_PATH)\tools\shared \ |
37 -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \ |
38 -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \ |
38 -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \ |
39 -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \ |
39 -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQT_NO_PCRE -DQT_BOOTSTRAPPED \ |
40 -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQT_NO_PCRE -DQT_BOOTSTRAPPED \ |
40 $(CFLAGS) |
41 $(CFLAGS) |
41 CXXFLAGS = $(CFLAGS) |
42 CXXFLAGS = $(CFLAGS) |
57 -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian \ |
58 -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian \ |
58 -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \ |
59 -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \ |
59 -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \ |
60 -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \ |
60 -I$(BUILD_PATH)\src\corelib\global \ |
61 -I$(BUILD_PATH)\src\corelib\global \ |
61 -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC) \ |
62 -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC) \ |
|
63 -I$(SOURCE_PATH)\tools\shared \ |
62 -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \ |
64 -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \ |
63 -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \ |
65 -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \ |
64 -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT |
66 -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT |
65 CXXFLAGS = $(CFLAGS) |
67 CXXFLAGS = $(CFLAGS) |
66 LFLAGS = -L$(BCB)\lib -c -x -Gn -ap -Tpe c0x32.obj |
68 LFLAGS = -L$(BCB)\lib -c -x -Gn -ap -Tpe c0x32.obj |
73 OBJS = project.obj main.obj makefile.obj unixmake.obj unixmake2.obj mingw_make.obj \ |
75 OBJS = project.obj main.obj makefile.obj unixmake.obj unixmake2.obj mingw_make.obj \ |
74 option.obj winmakefile.obj projectgenerator.obj property.obj meta.obj \ |
76 option.obj winmakefile.obj projectgenerator.obj property.obj meta.obj \ |
75 makefiledeps.obj metamakefile.obj xmloutput.obj pbuilder_pbx.obj \ |
77 makefiledeps.obj metamakefile.obj xmloutput.obj pbuilder_pbx.obj \ |
76 borland_bmake.obj msvc_nmake.obj msvc_dsp.obj msvc_vcproj.obj \ |
78 borland_bmake.obj msvc_nmake.obj msvc_dsp.obj msvc_vcproj.obj \ |
77 msvc_objectmodel.obj symmake.obj initprojectdeploy_symbian.obj \ |
79 msvc_objectmodel.obj symmake.obj initprojectdeploy_symbian.obj \ |
|
80 registry.obj \ |
|
81 epocroot.obj \ |
78 symmake_abld.obj symmake_sbsv2.obj |
82 symmake_abld.obj symmake_sbsv2.obj |
79 |
83 |
80 !IFDEF QMAKE_OPENSOURCE_EDITION |
84 !IFDEF QMAKE_OPENSOURCE_EDITION |
81 CFLAGS = $(CFLAGS) -DQMAKE_OPENSOURCE_EDITION |
85 CFLAGS = $(CFLAGS) -DQMAKE_OPENSOURCE_EDITION |
82 !ENDIF |
86 !ENDIF |
196 -del msvc_objectmodel.obj |
200 -del msvc_objectmodel.obj |
197 -del symmake.obj |
201 -del symmake.obj |
198 -del symmake_abld.obj |
202 -del symmake_abld.obj |
199 -del symmake_sbsv2.obj |
203 -del symmake_sbsv2.obj |
200 -del initprojectdeploy_symbian.obj |
204 -del initprojectdeploy_symbian.obj |
|
205 -del registry.obj |
|
206 -del epocroot.obj |
201 -del pbuilder_pbx.obj |
207 -del pbuilder_pbx.obj |
202 -del qxmlstream.obj |
208 -del qxmlstream.obj |
203 -del qxmlutils.obj |
209 -del qxmlutils.obj |
204 -del qnumeric.obj |
210 -del qnumeric.obj |
205 -del vc60.pdb |
211 -del vc60.pdb |
395 $(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp |
401 $(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp |
396 |
402 |
397 initprojectdeploy_symbian.obj: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp |
403 initprojectdeploy_symbian.obj: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp |
398 $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp |
404 $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp |
399 |
405 |
|
406 registry.obj: $(SOURCE_PATH)/tools/shared/windows/registry.cpp |
|
407 $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp |
|
408 |
|
409 epocroot.obj: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp |
|
410 $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp |
|
411 |
400 md5.obj: $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp |
412 md5.obj: $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp |
401 $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp |
413 $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp |
402 |
414 |
403 project.obj: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h |
415 project.obj: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h |
404 $(CXX) $(CXXFLAGS) project.cpp |
416 $(CXX) $(CXXFLAGS) project.cpp |