diff options
| author | Filippos Karapetis | 2008-10-12 16:06:04 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-10-12 16:06:04 +0000 |
| commit | 92d12dc5c44b1f448882d7a7ebe7eac6b56c4bd4 (patch) | |
| tree | a7e53c02202075672658c2a40971e7a9ec93957e | |
| parent | 1002b82022d359b63fb0639953775275f79364c3 (diff) | |
| download | scummvm-rg350-92d12dc5c44b1f448882d7a7ebe7eac6b56c4bd4.tar.gz scummvm-rg350-92d12dc5c44b1f448882d7a7ebe7eac6b56c4bd4.tar.bz2 scummvm-rg350-92d12dc5c44b1f448882d7a7ebe7eac6b56c4bd4.zip | |
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"
svn-id: r34778
| -rw-r--r-- | dists/msvc7/scummvm.vcproj | 2 | ||||
| -rw-r--r-- | dists/msvc71/scummvm.vcproj | 2 | ||||
| -rw-r--r-- | dists/msvc8_to_msvc7_71.bat | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj index 049c02d298..fef7d98304 100644 --- a/dists/msvc7/scummvm.vcproj +++ b/dists/msvc7/scummvm.vcproj @@ -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"> diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj index a614f3260e..e2576196d4 100644 --- a/dists/msvc71/scummvm.vcproj +++ b/dists/msvc71/scummvm.vcproj @@ -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"> diff --git a/dists/msvc8_to_msvc7_71.bat b/dists/msvc8_to_msvc7_71.bat index 020a26172a..146403f268 100644 --- a/dists/msvc8_to_msvc7_71.bat +++ b/dists/msvc8_to_msvc7_71.bat @@ -12,7 +12,8 @@ if not exist rpl.exe goto no_rpl 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 "\"VCXMLDataGeneratorTool\"/>\n" "\"VCXMLDataGeneratorTool\"/>\n\t\t\t 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 @@ echo Creating MSVC71 project files from the MSVC7 ones 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 |