From e1d6dc27ec013dfecde942c7690432925ce3e23a Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Thu, 13 Dec 2018 23:28:05 -0800 Subject: Fixed MinGW build --- Projects/Asteroids/CMakeLists.txt | 33 ++++++++++++++++++++------------- Projects/Asteroids/src/asteroids_DE.h | 2 +- 2 files changed, 21 insertions(+), 14 deletions(-) (limited to 'Projects') 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 #include #include -- cgit v1.2.3