diff options
| author | SupSuper | 2018-12-19 05:56:36 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2018-12-23 18:39:06 +0200 |
| commit | 47b55f29c5ade774c00f1b1affbc01d0716b2732 (patch) | |
| tree | 42e30affcfb8d7529338f8666aef904a2e4b80ff | |
| parent | ddb3b6fba74be5d075fb811e1bb30427aeb56626 (diff) | |
| download | scummvm-rg350-47b55f29c5ade774c00f1b1affbc01d0716b2732.tar.gz scummvm-rg350-47b55f29c5ade774c00f1b1affbc01d0716b2732.tar.bz2 scummvm-rg350-47b55f29c5ade774c00f1b1affbc01d0716b2732.zip | |
MSVC: Fix resource file revision include error
| -rw-r--r-- | devtools/create_project/msbuild.cpp | 4 | ||||
| -rw-r--r-- | devtools/create_project/msvc.cpp | 2 | ||||
| -rw-r--r-- | devtools/create_project/visualstudio.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index f260ad03f9..2c276d5c9a 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -380,7 +380,7 @@ void MSBuildProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstrea "\t\t<ClCompile>\n" "\t\t\t<DisableLanguageExtensions>true</DisableLanguageExtensions>\n" "\t\t\t<DisableSpecificWarnings>" << warnings << ";%(DisableSpecificWarnings)</DisableSpecificWarnings>\n" - "\t\t\t<AdditionalIncludeDirectories>.;" << prefix << ";" << prefix << "\\engines;" << (setup.tests ? prefix + "\\test\\cxxtest;" : "") << "$(TargetDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\n" + "\t\t\t<AdditionalIncludeDirectories>.;" << prefix << ";" << prefix << "\\engines;" << (setup.tests ? prefix + "\\test\\cxxtest;" : "") << "%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\n" "\t\t\t<PreprocessorDefinitions>" << definesList << "%(PreprocessorDefinitions)</PreprocessorDefinitions>\n" "\t\t\t<ExceptionHandling>" << ((setup.devTools || setup.tests) ? "Sync" : "") << "</ExceptionHandling>\n"; @@ -404,7 +404,7 @@ void MSBuildProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstrea properties << "\t\t</Link>\n" "\t\t<ResourceCompile>\n" - "\t\t\t<AdditionalIncludeDirectories>" << prefix << ";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\n" + "\t\t\t<AdditionalIncludeDirectories>.;" << prefix << ";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\n" "\t\t\t<PreprocessorDefinitions>" << definesList << "%(PreprocessorDefinitions)</PreprocessorDefinitions>\n" "\t\t</ResourceCompile>\n" "\t</ItemDefinitionGroup>\n" diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp index e6b47fe724..3fd8d2b935 100644 --- a/devtools/create_project/msvc.cpp +++ b/devtools/create_project/msvc.cpp @@ -172,7 +172,7 @@ std::string MSVCProvider::getPreBuildEvent() const { cmdLine = "@echo off\n" "echo Executing Pre-Build script...\n" "echo.\n" - "@call "$(SolutionDir)../../devtools/create_project/scripts/prebuild.cmd" "$(SolutionDir)/../.." "$(TargetDir)"\n" + "@call "$(SolutionDir)../../devtools/create_project/scripts/prebuild.cmd" "$(SolutionDir)/../.." "$(SolutionDir)"\n" "EXIT /B0"; return cmdLine; diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index f18d625874..40daad6bc8 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -228,7 +228,7 @@ void VisualStudioProvider::outputGlobalPropFile(const BuildSetup &setup, std::of "\t\tName=\"VCCLCompilerTool\"\n" "\t\tDisableLanguageExtensions=\"" << (setup.devTools ? "false" : "true") << "\"\n" "\t\tDisableSpecificWarnings=\"" << warnings << "\"\n" - "\t\tAdditionalIncludeDirectories=\".\\;" << prefix << ";" << prefix << "\\engines;$(" << LIBS_DEFINE << ")\\include;$(" << LIBS_DEFINE << ")\\include\\SDL;" << (setup.tests ? prefix + "\\test\\cxxtest;" : "") << "$(TargetDir)\"\n" + "\t\tAdditionalIncludeDirectories=\".\\;" << prefix << ";" << prefix << "\\engines;$(" << LIBS_DEFINE << ")\\include;$(" << LIBS_DEFINE << ")\\include\\SDL;" << (setup.tests ? prefix + "\\test\\cxxtest;" : "") << "\"\n" "\t\tPreprocessorDefinitions=\"" << definesList << "\"\n" "\t\tExceptionHandling=\"" << ((setup.devTools || setup.tests || _version == 14) ? "1" : "0") << "\"\n"; @@ -258,7 +258,7 @@ void VisualStudioProvider::outputGlobalPropFile(const BuildSetup &setup, std::of "\t/>\n" "\t<Tool\n" "\t\tName=\"VCResourceCompilerTool\"\n" - "\t\tAdditionalIncludeDirectories=\"" << prefix << "\"\n" + "\t\tAdditionalIncludeDirectories=\".\\;" << prefix << "\"\n" "\t\tPreprocessorDefinitions=\"" << definesList << "\"\n" "\t/>\n" "</VisualStudioPropertySheet>\n"; |