diff options
| author | Jason Maskell <[email protected]> | 2016-05-19 11:56:51 +0200 |
|---|---|---|
| committer | Jason Maskell <[email protected]> | 2016-05-19 11:56:51 +0200 |
| commit | 67e62061658d90b9491c55544bb419f91a0c5c08 (patch) | |
| tree | 8769085a7916ae6e8b4fa6cb61a7d56018704396 /compiler/cmake/NvWaveWorks.cmake | |
| parent | Added the ability to specify the "media" directory for the test project. (diff) | |
| download | waveworks_archive-67e62061658d90b9491c55544bb419f91a0c5c08.tar.xz waveworks_archive-67e62061658d90b9491c55544bb419f91a0c5c08.zip | |
D3D11 test is compiling and running with a rendering error (ocean is grey and not dark blue).
D3D11 sample added but still has lots of compile errors, needs to be fully converted to use new DXUT11, etc.
Diffstat (limited to 'compiler/cmake/NvWaveWorks.cmake')
| -rw-r--r-- | compiler/cmake/NvWaveWorks.cmake | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/compiler/cmake/NvWaveWorks.cmake b/compiler/cmake/NvWaveWorks.cmake index d34f42a..87b62d8 100644 --- a/compiler/cmake/NvWaveWorks.cmake +++ b/compiler/cmake/NvWaveWorks.cmake @@ -24,7 +24,7 @@ IF(TARGET_BUILD_PLATFORM STREQUAL "Windows") # Use generator expressions to set config specific preprocessor definitions SET(WW_COMPILE_DEFS # Common to all configurations - _LIB;NVWAVEWORKS_LIB_DLL_EXPORTS;WIN32; + _LIB;NVWAVEWORKS_LIB_DLL_EXPORTS;WIN32;WAVEWORKS_ENABLE_DIRECTCOMPUTE $<$<CONFIG:debug>:PROFILE;_DEV;> $<$<CONFIG:release>:NDEBUG;> @@ -201,20 +201,20 @@ CompileFXToH(${WW_SOURCE_DIR}/FFT_Simulation_DirectCompute_shader.hlsl ${GEN_SRC # Now the CUDA file # CUDA! -SET(CUDA_NVCC_FLAGS "-G -g -DWIN32 -D_WINDOWS -D_UNICODE -DUNICODE -D_LIB -gencode arch=compute_30,code=compute_30 -gencode arch=compute_20,code=sm_20") +# SET(CUDA_NVCC_FLAGS "-G -g -DWIN32 -D_WINDOWS -D_UNICODE -DUNICODE -D_LIB -gencode arch=compute_30,code=compute_30 -gencode arch=compute_20,code=sm_20") -CUDA_INCLUDE_DIRECTORIES( - ${CUDA_INCLUDE_DIRS} -) +# CUDA_INCLUDE_DIRECTORIES( + # ${CUDA_INCLUDE_DIRS} +# ) -SET(CUDA_PROPAGATE_HOST_FLAGS OFF) +# SET(CUDA_PROPAGATE_HOST_FLAGS OFF) -SET(CUDA_NVCC_FLAGS_DEBUG "--compiler-options=/Zi,/W4,/nologo,/Od,/MTd") -SET(CUDA_NVCC_FLAGS_RELEASE "-use_fast_math -DNDEBUG --compiler-options=/W4,/nologo,/O2,/GF,/GS-,/Gy,/fp:fast,/GR-,/MT") +# SET(CUDA_NVCC_FLAGS_DEBUG "--compiler-options=/Zi,/W4,/nologo,/Od,/MTd") +# SET(CUDA_NVCC_FLAGS_RELEASE "-use_fast_math -DNDEBUG --compiler-options=/W4,/nologo,/O2,/GF,/GS-,/Gy,/fp:fast,/GR-,/MT") -CUDA_COMPILE(GENERATED_CUDA_FILES_1 - ${WW_SOURCE_DIR}/FFT_Simulation_CUDA_kernel.cu -) +# CUDA_COMPILE(GENERATED_CUDA_FILES_1 + # ${WW_SOURCE_DIR}/FFT_Simulation_CUDA_kernel.cu +# ) ADD_LIBRARY(WaveWorks ${WW_LIBTYPE} ${WW_PLATFORM_SRC_FILES} @@ -229,7 +229,7 @@ ADD_LIBRARY(WaveWorks ${WW_LIBTYPE} ${GENERATED_HLSL_FILES} - ${GENERATED_CUDA_FILES_1} +# ${GENERATED_CUDA_FILES_1} # ${HLSL_FILES} # ${CUDA_FILES} |