Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:29:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #10801 from huffman/fix/oven-native-separators

Browse source 
Add support for native separators in oven, and vs2015/2017 FBX sdk
This commit is contained in:
Ryan Huffman 2017-07-03 12:07:26 -07:00 committed by GitHub
commit b8ce4b9006
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmake/modules/FindFBX.cmake
View file

@ -56,19 +56,17 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
endif() endif()
function(_fbx_find_library _name _lib _suffix) function(_fbx_find_library _name _lib _suffix)
if (MSVC12) if (MSVC_VERSION EQUAL 1910)
set(VS_PREFIX vs2017)
elseif (MSVC_VERSION EQUAL 1900)
set(VS_PREFIX vs2015)
elseif (MSVC_VERSION EQUAL 1800)
set(VS_PREFIX vs2013) set(VS_PREFIX vs2013)
endif() elseif (MSVC_VERSION EQUAL 1700)
if (MSVC11)
set(VS_PREFIX vs2012) set(VS_PREFIX vs2012)
endif() elseif (MSVC_VERSION EQUAL 1600)
if (MSVC10)
set(VS_PREFIX vs2010) set(VS_PREFIX vs2010)
endif() elseif (MSVC_VERSION EQUAL 1500)
if (MSVC90)
set(VS_PREFIX vs2008) set(VS_PREFIX vs2008)
endif() endif()

4
tools/oven/src/Oven.cpp
View file

@ -61,7 +61,9 @@ Oven::Oven(int argc, char* argv[]) :
if (parser.isSet(CLI_INPUT_PARAMETER) || parser.isSet(CLI_OUTPUT_PARAMETER)) { if (parser.isSet(CLI_INPUT_PARAMETER) || parser.isSet(CLI_OUTPUT_PARAMETER)) {
if (parser.isSet(CLI_INPUT_PARAMETER) && parser.isSet(CLI_OUTPUT_PARAMETER)) { if (parser.isSet(CLI_INPUT_PARAMETER) && parser.isSet(CLI_OUTPUT_PARAMETER)) {
BakerCLI* cli = new BakerCLI(this); BakerCLI* cli = new BakerCLI(this);
cli->bakeFile(parser.value(CLI_INPUT_PARAMETER), parser.value(CLI_OUTPUT_PARAMETER)); QUrl inputUrl(QDir::fromNativeSeparators(parser.value(CLI_INPUT_PARAMETER)));
QUrl outputUrl(QDir::fromNativeSeparators(parser.value(CLI_OUTPUT_PARAMETER)));
cli->bakeFile(inputUrl, outputUrl.toString());
} else { } else {
parser.showHelp(); parser.showHelp();
QApplication::quit(); QApplication::quit();