Changeset 10 for trunk/qmake/Makefile.os2-g++

Timestamp:

May 19, 2009, 1:12:24 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

Tailored qmake/Makefile.os2-g++.

File:

• trunk/qmake/Makefile.os2-g++ (modified) (8 diffs)

trunk/qmake/Makefile.os2-g++

@@ -10 +10 @@
 
 #
-# specific stuff for mingw g++ make
+# specific stuff for GNU make
 #
 CXX         =   g++
-CFLAGS      =   -c -o$@ -O \
+CFLAGS      =   -c -o$@ -O -s -Zomf \
                 -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 \
                 -I$(BUILD_PATH)/src/corelib/global \
                 -I$(BUILD_PATH)/include/QtScript \
-                -I$(SOURCE_PATH)/mkspecs/win32-g++  \
+                -I$(SOURCE_PATH)/mkspecs/os2-g++  \
                 -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
-                -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
+                -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DHAVE_QCONFIG_CPP \
                 -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM
 CXXFLAGS    =   $(CFLAGS)
-LFLAGS      =
-LIBS        = -lole32 -luuid
+LFLAGS      =   -s -Zomf -Zstack 0x2000 -Zlinker /PM:VIO -Zlinker /EXEPACK:2
+LIBS        =   -lregistry.dll
 LINKQMAKE   =   g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
 ADDCLEAN    =
@@ -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
@@ -60 +60 @@
         qfsfileengine.o \
         qfsfileengine_iterator.o \
-        qfsfileengine_win.o \
-        qfsfileengine_iterator_win.o \
+        qfsfileengine_pm.o \
+        qfsfileengine_iterator_pm.o \
         qglobal.o \
         qhash.o \
@@ -79 +79 @@
         qurl.o \
         qsettings.o \
-        qsettings_win.o \
+        qsettings_pm.o \
         qvariant.o \
         qmetatype.o \
@@ -131 +131 @@
 
 clean::
-        -del $(OBJS) $(QTOBJS) $(ADDCLEAN)
+        -del $(OBJS) $(QTOBJS) $(ADDCLEAN) >nul 2>&1
 
 distclean:: clean
-        -del qmake
+        -del qmake.exe >nul 2>&1
 
 .c.o:
@@ -145 +145 @@
         $(CXX) $(CXXFLAGS) $(BUILD_PATH)/src/corelib/global/qconfig.cpp
 
-qsettings_win.o: $(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp
+qsettings_pm.o: $(SOURCE_PATH)/src/corelib/io/qsettings_pm.cpp
+        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qsettings_pm.cpp
 
 qsettings.o: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp
@@ -220 +220 @@
         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp
 
-qfsfileengine_win.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp
-
-qfsfileengine_iterator_win.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_win.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_win.cpp
+qfsfileengine_pm.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_pm.cpp
+        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_pm.cpp
+
+qfsfileengine_iterator_pm.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_pm.cpp
+        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_pm.cpp
 
 qfsfileengine.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp
@@ -295 +295 @@
         $(CXX) $(CXXFLAGS) generators/win32/msvc_objectmodel.cpp
 
+gnumake.obj: $(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