Changeset 51

Timestamp:

Jun 25, 2009, 9:28:35 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Build os2/GNUMAKE generator on other platforms.

Location:

trunk/qmake

Files:

• Makefile.unix (modified) (4 diffs)
• Makefile.win32 (modified) (4 diffs)
• Makefile.win32-g++ (modified) (3 diffs)
• Makefile.win32-g++-sh (modified) (3 diffs)

trunk/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_dsp.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o gnumake.o
 
 #qt code
@@ -45 +45 @@
            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/os2/gnumake.cpp \
            $(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \
            $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \
@@ -89 +90 @@
            $(QTSRCS)
 
-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
+CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/os2 -Igenerators/mac \
            -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
            -I$(BUILD_PATH)/src/corelib/global \
@@ -293 +294 @@
         $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_dsp.cpp
 
+gnumake.o: generators/os2/gnumake.cpp
+        $(CXX) -c -o $@ $(CXXFLAGS) generators/os2/gnumake.cpp
+
 projectgenerator.o: generators/projectgenerator.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) generators/projectgenerator.cpp

trunk/qmake/Makefile.win32

@@ -29 +29 @@
 CFLAGS       = -c -Fo$@ \
               -W3 -nologo -O2 \
-              -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac \
+              -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\os2 -Igenerators\mac \
               -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
               -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
@@ -75 +75 @@
               makefiledeps.obj metamakefile.obj xmloutput.obj pbuilder_pbx.obj \
               borland_bmake.obj msvc_nmake.obj msvc_dsp.obj msvc_vcproj.obj \
-              msvc_objectmodel.obj
+              msvc_objectmodel.obj gnumake.obj
 
 !IFDEF QMAKE_OPENSOURCE_EDITION
@@ -226 +226 @@
         -del msvc_vcproj.obj
         -del msvc_objectmodel.obj
+        -del gnumake.obj
         -del pbuilder_pbx.obj
         -del qnumeric.obj \
@@ -445 +446 @@
         $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
 
+gnumake.obj: $(SOURCE_PATH)/qmake/generators/os2/gnumake.cpp
+        $(CXX) $(CXXFLAGS) generators/os2/gnumake.cpp
+
 md5.obj: $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp
         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp

trunk/qmake/Makefile.win32-g++

@@ -15 +15 @@
 CFLAGS      =   -c -o$@ -O \
                 -I. -Igenerators -Igenerators/unix \
-                -Igenerators/win32 -Igenerators/mac \
+                -Igenerators/win32 -Igenerators/os2 -Igenerators/mac \
                 -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
                 -I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
@@ -36 +36 @@
               makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
               borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \
-              msvc_objectmodel.o
+              msvc_objectmodel.o gnumake.o
 
 ifdef QMAKE_OPENSOURCE_EDITION
@@ -295 +295 @@
         $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
 
+gnumake.o: $(SOURCE_PATH)/qmake/generators/os2/gnumake.cpp
+        $(CXX) $(CXXFLAGS) generators/os2/gnumake.cpp
+
 project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
         $(CXX) $(CXXFLAGS) project.cpp

trunk/qmake/Makefile.win32-g++-sh

@@ -15 +15 @@
 CFLAGS      =   -c -o$@ -O \
                 -I. -Igenerators -Igenerators/unix \
-                -Igenerators/win32 -Igenerators/mac \
+                -Igenerators/win32 -Igenerators/os2 -Igenerators/mac \
                 -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
                 -I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
@@ -36 +36 @@
               makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
               borland_bmake.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o \
-              msvc_objectmodel.o
+              msvc_objectmodel.o gnumake.o
 
 ifdef QMAKE_OPENSOURCE_EDITION
@@ -294 +294 @@
         $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
 
+gnumake.o: $(SOURCE_PATH)/qmake/generators/os2/gnumake.cpp
+        $(CXX) $(CXXFLAGS) generators/os2/gnumake.cpp
+
 project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h
         $(CXX) $(CXXFLAGS) project.cpp