diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-01-28 02:34:14 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-01-28 02:34:14 +0000 |
| commit | 5c919d2abff6ccb9d36a1026c32ffd884f677654 (patch) | |
| tree | c55ccaf9bda339c25b3de3da909a80323753c3f7 /unityplugin | |
| parent | MacOS: setting unity emulator window title (diff) | |
| download | DiligentEngine-5c919d2abff6ccb9d36a1026c32ffd884f677654.tar.gz DiligentEngine-5c919d2abff6ccb9d36a1026c32ffd884f677654.zip | |
Fixed UWP deployment location for Unity emulator
Diffstat (limited to 'unityplugin')
| -rw-r--r-- | unityplugin/GhostCubeScene/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | unityplugin/UnityEmulator/src/UWP/UnityEmulatorAppMain.cpp | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/unityplugin/GhostCubeScene/CMakeLists.txt b/unityplugin/GhostCubeScene/CMakeLists.txt index 6ff47b3..4372595 100644 --- a/unityplugin/GhostCubeScene/CMakeLists.txt +++ b/unityplugin/GhostCubeScene/CMakeLists.txt @@ -50,11 +50,11 @@ if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS) set_source_files_properties(${PLUGIN_DLLS} PROPERTIES GENERATED TRUE) set_source_files_properties(${PLUGIN_DBG_DLL} PROPERTIES VS_DEPLOYMENT_CONTENT $<CONFIG:Debug> - VS_DEPLOYMENT_LOCATION "assets" + VS_DEPLOYMENT_LOCATION "." ) set_source_files_properties(${PLUGIN_REL_DLL} PROPERTIES VS_DEPLOYMENT_CONTENT $<NOT:$<CONFIG:Debug>> - VS_DEPLOYMENT_LOCATION "assets" + VS_DEPLOYMENT_LOCATION "." ) add_custom_command(TARGET GhostCubeScene PRE_BUILD @@ -68,7 +68,7 @@ if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS) set_source_files_properties(${SHADERS} PROPERTIES VS_DEPLOYMENT_CONTENT 1 - VS_DEPLOYMENT_LOCATION "assets/shaders" + VS_DEPLOYMENT_LOCATION "shaders" ) endif() diff --git a/unityplugin/UnityEmulator/src/UWP/UnityEmulatorAppMain.cpp b/unityplugin/UnityEmulator/src/UWP/UnityEmulatorAppMain.cpp index 71a82c1..5b272bc 100644 --- a/unityplugin/UnityEmulator/src/UWP/UnityEmulatorAppMain.cpp +++ b/unityplugin/UnityEmulator/src/UWP/UnityEmulatorAppMain.cpp @@ -78,12 +78,7 @@ bool UnityEmulatorAppMain::LoadPlugin(const char* LibPath) UnityEmulatorAppMain::UnityEmulatorAppMain() : m_scene(CreateScene()) { -#if defined(PLATFORM_UNIVERSAL_WINDOWS) - FileSystem::SetWorkingDirectory("assets"); -#endif - - std::string LibName = "Assets\\"; - LibName.append(m_scene->GetPluginName()); + std::string LibName(m_scene->GetPluginName()); #if _WIN64 # if _M_ARM >= 7 |