diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-12-14 07:28:05 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-12-14 07:28:05 +0000 |
| commit | e1d6dc27ec013dfecde942c7690432925ce3e23a (patch) | |
| tree | a21f16fb6959c0f46394057ae65cee470674e916 /Projects | |
| parent | Merge pull request #25 from kkulling/patch-1 (diff) | |
| download | DiligentEngine-e1d6dc27ec013dfecde942c7690432925ce3e23a.tar.gz DiligentEngine-e1d6dc27ec013dfecde942c7690432925ce3e23a.zip | |
Fixed MinGW build
Diffstat (limited to 'Projects')
| -rw-r--r-- | Projects/Asteroids/CMakeLists.txt | 33 | ||||
| -rw-r--r-- | Projects/Asteroids/src/asteroids_DE.h | 2 |
2 files changed, 21 insertions, 14 deletions
diff --git a/Projects/Asteroids/CMakeLists.txt b/Projects/Asteroids/CMakeLists.txt index 8fe0b5c..c273508 100644 --- a/Projects/Asteroids/CMakeLists.txt +++ b/Projects/Asteroids/CMakeLists.txt @@ -105,32 +105,39 @@ PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/CompiledShaders ) +if(PLATFORM_WIN32) + set(LIB_TYPE "shared") +else() + message(FATAL_ERROR "Unsupported platform") +endif() + +if(D3D11_SUPPORTED) + list(APPEND ENGINE_LIBRARIES GraphicsEngineD3D11-${LIB_TYPE}) +endif() +if(D3D12_SUPPORTED) + list(APPEND ENGINE_LIBRARIES GraphicsEngineD3D12-${LIB_TYPE}) +endif() +if(GL_SUPPORTED OR GLES_SUPPORTED) + list(APPEND ENGINE_LIBRARIES GraphicsEngineOpenGL-${LIB_TYPE}) +endif() +if(VULKAN_SUPPORTED) + list(APPEND ENGINE_LIBRARIES GraphicsEngineVk-${LIB_TYPE}) +endif() + target_link_libraries(Asteroids PRIVATE BuildSettings - GraphicsEngineD3D11-shared - GraphicsEngineD3D12-shared - GraphicsEngineOpenGL-shared TargetPlatform TextureLoader Common GraphicsTools - d3dcompiler.lib - d3d12.lib - d3d11.lib + ${ENGINE_LIBRARIES} ninput.lib winmm.lib dxgi.lib shcore.lib ) -if(VULKAN_SUPPORTED) - target_link_libraries(Asteroids - PRIVATE - GraphicsEngineVk-shared - ) -endif() - set_common_target_properties(Asteroids) if(MSVC) diff --git a/Projects/Asteroids/src/asteroids_DE.h b/Projects/Asteroids/src/asteroids_DE.h index 318eb8f..4029cc3 100644 --- a/Projects/Asteroids/src/asteroids_DE.h +++ b/Projects/Asteroids/src/asteroids_DE.h @@ -14,7 +14,7 @@ #include "SwapChain.h" #include "DeviceContext.h" #include "RefCntAutoPtr.h" -#include "Signal.h" +#include "ThreadSignal.h" #include <map> #include <mutex> #include <atomic> |