equal
deleted
inserted
replaced
19 -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ |
19 -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ |
20 -I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \ |
20 -I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \ |
21 -I$(BUILD_PATH)/src/corelib/global \ |
21 -I$(BUILD_PATH)/src/corelib/global \ |
22 -I$(BUILD_PATH)/src/corelib/xml \ |
22 -I$(BUILD_PATH)/src/corelib/xml \ |
23 -I$(SOURCE_PATH)/mkspecs/win32-g++ \ |
23 -I$(SOURCE_PATH)/mkspecs/win32-g++ \ |
|
24 -I$(SOURCE_PATH)/tools/shared \ |
24 -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \ |
25 -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \ |
25 -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \ |
26 -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \ |
26 -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ |
27 -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ |
27 -DQT_BOOTSTRAPPED |
28 -DQT_BOOTSTRAPPED |
28 CXXFLAGS = $(CFLAGS) |
29 CXXFLAGS = $(CFLAGS) |
36 OBJS = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \ |
37 OBJS = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \ |
37 option.o winmakefile.o projectgenerator.o property.o meta.o \ |
38 option.o winmakefile.o projectgenerator.o property.o meta.o \ |
38 makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \ |
39 makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \ |
39 borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \ |
40 borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \ |
40 msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \ |
41 msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \ |
|
42 registry.o \ |
|
43 epocroot.o \ |
41 symmake_abld.o symmake_sbsv2.o |
44 symmake_abld.o symmake_sbsv2.o |
42 |
45 |
43 ifdef QMAKE_OPENSOURCE_EDITION |
46 ifdef QMAKE_OPENSOURCE_EDITION |
44 CFLAGS += -DQMAKE_OPENSOURCE_EDITION |
47 CFLAGS += -DQMAKE_OPENSOURCE_EDITION |
45 endif |
48 endif |
275 $(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp |
278 $(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp |
276 |
279 |
277 initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp |
280 initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp |
278 $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp |
281 $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp |
279 |
282 |
|
283 registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp |
|
284 $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp |
|
285 |
|
286 epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp |
|
287 $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp |
|
288 |
280 project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h |
289 project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h |
281 $(CXX) $(CXXFLAGS) project.cpp |
290 $(CXX) $(CXXFLAGS) project.cpp |
282 |
291 |
283 meta.o: $(SOURCE_PATH)/qmake/meta.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h |
292 meta.o: $(SOURCE_PATH)/qmake/meta.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h |
284 $(CXX) $(CXXFLAGS) meta.cpp |
293 $(CXX) $(CXXFLAGS) meta.cpp |