Changeset 983 for trunk/qmake

Timestamp:

Aug 15, 2011, 2:57:00 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Add support for shadow builds of Qt itself.

Location:

trunk/qmake

Files:

• Makefile.os2-g++ (modified) (3 diffs)
• qmake.pro (modified) (1 diff)

trunk/qmake/Makefile.os2-g++

@@ -14 +14 @@
 CXX         =   g++
 CFLAGS      =   -O -s -Zomf \
-                -I. -Igenerators -Igenerators/unix \
-                -Igenerators/win32 -Igenerators/mac \
-        -Igenerators/symbian -Igenerators/os2 \
+                -I$(SOURCE_PATH)/qmake \
+                -I$(SOURCE_PATH)/qmake/generators \
+                -I$(SOURCE_PATH)/qmake/generators/unix \
+                -I$(SOURCE_PATH)/qmake/generators/win32 \
+                -I$(SOURCE_PATH)/qmake/generators/mac \
+        -I$(SOURCE_PATH)/qmake/generators/symbian \
+                -I$(SOURCE_PATH)/qmake/generators/os2 \
                 -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
-                -I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
                 -I$(BUILD_PATH)/src/corelib/global \
                 -I$(BUILD_PATH)/src/corelib/xml \
@@ -47 +50 @@
 
 SOURCES     = \
-                project.cpp \
-                property.cpp \
-                main.cpp \
-                generators/makefile.cpp \
-                generators/unix/unixmake2.cpp \
-                generators/unix/unixmake.cpp \
-                meta.cpp \
-                option.cpp \
-                generators/win32/winmakefile.cpp \
-                generators/win32/mingw_make.cpp \
-                generators/makefiledeps.cpp \
-                generators/metamakefile.cpp \
-                generators/mac/pbuilder_pbx.cpp \
-                generators/xmloutput.cpp \
-                generators/win32/borland_bmake.cpp \
-                generators/win32/msvc_nmake.cpp \
-                generators/projectgenerator.cpp \
-                generators/win32/msvc_vcproj.cpp \
-                generators/win32/msvc_vcxproj.cpp \
-                generators/win32/msvc_objectmodel.cpp \
-                generators/win32/msbuild_objectmodel.cpp \
-                generators/symbian/symmake.cpp \
-                generators/symbian/symmake_abld.cpp \
-                generators/symbian/symmake_sbsv2.cpp \
-                generators/symbian/initprojectdeploy_symbian.cpp \
-                generators/symbian/symbiancommon.cpp \
-                generators/os2/gnumake.cpp
+                project.cpp \
+                property.cpp \
+                main.cpp \
+                generators/makefile.cpp \
+                generators/unix/unixmake2.cpp \
+                generators/unix/unixmake.cpp \
+                meta.cpp \
+                option.cpp \
+                generators/win32/winmakefile.cpp \
+                generators/win32/mingw_make.cpp \
+                generators/makefiledeps.cpp \
+                generators/metamakefile.cpp \
+                generators/mac/pbuilder_pbx.cpp \
+                generators/xmloutput.cpp \
+                generators/win32/borland_bmake.cpp \
+                generators/win32/msvc_nmake.cpp \
+                generators/projectgenerator.cpp \
+                generators/win32/msvc_vcproj.cpp \
+                generators/win32/msvc_vcxproj.cpp \
+                generators/win32/msvc_objectmodel.cpp \
+                generators/win32/msbuild_objectmodel.cpp \
+                generators/symbian/symmake.cpp \
+                generators/symbian/symmake_abld.cpp \
+                generators/symbian/symmake_sbsv2.cpp \
+                generators/symbian/initprojectdeploy_symbian.cpp \
+                generators/symbian/symbiancommon.cpp \
+                generators/os2/gnumake.cpp
 
 # Qt code (taken from qmake.pri)
@@ -139 +142 @@
         @mkdir $(OBJECTS_DIR)
 
-Makefile: Makefile.os2-g++
+Makefile: Makefile.os2-g++
         @echo "Out of date, please rerun configure"
 

trunk/qmake/qmake.pro

@@ -29 +29 @@
            generators/symbian \
            generators/os2 \
-           $$QT_SOURCE_TREE/include \
-           $$QT_SOURCE_TREE/include/QtCore \
-           $$QT_SOURCE_TREE/qmake
+           $$QT__TREE/include \
+           $$QT__TREE/include/QtCore \
+           $$QT_
 
 VPATH += $$QT_SOURCE_TREE/tools/shared