diff options
| author | Jason Maskell <[email protected]> | 2016-05-31 11:24:52 +0200 |
|---|---|---|
| committer | Jason Maskell <[email protected]> | 2016-05-31 11:24:52 +0200 |
| commit | 999fd20ca96b8d44d3ce418f118fb3b846038978 (patch) | |
| tree | fc86969d4eb006f592560e7bd425b9a2db865be2 /compiler/cmake | |
| parent | Added path to opengl media search path. Removed commented out code left over ... (diff) | |
| download | waveworks_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')
| -rw-r--r-- | compiler/cmake/NvWaveWorks.cmake | 5 | ||||
| -rw-r--r-- | compiler/cmake/sample_d3d11.cmake | 6 | ||||
| -rw-r--r-- | compiler/cmake/test_d3d11.cmake | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/compiler/cmake/NvWaveWorks.cmake b/compiler/cmake/NvWaveWorks.cmake index 87b62d8..9ac0d91 100644 --- a/compiler/cmake/NvWaveWorks.cmake +++ b/compiler/cmake/NvWaveWorks.cmake @@ -9,6 +9,7 @@ SET(WW_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src) SET(SHADER_SRC_DIR ${WW_SOURCE_DIR}/shader) SET(DISTRO_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) SET(GEN_SRC_DIR ${WW_SOURCE_DIR}/generated) +SET(COMMON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/common) IF(TARGET_BUILD_PLATFORM STREQUAL "Windows") @@ -112,6 +113,9 @@ SET(H_FILES ${WW_SOURCE_DIR}/Simulation_impl.h ${WW_SOURCE_DIR}/Simulation_Util.h ${WW_SOURCE_DIR}/Spectrum_Util.h + + ${WW_SOURCE_DIR}/InternalLogger.h + ${WW_SOURCE_DIR}/InternalLogger.cpp ) SET(DISTRO_INCLUDE_FILES @@ -252,6 +256,7 @@ TARGET_INCLUDE_DIRECTORIES(WaveWorks PRIVATE ${WW_PLATFORM_INCLUDES} PRIVATE ${CUDA_INCLUDE_DIRS} PRIVATE ${GEN_SRC_DIR} + PRIVATE ${COMMON_SOURCE_DIR} PRIVATE ${PROJECT_SOURCE_DIR}/include PRIVATE ${SHADER_SRC_DIR} diff --git a/compiler/cmake/sample_d3d11.cmake b/compiler/cmake/sample_d3d11.cmake index 28f9895..2d8ddc7 100644 --- a/compiler/cmake/sample_d3d11.cmake +++ b/compiler/cmake/sample_d3d11.cmake @@ -9,6 +9,7 @@ FIND_PACKAGE(FX11 REQUIRED) FIND_PACKAGE(DirectXTK REQUIRED) SET(SAMP_SOURCE_DIR ${PROJECT_SOURCE_DIR}/sample/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) @@ -83,7 +84,10 @@ SET(APP_FILES ${SAMP_SOURCE_DIR}/terrain.cpp ${SAMP_SOURCE_DIR}/terrain.h - ${SAMP_SOURCE_DIR}/util.cpp + ${COMMON_SOURCE_DIR}/Logger.h + ${COMMON_SOURCE_DIR}/LoggerImpl.h + ${COMMON_SOURCE_DIR}/LoggerImpl.cpp + ) SET(FX_FILES 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 |