diff options
| author | Jason Maskell <[email protected]> | 2016-05-16 15:00:36 +0200 |
|---|---|---|
| committer | Jason Maskell <[email protected]> | 2016-05-16 15:00:36 +0200 |
| commit | 3eb017d032e0c542401ea202f7a62b7c7ddcd498 (patch) | |
| tree | 6470077bdc344f1493778976917f7217a3159707 /compiler/cmake/NvWaveWorks.cmake | |
| parent | Project now compiles with Cmake. (diff) | |
| download | waveworks_archive-3eb017d032e0c542401ea202f7a62b7c7ddcd498.tar.xz waveworks_archive-3eb017d032e0c542401ea202f7a62b7c7ddcd498.zip | |
Added the test_d3d11 app to the solution. Not compiling yet, mostly a paranoia commit.
Diffstat (limited to 'compiler/cmake/NvWaveWorks.cmake')
| -rw-r--r-- | compiler/cmake/NvWaveWorks.cmake | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/compiler/cmake/NvWaveWorks.cmake b/compiler/cmake/NvWaveWorks.cmake index 6ca3015..d34f42a 100644 --- a/compiler/cmake/NvWaveWorks.cmake +++ b/compiler/cmake/NvWaveWorks.cmake @@ -2,8 +2,6 @@ # Build NvWaveWorks (PROJECT not SOLUTION) # -SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT}) - FIND_PACKAGE(CUDA REQUIRED) @@ -122,12 +120,13 @@ SET(DISTRO_INCLUDE_FILES ${DISTRO_INCLUDE_DIR}/GFSDK_WaveWorks_D3D_Util.h ${DISTRO_INCLUDE_DIR}/GFSDK_WaveWorks_GUID.h ${DISTRO_INCLUDE_DIR}/GFSDK_WaveWorks_Types.h + + ${DISTRO_INCLUDE_DIR}/GFSDK_WaveWorks_Quadtree.fxh + ${DISTRO_INCLUDE_DIR}/GFSDK_WaveWorks_Attributes.fxh + ${DISTRO_INCLUDE_DIR}/GFSDK_WaveWorks_Common.fxh ) SET(HLSL_FILES - ${SHADER_SRC_DIR}/Attributes.fxh - ${SHADER_SRC_DIR}/Common.fxh - ${SHADER_SRC_DIR}/Quadtree.fxh ${SHADER_SRC_DIR}/CalcGradient.fx ${SHADER_SRC_DIR}/CalcGradient_SM3.fx @@ -183,11 +182,11 @@ CompileFXToH(${SHADER_SRC_DIR}/Quadtree_SM5_sig.fx ${GEN_SRC_DIR}/Quadtree_SM5_s # NOTE: This does a weird thing. Only the PS command invocation will show in VS. The other one is there, but is in some sort of hidden file. # It can still be seen in the project xml. -CompileFXToH(${SHADER_SRC_DIR}/FoamGeneration_SM4.fx ${GEN_SRC_DIR}/FoamGeneration_ps_4_0.h fx ${SHADER_SRC_DIR} ${GEN_SRC_DIR} ps /Tps_4_0) -CompileFXToH(${SHADER_SRC_DIR}/FoamGeneration_SM4.fx ${GEN_SRC_DIR}/FoamGeneration_vs_4_0.h fx ${SHADER_SRC_DIR} ${GEN_SRC_DIR} vs /Tvs_4_0) +CompileFXToH(${SHADER_SRC_DIR}/FoamGeneration_SM4.fx ${GEN_SRC_DIR}/FoamGeneration_ps_4_0.h fx ${SHADER_SRC_DIR} ${DISTRO_INCLUDE_DIR} ps /Tps_4_0) +CompileFXToH(${SHADER_SRC_DIR}/FoamGeneration_SM4.fx ${GEN_SRC_DIR}/FoamGeneration_vs_4_0.h fx ${SHADER_SRC_DIR} ${DISTRO_INCLUDE_DIR} vs /Tvs_4_0) -CompileFXToH(${SHADER_SRC_DIR}/FoamGeneration_SM3.fx ${GEN_SRC_DIR}/FoamGeneration_ps_3_0.h fx ${SHADER_SRC_DIR} ${GEN_SRC_DIR} ps /Tps_3_0) -CompileFXToH(${SHADER_SRC_DIR}/FoamGeneration_SM3.fx ${GEN_SRC_DIR}/FoamGeneration_vs_3_0.h fx ${SHADER_SRC_DIR} ${GEN_SRC_DIR} vs /Tvs_3_0) +CompileFXToH(${SHADER_SRC_DIR}/FoamGeneration_SM3.fx ${GEN_SRC_DIR}/FoamGeneration_ps_3_0.h fx ${SHADER_SRC_DIR} ${DISTRO_INCLUDE_DIR} ps /Tps_3_0) +CompileFXToH(${SHADER_SRC_DIR}/FoamGeneration_SM3.fx ${GEN_SRC_DIR}/FoamGeneration_vs_3_0.h fx ${SHADER_SRC_DIR} ${DISTRO_INCLUDE_DIR} vs /Tvs_3_0) CompileFXToH(${SHADER_SRC_DIR}/CalcGradient_SM4.fx ${GEN_SRC_DIR}/CalcGradient_ps_4_0.h fx ${SHADER_SRC_DIR} ${GEN_SRC_DIR} ps /Tps_4_0) CompileFXToH(${SHADER_SRC_DIR}/CalcGradient_SM4.fx ${GEN_SRC_DIR}/CalcGradient_vs_4_0.h fx ${SHADER_SRC_DIR} ${GEN_SRC_DIR} vs /Tvs_4_0) @@ -225,6 +224,9 @@ ADD_LIBRARY(WaveWorks ${WW_LIBTYPE} ${DISTRO_INCLUDE_FILES} ${FX_FILES} + +# ${HLSL_FILES} + ${GENERATED_HLSL_FILES} ${GENERATED_CUDA_FILES_1} |