Changeset 769 for trunk/qmake/Makefile.win32

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• qmake/Makefile.win32 (modified) (5 diffs)

trunk/qmake/Makefile.win32

@@ -35 +35 @@
               -I$(BUILD_PATH)\src\corelib\xml \
               -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC)  \
+              -I$(SOURCE_PATH)\tools\shared \
               -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \
               -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \
@@ -60 +61 @@
         -I$(BUILD_PATH)\src\corelib\global \
         -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC)  \
+    -I$(SOURCE_PATH)\tools\shared \
         -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \
         -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \
@@ -76 +78 @@
               borland_bmake.obj msvc_nmake.obj msvc_dsp.obj msvc_vcproj.obj \
               msvc_objectmodel.obj symmake.obj initprojectdeploy_symbian.obj \
+              registry.obj \
+              epocroot.obj \
               symmake_abld.obj symmake_sbsv2.obj gnumake.obj
 
@@ -199 +203 @@
         -del symmake_sbsv2.obj
         -del initprojectdeploy_symbian.obj
+        -del registry.obj
+        -del epocroot.obj
         -del gnumake.obj
         -del pbuilder_pbx.obj
@@ -399 +405 @@
         $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
 
+registry.obj: $(SOURCE_PATH)/tools/shared/windows/registry.cpp
+        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp
+
+epocroot.obj: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
+        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
+
 gnumake.obj: $(SOURCE_PATH)/qmake/generators/os2/gnumake.cpp
         $(CXX) $(CXXFLAGS) generators/os2/gnumake.cpp