Changeset 844 for branches/vendor/nokia/qt/current/qmake/Makefile.unix

Timestamp:

May 3, 2011, 4:49:08 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

vendor: Imported qt-everywhere-opensource-src-4.7.2 from Nokia (excluding doc/html and doc/qch dirs generated from doc/src, and imports and templates dirs which are emtpy).

File:

• branches/vendor/nokia/qt/current/qmake/Makefile.unix (modified) (7 diffs)

branches/vendor/nokia/qt/current/qmake/Makefile.unix

@@ -10 +10 @@
      mingw_make.o option.o winmakefile.o projectgenerator.o \
      meta.o makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
-     borland_bmake.o msvc_dsp.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o \
+     borland_bmake.o msvc__objectmodel.o \
      symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o \
-     registry.o \
-     epocroot.o
+     symbiancommon.o registry.o epocroot.o
 
 #qt code
@@ -33 +32 @@
            generators/mac/pbuilder_pbx.cpp generators/mac/xmloutput.cpp generators/metamakefile.cpp \
            generators/makefiledeps.cpp option.cpp generators/win32/mingw_make.cpp generators/makefile.cpp \
-           generators/win32/msvc_objectmodel.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
+           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 \
+
            $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \
            $(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \
@@ -69 +69 @@
            -I$(SOURCE_PATH)/tools/shared \
            -DQT_NO_PCRE \
-           -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
+           -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
            -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
            -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
@@ -236 +236 @@
         $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp
 
-metamakefile.o: generators/metamakefile.cpp
+metamakefile.o: generators/metamakefile.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) generators/metamakefile.cpp
 
@@ -266 +266 @@
         $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_vcproj.cpp
 
+
+
+
+
+
+
 msvc_nmake.o: generators/win32/msvc_nmake.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_nmake.cpp
@@ -272 +278 @@
         $(CXX) -c -o $@ $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp
 
-msvc_dsp.o: generators/win32/msvc_dsp.cpp
-        $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_dsp.cpp
-
 symmake.o: generators/symbian/symmake.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symmake.cpp
@@ -283 +286 @@
 symmake_sbsv2.o: generators/symbian/symmake_sbsv2.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
+
+
+
 
 initprojectdeploy_symbian.o: generators/symbian/initprojectdeploy_symbian.cpp