[ros-diffs] [royce] 13956: more *nix compatibility fixes

royce at svn.reactos.com royce at svn.reactos.com
Sat Mar 12 05:55:42 CET 2005


more *nix compatibility fixes
Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak
Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak
Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak
Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak
Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak
Modified: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak
Modified: branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak
  _____  

Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak
--- branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak
2005-03-12 04:39:20 UTC (rev 13955)
+++ branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak
2005-03-12 04:55:41 UTC (rev 13956)
@@ -1,7 +1,7 @@

-BUILDNO_BASE = tools$(SEP)buildno
+BUILDNO_BASE = .$(SEP)tools$(SEP)buildno
 
 BUILDNO_TARGET = \
-	$(EXEPREFIX)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX)
+	$(ROS_INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX)
 
 BUILDNO_SOURCES = \
 	$(BUILDNO_BASE)$(SEP)buildno.cpp \
  _____  

Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak
--- branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak
2005-03-12 04:39:20 UTC (rev 13955)
+++ branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak
2005-03-12 04:55:41 UTC (rev 13956)
@@ -1,4 +1,4 @@

-CDMAKE_BASE = tools$(SEP)cdmake
+CDMAKE_BASE = .$(SEP)tools$(SEP)cdmake
 
 CDMAKE_TARGET = \
 	$(ROS_INTERMEDIATE)$(CDMAKE_BASE)$(SEP)cdmake$(EXEPOSTFIX)
  _____  

Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak
--- branches/xmlbuildsystem/reactos/tools/nci/nci.mak	2005-03-12
04:39:20 UTC (rev 13955)
+++ branches/xmlbuildsystem/reactos/tools/nci/nci.mak	2005-03-12
04:55:41 UTC (rev 13956)
@@ -1,4 +1,4 @@

-NCI_BASE = tools$(SEP)nci
+NCI_BASE = .$(SEP)tools$(SEP)nci
 
 NCI_TARGET = \
 	$(ROS_INTERMEDIATE)$(NCI_BASE)$(SEP)nci$(EXEPOSTFIX)
  _____  

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp
---
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp	2005-03-12 04:39:20 UTC (rev 13955)
+++
branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler
.cpp	2005-03-12 04:55:41 UTC (rev 13956)
@@ -809,7 +809,7 @@

 	string resFilename = ReplaceExtension ( sourceFilename,
 	                                        ".res" );
 	fprintf ( fMakefile,
-	          "%s: %s\n",
+	          "%s: %s $(WRC_TARGET)\n",
 	          objectFilename.c_str (),
 	          sourceFilename.c_str () );
 	fprintf ( fMakefile, "\t$(ECHO_WRC)\n" );
@@ -820,7 +820,7 @@
 	         rciFilename.c_str () );
 	fprintf ( fMakefile,
 	         "\t${wrc} ${%s} %s %s\n",
-           windresflagsMacro.c_str (),
+	         windresflagsMacro.c_str (),
 	         rciFilename.c_str (),
 	         resFilename.c_str () );
 	fprintf ( fMakefile,
  _____  

Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak
--- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak
2005-03-12 04:39:20 UTC (rev 13955)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak
2005-03-12 04:55:41 UTC (rev 13956)
@@ -1,4 +1,4 @@

-RBUILD_BASE = tools$(SEP)rbuild
+RBUILD_BASE = .$(SEP)tools$(SEP)rbuild
 
 RBUILD_TARGET = \
 	$(ROS_INTERMEDIATE)$(RBUILD_BASE)$(SEP)rbuild$(EXEPOSTFIX)
  _____  

Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak
--- branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak
2005-03-12 04:39:20 UTC (rev 13955)
+++ branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak
2005-03-12 04:55:41 UTC (rev 13956)
@@ -1,4 +1,4 @@

-UNICODE_BASE = tools$(SEP)unicode
+UNICODE_BASE = .$(SEP)tools$(SEP)unicode
 
 UNICODE_TARGET = \
 	$(ROS_INTERMEDIATE)$(UNICODE_BASE)$(SEP)libunicode.a
  _____  

Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak
--- branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak	2005-03-12
04:39:20 UTC (rev 13955)
+++ branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak	2005-03-12
04:55:41 UTC (rev 13956)
@@ -1,4 +1,4 @@

-WMC_BASE = tools$(SEP)wmc
+WMC_BASE = .$(SEP)tools$(SEP)wmc
 
 WMC_TARGET = \
 	$(ROS_INTERMEDIATE)$(WMC_BASE)$(SEP)wmc$(EXEPOSTFIX)
  _____  

Modified: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak
--- branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak	2005-03-12
04:39:20 UTC (rev 13955)
+++ branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak	2005-03-12
04:55:41 UTC (rev 13956)
@@ -1,4 +1,4 @@

-WPP_BASE = tools$(SEP)wpp
+WPP_BASE = .$(SEP)tools$(SEP)wpp
 
 WPP_TARGET = \
 	$(ROS_INTERMEDIATE)$(WPP_BASE)$(SEP)libwpp.a
  _____  

Modified: branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak
--- branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak	2005-03-12
04:39:20 UTC (rev 13955)
+++ branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak	2005-03-12
04:55:41 UTC (rev 13956)
@@ -1,4 +1,4 @@

-WRC_BASE = tools$(SEP)wrc
+WRC_BASE = .$(SEP)tools$(SEP)wrc
 
 WRC_TARGET = \
 	$(ROS_INTERMEDIATE)$(WRC_BASE)$(SEP)wrc$(EXEPOSTFIX)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050312/faf657cd/attachment.html


More information about the Ros-diffs mailing list