Changeset 880 for trunk

Timestamp:

Jun 30, 2011, 9:43:03 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/gnumake: Added support for the internal QMAKE_RUN_RC2RES_ENV variable that allows to pass parameters to RC.EXE through environment variables bypassing the CMD.EXE's 1024 char limitation. Closes #214.

Location:

trunk

Files:

• mkspecs/os2-g++/qmake.conf (modified) (1 diff)
• qmake/generators/os2/gnumake.cpp (modified) (1 diff)

trunk/mkspecs/os2-g++/qmake.conf

@@ -159 +159 @@
 QMAKE_ZIP       = zip -r -9
 
-QMAKE_RC        = rc
-QMAKE_RUN_RC2RES= set INCLUDE=%INCLUDE%;$(INCLUDEPATH) & $(RC) -n -r $(RC_FILE) $(RES_FILE)
-QMAKE_RUN_RC2EXE= $(RC) -n -x2 $(RES_FILE) $(DESTDIR_TARGET)
+QMAKE_RC                = rc
+QMAKE_RUN_RC2RES_ENV    = INCLUDE = $(INCLUDEPATH)
+QMAKE_RUN_RC2RES        = $(RC) -n -r $(RC_FILE) $(RES_FILE)
+QMAKE_RUN_RC2EXE        = $(RC) -n -x2 $(RES_FILE) $(DESTDIR_TARGET)
 
 QMAKE_STRIP     =

trunk/qmake/generators/os2/gnumake.cpp

@@ -624 +624 @@
     if (!project->isEmpty("RC_FILE") && !project->isEmpty("RES_FILE") &&
         !project->isEmpty("QMAKE_RUN_RC2RES")) {
+
+
+
         t << escapeFileVars("$(RES_FILE): $(RC_FILE)\n\t");
-        t << var("QMAKE_RUN_RC2RES") << endl;
+        t << var("QMAKE_RUN_RC2RES") << endl;
     }
 }