Changeset 769 for trunk/qmake/Makefile.win32-g++

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-g++ (modified) (3 diffs)

trunk/qmake/Makefile.win32-g++

@@ -22 +22 @@
                 -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 \
@@ -39 +40 @@
               borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \
               msvc_objectmodel.o symmake.o initprojectdeploy_symbian.o \
+              registry.o \
+              epocroot.o \
               symmake_abld.o symmake_sbsv2.o gnumake.o
 
@@ -279 +282 @@
         $(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
+
 gnumake.o: $(SOURCE_PATH)/qmake/generators/os2/gnumake.cpp
         $(CXX) $(CXXFLAGS) generators/os2/gnumake.cpp