diff options
| author | Johannes Schickel | 2010-08-01 21:30:15 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-08-01 21:30:15 +0000 |
| commit | f2838316cb55fc743e68ff1768350fcca5ce08fc (patch) | |
| tree | de23da2605435a2bdda5a7899532cd17631a80ef /tools | |
| parent | e0fb6b0bbfafc1377f002e3807ba96f0fb6bf0af (diff) | |
| download | scummvm-rg350-f2838316cb55fc743e68ff1768350fcca5ce08fc.tar.gz scummvm-rg350-f2838316cb55fc743e68ff1768350fcca5ce08fc.tar.bz2 scummvm-rg350-f2838316cb55fc743e68ff1768350fcca5ce08fc.zip | |
create_msvc: Fix SCUMMVM_LIBS support for MSVC2010.
svn-id: r51595
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/create_msvc/create_msvc.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/create_msvc/create_msvc.cpp b/tools/create_msvc/create_msvc.cpp index 2d3e47c73a..1c395b01aa 100644 --- a/tools/create_msvc/create_msvc.cpp +++ b/tools/create_msvc/create_msvc.cpp @@ -1665,7 +1665,7 @@ void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int b "\t\tName=\"VCCLCompilerTool\"\n" "\t\tDisableLanguageExtensions=\"true\"\n" "\t\tDisableSpecificWarnings=\"" << _globalWarnings << "\"\n" - "\t\tAdditionalIncludeDirectories=\"" << prefix << ";" << prefix << "\\engines;%(SCUMMVM_LIBS)\\include\"\n" + "\t\tAdditionalIncludeDirectories=\"" << prefix << ";" << prefix << "\\engines;$(SCUMMVM_LIBS)\\include\"\n" "\t\tPreprocessorDefinitions=\"" << defines << "\"\n" "\t\tExceptionHandling=\"0\"\n" "\t\tRuntimeTypeInfo=\"false\"\n" @@ -1682,7 +1682,7 @@ void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int b "\t\tIgnoreDefaultLibraryNames=\"\"\n" "\t\tSubSystem=\"1\"\n" "\t\tEntryPointSymbol=\"WinMainCRTStartup\"\n" - "\t\tAdditionalLibraryDirectories=\"%(SCUMMVM_LIBS)\\libs\\" << (isWin32 ? "x86" : "x64") << "\"\n" + "\t\tAdditionalLibraryDirectories=\"$(SCUMMVM_LIBS)\\libs\\" << (isWin32 ? "x86" : "x64") << "\"\n" "\t/>\n" "\t<Tool\n" "\t\tName=\"VCResourceCompilerTool\"\n" @@ -2051,9 +2051,9 @@ void MSBuildProvider::outputGlobalPropFile(std::ofstream &properties, int bits, "\t<PropertyGroup>\n" "\t\t<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\n" "\t\t<_PropertySheetDisplayName>ScummVM_Global</_PropertySheetDisplayName>\n" - "\t\t<ExecutablePath>%(SCUMMVM_LIBS)\\bin;$(ExecutablePath)</ExecutablePath>\n" - "\t\t<LibraryPath>%(SCUMMVM_LIBS)\\libs\\" << (isWin32 ? "x86" : "x64") << ";$(LibraryPath)</LibraryPath>\n" - "\t\t<IncludePath>%(SCUMMVM_LIBS)\\include;$(IncludePath)</IncludePath>\n" + "\t\t<ExecutablePath>$(SCUMMVM_LIBS)\\bin;$(ExecutablePath)</ExecutablePath>\n" + "\t\t<LibraryPath>$(SCUMMVM_LIBS)\\libs\\" << (isWin32 ? "x86" : "x64") << ";$(LibraryPath)</LibraryPath>\n" + "\t\t<IncludePath>$(SCUMMVM_LIBS)\\include;$(IncludePath)</IncludePath>\n" "\t\t<OutDir>$(Configuration)" << bits << "\\</OutDir>\n" "\t\t<IntDir>$(Configuration)" << bits << "/$(ProjectName)\\</IntDir>\n" "\t</PropertyGroup>\n" |