Changeset 769 for trunk/qmake/Makefile.unix

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.unix (modified) (5 diffs)

trunk/qmake/Makefile.unix

@@ -12 +12 @@
      borland_bmake.o msvc_dsp.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o \
      symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o \
+     registry.o \
+     epocroot.o \
      gnumake.o
 
@@ -34 +36 @@
            generators/win32/msvc_objectmodel.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
            generators/symbian/symmake.cpp generators/symbian/initprojectdeploy_symbian.cpp \
+           $(SOURCE_PATH)/tools/shared/windows/registry.cpp \
+           $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp \
            generators/symbian/symmake_abld.cpp generators/symbian/symmake_sbsv2.cpp \
            generators/os2/gnumake.cpp \
@@ -65 +69 @@
            -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
            -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \
+           -I$(SOURCE_PATH)/tools/shared \
            -DQT_NO_PCRE \
            -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
@@ -284 +289 @@
         $(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
 
+registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp
+        $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp
+
+epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
+        $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp
+
 gnumake.o: generators/os2/gnumake.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) generators/os2/gnumake.cpp
@@ -295 +306 @@
 qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
+
 #default rules
 .cpp.o: