summaryrefslogtreecommitdiffstats
path: root/qmake/Makefile.win32-g++
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-20 07:54:57 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-20 07:54:57 (GMT)
commitce27cf24539e0c7971937e55d8539496ad51ee52 (patch)
tree86ddea82eca7e682409cbc2c568594a0116062c6 /qmake/Makefile.win32-g++
parent6f44020cf97bd74e02ee011e6cb182aa93109b21 (diff)
parent1f10c6be975a2d36c05d926b332b869ad6339877 (diff)
downloadQt-ce27cf24539e0c7971937e55d8539496ad51ee52.zip
Qt-ce27cf24539e0c7971937e55d8539496ad51ee52.tar.gz
Qt-ce27cf24539e0c7971937e55d8539496ad51ee52.tar.bz2
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'qmake/Makefile.win32-g++')
-rw-r--r--qmake/Makefile.win32-g++9
1 files changed, 9 insertions, 0 deletions
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index 41a1d8c..d4d6e0e 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -21,6 +21,7 @@ CFLAGS = -c -o$@ -O \
-I$(BUILD_PATH)/src/corelib/global \
-I$(BUILD_PATH)/src/corelib/xml \
-I$(SOURCE_PATH)/mkspecs/win32-g++ \
+ -I$(SOURCE_PATH)/tools/shared \
-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
-DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
@@ -38,6 +39,8 @@ OBJS = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \
makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
borland_bmake.o msvc_nmake.o msvc_vcproj.o \
msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \
+ registry.o \
+ epocroot.o \
symmake_abld.o symmake_sbsv2.o
ifdef QMAKE_OPENSOURCE_EDITION
@@ -275,6 +278,12 @@ symmake_sbsv2.o: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp
initprojectdeploy_symbian.o: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
$(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
+registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp
+ $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp
+
+epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
+ $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
+
project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
$(CXX) $(CXXFLAGS) project.cpp