[Scummvm-cvs-logs] SF.net SVN: scummvm:[34778] scummvm/trunk/dists

[thebluegr at users.sourceforge.net]

Revision: 34778
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34778&view=rev
Author:   thebluegr
Date:     2008-10-12 16:06:04 +0000 (Sun, 12 Oct 2008)

Log Message:
-----------
The MSVC8 -> MSVC 7/7.1 conversion tool now handles both cases of version numbers (with . and ,) - depending on the system's localization settings. Updated the scummvm.vcproj files

Fixes bug #2159813 - "BUILD: scummvm.vcproj fails to build in msvc7/msvc71"

Modified Paths:
--------------
    scummvm/trunk/dists/msvc7/scummvm.vcproj
    scummvm/trunk/dists/msvc71/scummvm.vcproj
    scummvm/trunk/dists/msvc8_to_msvc7_71.bat

Modified: scummvm/trunk/dists/msvc7/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/scummvm.vcproj	2008-10-12 07:01:09 UTC (rev 34777)
+++ scummvm/trunk/dists/msvc7/scummvm.vcproj	2008-10-12 16:06:04 UTC (rev 34778)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="7.00"
 	Name="scummvm"
 	ProjectGUID="{8434CB15-D08F-427D-9E6D-581AE5B28440}"
 	Keyword="Win32Proj">

Modified: scummvm/trunk/dists/msvc71/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/scummvm.vcproj	2008-10-12 07:01:09 UTC (rev 34777)
+++ scummvm/trunk/dists/msvc71/scummvm.vcproj	2008-10-12 16:06:04 UTC (rev 34778)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="7.10"
 	Name="scummvm"
 	ProjectGUID="{8434CB15-D08F-427D-9E6D-581AE5B28440}"
 	Keyword="Win32Proj">

Modified: scummvm/trunk/dists/msvc8_to_msvc7_71.bat
===================================================================
--- scummvm/trunk/dists/msvc8_to_msvc7_71.bat	2008-10-12 07:01:09 UTC (rev 34777)
+++ scummvm/trunk/dists/msvc8_to_msvc7_71.bat	2008-10-12 16:06:04 UTC (rev 34778)
@@ -12,7 +12,8 @@
 echo Creating MSVC71 project files from the MSVC8 ones
 copy /y msvc8\*.vcproj msvc71\
 copy /y msvc8\*.sln msvc71\
-rpl -e -q "Version=\"8,00\"" "Version=\"7.10\"" msvc71\*.vcproj
+rpl -e -q "Version=\"8.00\"" "Version=\"7.10\"" msvc71\*.vcproj
+rpl -e -q "Version=\"8,00\"" "Version=\"7,10\"" msvc71\*.vcproj
 for %%i in (msvc71\*.vcproj) do rpl -e -q "RootNamespace=\"%%~ni\"\n" "" %%i
 rpl -e -q "RootNamespace=" "#RootNamespace=" msvc71\*.vcproj
 rpl -e -q "\t\tKeyword=" "\tKeyword=" msvc71\*.vcproj
@@ -64,6 +65,7 @@
 rpl -e -q "\"VCManagedWrapperGeneratorTool\"/>\n" "\"VCManagedWrapperGeneratorTool\"/>\n\t\t\t<Tool\n\t\t\t\tName=\"VCAuxiliaryManagedWrapperGeneratorTool\"/>\n" msvc71\*.vcproj
 			
 rpl -e -q "Format Version 9.00" "Format Version 8.00" msvc71\scummvm.sln
+rpl -e -q "Format Version 9,00" "Format Version 8,00" msvc71\scummvm.sln
 rpl -e -q "# Visual C++ Express 2005\n" "" msvc71\scummvm.sln
 rpl -e -q "# Visual Studio 2005\n" "" msvc71\scummvm.sln
 rpl -e -q "\"\nEndProject\n" "\"\n\tProjectSection(ProjectDependencies) = postProject\n\tEndProjectSection\nEndProject\n" msvc71\scummvm.sln
@@ -78,12 +80,14 @@
 copy /y msvc71\*.vcproj msvc7\
 copy /y msvc71\*.sln msvc7\
 rpl -e -q "Version=\"7.10\"" "Version=\"7.00\"" msvc7\*.vcproj
+rpl -e -q "Version=\"7,10\"" "Version=\"7,00\"" msvc7\*.vcproj
 rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCXMLDataGeneratorTool\"/>\n" "" msvc7\*.vcproj
 rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCManagedWrapperGeneratorTool\"/>\n" "" msvc7\*.vcproj
 rpl -e -q "\t\t\t<Tool\n\t\t\t\tName=\"VCAuxiliaryManagedWrapperGeneratorTool\"/>\n" "" msvc7\*.vcproj
 rpl -e -q "\t<References>\n\t</References>\n" "" msvc7\*.vcproj
 
 rpl -e -q "Format Version 8.00" "Format Version 7.00" msvc7\scummvm.sln
+rpl -e -q "Format Version 8,00" "Format Version 7,00" msvc7\scummvm.sln
 rpl -e -q "\tProjectSection(ProjectDependencies) = postProject\n\tEndProjectSection\n" "" msvc7\scummvm.sln
 goto the_end
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.