summaryrefslogtreecommitdiff
path: root/compiler/cmake/test_d3d11.cmake
diff options
context:
space:
mode:
authorJason Maskell <[email protected]>2016-05-31 11:24:52 +0200
committerJason Maskell <[email protected]>2016-05-31 11:24:52 +0200
commit999fd20ca96b8d44d3ce418f118fb3b846038978 (patch)
treefc86969d4eb006f592560e7bd425b9a2db865be2 /compiler/cmake/test_d3d11.cmake
parentAdded path to opengl media search path. Removed commented out code left over ... (diff)
downloadwaveworks_archive-999fd20ca96b8d44d3ce418f118fb3b846038978.tar.xz
waveworks_archive-999fd20ca96b8d44d3ce418f118fb3b846038978.zip
Added support for RFC 104, the logging interface: https://docs.google.com/document/d/102b8k5pKYj9e-tMmG53aT5izur-qfUSPX1gBro4gN0Q/edit
Added a dumb implementation of the logger in the D3D11 sample. Added a method to the WaveWorks API to allow the user to set (override) the internal logger with their own supplied nv::ILogger derived object.
Diffstat (limited to 'compiler/cmake/test_d3d11.cmake')
-rw-r--r--compiler/cmake/test_d3d11.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/cmake/test_d3d11.cmake b/compiler/cmake/test_d3d11.cmake
index a1679e8..68e5e5e 100644
--- a/compiler/cmake/test_d3d11.cmake
+++ b/compiler/cmake/test_d3d11.cmake
@@ -11,6 +11,7 @@ FIND_PACKAGE(DirectXTK REQUIRED)
MESSAGE("FX11 ${FX11_SDK_PATH}")
SET(TEST_SOURCE_DIR ${PROJECT_SOURCE_DIR}/test/d3d11)
+SET(COMMON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/common)
SET(SHARED_CS_DIR ${PROJECT_SOURCE_DIR}/test/client-server)
SET(TL_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
@@ -76,8 +77,11 @@ ENDIF()
SET(APP_FILES
${TEST_SOURCE_DIR}/ocean_cufft_app.cpp
${TEST_SOURCE_DIR}/ocean_surface.cpp
- ${TEST_SOURCE_DIR}/util.cpp
${TEST_SOURCE_DIR}/ocean_surface.h
+
+ ${COMMON_SOURCE_DIR}/Logger.h
+ ${COMMON_SOURCE_DIR}/LoggerImpl.h
+ ${COMMON_SOURCE_DIR}/LoggerImpl.cpp
)
SET(SHARED_CS_FILES