diff options
| author | Jason Maskell <Jason Maskell> | 2016-07-28 10:22:09 +0700 |
|---|---|---|
| committer | Jason Maskell <Jason Maskell> | 2016-07-28 10:22:09 +0700 |
| commit | 18f4627180d46db16804989d1a5e4973abfebb3d (patch) | |
| tree | 7b8433842a45b39696183d33b684a77750f44b4d /compiler/cmake/sample_d3d11.cmake | |
| parent | Re-added the VS2013 project generation (diff) | |
| download | waveworks_archive-18f4627180d46db16804989d1a5e4973abfebb3d.tar.xz waveworks_archive-18f4627180d46db16804989d1a5e4973abfebb3d.zip | |
Don't need FindDirectX anymore, so deleted it and modified the cmake files.
Diffstat (limited to 'compiler/cmake/sample_d3d11.cmake')
| -rw-r--r-- | compiler/cmake/sample_d3d11.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/cmake/sample_d3d11.cmake b/compiler/cmake/sample_d3d11.cmake index 9a0e219..b9ebb9d 100644 --- a/compiler/cmake/sample_d3d11.cmake +++ b/compiler/cmake/sample_d3d11.cmake @@ -15,7 +15,7 @@ SET(TL_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) IF(TARGET_BUILD_PLATFORM STREQUAL "Windows") - FIND_PACKAGE(DirectX REQUIRED) +# FIND_PACKAGE(DirectX REQUIRED) SET(WW_PLATFORM_INCLUDES ) @@ -149,7 +149,7 @@ TARGET_COMPILE_DEFINITIONS(SampleD3D11 IF(TARGET_BUILD_PLATFORM STREQUAL "Windows") # Add linked libraries - TARGET_LINK_LIBRARIES(SampleD3D11 PUBLIC WaveWorks Ws2_32.lib comctl32.lib Usp10.lib ${CUDA_LIBRARIES} ${DirectX_DXGUID_LIBRARY} ${DirectX_D3D11_LIBRARY} ${DXUT_LIBRARIES} ${FX11_LIBRARIES} ${DXTK_LIBRARIES}) + TARGET_LINK_LIBRARIES(SampleD3D11 PUBLIC WaveWorks Ws2_32.lib comctl32.lib Usp10.lib ${CUDA_LIBRARIES} dxguid.lib d3d11.lib ${DXUT_LIBRARIES} ${FX11_LIBRARIES} ${DXTK_LIBRARIES}) IF(CMAKE_CL_64) SET(LIBPATH_SUFFIX "win64") |