[Scummvm-cvs-logs] scummvm master -> 0a176b5476ded335ee4f7402a1abdb741f972caa

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0a176b5476 CREATE_PROJECT: Fix wrong paths for linker and resource compiler in MSVC7/8.


Commit: 0a176b5476ded335ee4f7402a1abdb741f972caa
    https://github.com/scummvm/scummvm/commit/0a176b5476ded335ee4f7402a1abdb741f972caa
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-04-08T09:50:02-07:00

Commit Message:
CREATE_PROJECT: Fix wrong paths for linker and resource compiler in MSVC7/8.

This is a regression from 500ae85c, which accidently removed the
AdditionalLibraryDirectories settings for the VCLinkerTool and set the value
of AdditionalIncludeDirectories of the VCResourceCompilerTool to the former
AdditionalLibraryDirectories value.

Changed paths:
    tools/create_project/visualstudio.cpp



diff --git a/tools/create_project/visualstudio.cpp b/tools/create_project/visualstudio.cpp
index f9bf3a2..41e59af 100644
--- a/tools/create_project/visualstudio.cpp
+++ b/tools/create_project/visualstudio.cpp
@@ -230,11 +230,12 @@ void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int b
 	              "\t\tIgnoreDefaultLibraryNames=\"\"\n"
 	              "\t\tSubSystem=\"1\"\n"
 	              "\t\tEntryPointSymbol=\"WinMainCRTStartup\"\n"
+                  "\t\tAdditionalLibraryDirectories=\"$(SCUMMVM_LIBS)\\lib\\" << ((bits == 32) ? "x86" : "x64") << "\"\n"
 	              "\t/>\n"
 	              "\t<Tool\n"
 	              "\t\tName=\"VCResourceCompilerTool\"\n"
 	              "\t\tPreprocessorDefinitions=\"HAS_INCLUDE_SET\"\n"
-	              "\t\tAdditionalIncludeDirectories=\"$(SCUMMVM_LIBS)\\lib\\" << (bits == 32 ? "x86" : "x64") << "\"\n"
+	              "\t\tAdditionalIncludeDirectories=\"" << prefix << "\"\n"
 	              "\t/>\n"
 	              "</VisualStudioPropertySheet>\n";