[Kde-cygwin-cvs] CVS: qt-3/qmake/generators/win32 borland_bmake.cpp,1.1.1.14,1.1.1.15

[Christian E. <che...@us...>]

Update of /cvsroot/kde-cygwin/qt-3/qmake/generators/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831/qmake/generators/win32

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	borland_bmake.cpp 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

Index: borland_bmake.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/qmake/generators/win32/borland_bmake.cpp,v
retrieving revision 1.1.1.14
retrieving revision 1.1.1.15
diff -u -r1.1.1.14 -r1.1.1.15
--- borland_bmake.cpp	22 Sep 2005 12:57:34 -0000	1.1.1.14
+++ borland_bmake.cpp	30 Sep 2005 16:58:31 -0000	1.1.1.15
@@ -105,7 +105,7 @@
 	t << "LINK	=	" << var("QMAKE_LINK") << endl;
 	t << "LFLAGS	=	";
 	if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() )
-	    t << varGlue("QMAKE_LIBDIR","-L",";","") << " ";
+	    t << varGlue("QMAKE_LIBDIR","-L\"",";","\"") << " ";
 	t << var("QMAKE_LFLAGS") << endl;
 	t << "LIBS	=	" << var("QMAKE_LIBS") << endl;
     }
@@ -186,10 +186,14 @@
 	t << "\n\t" << "$(LINK) @&&|" << "\n\t"
 	  << "$(LFLAGS) $(OBJECTS) $(OBJMOC),$(TARGET),,$(LIBS),$(DEF_FILE),$(RES_FILE)";
     } else {
+	// tlib.exe splits every parameter at " ", "+" and "-". Fix this by
+	// quoting.
 	t << "\n\t-$(DEL_FILE) $(TARGET)"
-	  << "\n\t" << "$(LIB) $(TARGET) @&&|" << " \n+"
-	  << project->variables()["OBJECTS"].join(" \\\n+") << " \\\n+"
-	  << project->variables()["OBJMOC"].join(" \\\n+");
+	  << "\n\t" << "$(LIB) \"$(TARGET)\" @&&|" << " \n";
+	if(project->variables()["OBJECTS"].count() > 0)
+	    t << "+\"" << project->variables()["OBJECTS"].join("\" \\\n+\"") << "\" \\\n";
+	if(project->variables()["OBJMOC"].count() > 0)
+	    t << "+\"" << project->variables()["OBJMOC"].join("\" \\\n+\"") << "\" \\\n";
     }
     t << extraCompilerDeps;
     t << endl << "|" << endl;