aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2011-04-08 18:50:02 +0200
committerJohannes Schickel2011-04-08 18:50:02 +0200
commit0a176b5476ded335ee4f7402a1abdb741f972caa (patch)
tree14f859fc89907ef91dd1cc7123b40db6784e7589
parent9e6a640d8dbfcf94d6213a46a993c01e8813a53a (diff)
downloadscummvm-rg350-0a176b5476ded335ee4f7402a1abdb741f972caa.tar.gz
scummvm-rg350-0a176b5476ded335ee4f7402a1abdb741f972caa.tar.bz2
scummvm-rg350-0a176b5476ded335ee4f7402a1abdb741f972caa.zip
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.
-rw-r--r--tools/create_project/visualstudio.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/create_project/visualstudio.cpp b/tools/create_project/visualstudio.cpp
index f9bf3a2b60..41e59af09d 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";