diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-02-10 04:21:10 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-02-10 04:22:47 +0000 |
| commit | e51eeb6902ac83c97a56987f4b999027490bc1ae (patch) | |
| tree | 25b48e8d4631a63307b6342526b08577c508ea91 /unityplugin/GhostCubeScene | |
| parent | Fixed resize window issues in unity app (diff) | |
| download | DiligentEngine-e51eeb6902ac83c97a56987f4b999027490bc1ae.tar.gz DiligentEngine-e51eeb6902ac83c97a56987f4b999027490bc1ae.zip | |
Reworked win32 and uwp cmake build rules
Diffstat (limited to 'unityplugin/GhostCubeScene')
| -rw-r--r-- | unityplugin/GhostCubeScene/CMakeLists.txt | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/unityplugin/GhostCubeScene/CMakeLists.txt b/unityplugin/GhostCubeScene/CMakeLists.txt index 7c59cad..3249a54 100644 --- a/unityplugin/GhostCubeScene/CMakeLists.txt +++ b/unityplugin/GhostCubeScene/CMakeLists.txt @@ -27,9 +27,9 @@ endif() if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS) - add_executable(GhostCubeScene WIN32 ${SOURCE} ${INCLUDE} ${ASSETS}) - if(PLATFORM_WIN32) + add_win32_app(GhostCubeScene "${SOURCE}" "${INCLUDE}" "${ASSETS}") + set_target_properties(GhostCubeScene PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/assets" ) @@ -40,7 +40,9 @@ if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS) "\"$<TARGET_FILE_DIR:GhostCubeScene>\"") elseif(PLATFORM_UNIVERSAL_WINDOWS) - + add_uwp_app(GhostCubeScene "${SOURCE}" "${INCLUDE}" "${ASSETS}") + append_emulator_uwp_source(GhostCubeScene) + # We cannot use genreator expression to add a file because the file name # must not depend on the configuration set(PLUGIN_REL_DLL ${CMAKE_CURRENT_BINARY_DIR}/GhostCubePlugin_${ARCH}r.dll) @@ -118,16 +120,6 @@ endif() add_dependencies(GhostCubeScene GhostCubePlugin-shared) -if(PLATFORM_UNIVERSAL_WINDOWS) - get_native_app_uwp_source("" "" "") - get_emulator_uwp_source("${UWP_SOURCE}" "${UWP_INCLUDE}" "${UWP_INCLUDE_DIR}") - - source_group("UWP\\src" FILES ${UWP_SOURCE}) - source_group("UWP\\include" FILES ${UWP_INCLUDE}) - target_include_directories(GhostCubeScene PRIVATE ${UWP_INCLUDE_DIR}) - target_sources(GhostCubeScene PRIVATE ${UWP_SOURCE} ${UWP_INCLUDE}) -endif() - target_include_directories(GhostCubeScene PRIVATE |