diff options
| author | Jason Maskell <[email protected]> | 2016-05-16 16:31:40 +0200 |
|---|---|---|
| committer | Jason Maskell <[email protected]> | 2016-05-16 16:31:40 +0200 |
| commit | 35fb54cc684bd78ebb15ea64705396bcef53ff4f (patch) | |
| tree | c437f7e2ce02fc7e98d2e7bd0943cdc92fe17b5d /compiler | |
| parent | Added the test_d3d11 app to the solution. Not compiling yet, mostly a paranoi... (diff) | |
| download | waveworks_archive-35fb54cc684bd78ebb15ea64705396bcef53ff4f.tar.xz waveworks_archive-35fb54cc684bd78ebb15ea64705396bcef53ff4f.zip | |
Added the ability to specify the "media" directory for the test project.
test_d3d11 now runs, but doesn't work yet.
Converted foam.dds to 32 bit to let it actually load since it's 24 bit format was deprecated.
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/cmake/test_d3d11.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/cmake/test_d3d11.cmake b/compiler/cmake/test_d3d11.cmake index 9ceb7d3..9d2564b 100644 --- a/compiler/cmake/test_d3d11.cmake +++ b/compiler/cmake/test_d3d11.cmake @@ -111,7 +111,7 @@ CompileFXToFXO(${TEST_SOURCE_DIR}/ocean_marker.fx ${PROJECT_SOURCE_DIR}/test/med CompileFXToFXO(${TEST_SOURCE_DIR}/ocean_surface.fx ${PROJECT_SOURCE_DIR}/test/media/ocean_surface_d3d11.fxo d3d11fx ${TL_INCLUDE_DIR} /O3 /Tfx_5_0) CompileFXToFXO(${TEST_SOURCE_DIR}/skybox.fx ${PROJECT_SOURCE_DIR}/test/media/skybox_d3d11.fxo d3d11fx ${TL_INCLUDE_DIR} /O3 /Tfx_5_0) -ADD_LIBRARY(TestD3D11 ${WW_LIBTYPE} +ADD_EXECUTABLE(TestD3D11 WIN32 ${WW_PLATFORM_SRC_FILES} ${APP_FILES} @@ -155,7 +155,7 @@ TARGET_COMPILE_DEFINITIONS(TestD3D11 IF(TARGET_BUILD_PLATFORM STREQUAL "Windows") # Add linked libraries - TARGET_LINK_LIBRARIES(TestD3D11 PUBLIC WaveWorks ${CUDA_LIBRARIES} ${DirectX_DXGUID_LIBRARY} ${DirectX_D3D11_LIBRARY} ${FXO_FILES} ${DXUT_LIBRARIES} ${FX11_LIBRARIES} ${DXTK_LIBRARIES}) + TARGET_LINK_LIBRARIES(TestD3D11 PUBLIC WaveWorks Ws2_32.lib comctl32.lib Usp10.lib ${CUDA_LIBRARIES} ${DirectX_DXGUID_LIBRARY} ${DirectX_D3D11_LIBRARY} ${DXUT_LIBRARIES} ${FX11_LIBRARIES} ${DXTK_LIBRARIES}) IF(CMAKE_CL_64) SET(LIBPATH_SUFFIX "win64") |