diff options
| author | Jason Maskell <[email protected]> | 2016-05-12 13:51:01 +0200 |
|---|---|---|
| committer | Jason Maskell <[email protected]> | 2016-05-12 13:51:01 +0200 |
| commit | 3f13a04cda58b8cb6b3ae76ea663443611752a38 (patch) | |
| tree | b655d905a336dfe0722ddc8582f049875f8f6d3d /cmake | |
| parent | Restructuring starts. Got some initial CMake problems sorted. Need to extend. (diff) | |
| download | waveworks_archive-3f13a04cda58b8cb6b3ae76ea663443611752a38.tar.xz waveworks_archive-3f13a04cda58b8cb6b3ae76ea663443611752a38.zip | |
Project now compiles with Cmake.
Modified FindDirectX to use the Windows SDK more, and added support for getting dxguid.lib
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CompileFXToH.cmake | 7 | ||||
| -rw-r--r-- | cmake/FindDirectX.cmake | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/cmake/CompileFXToH.cmake b/cmake/CompileFXToH.cmake index 02817e8..4839cba 100644 --- a/cmake/CompileFXToH.cmake +++ b/cmake/CompileFXToH.cmake @@ -1,16 +1,15 @@ -FUNCTION(CompileFXToH FILE OUTPUT_DIR TARGET INCLUDE_DIR INCLUDE_DIR2 ENTRYPOINT OPTIONS) +FUNCTION(CompileFXToH FILE OUTPUT_FILE TARGET INCLUDE_DIR INCLUDE_DIR2 ENTRYPOINT OPTIONS) GET_FILENAME_COMPONENT(FILE_WE ${FILE} NAME_WE) # "/I${SHADER_SRC_DIR} /EGFSDK_WAVEWORKS_VERTEX_INPUT_Sig /Tvs_4_0 ${SHADER_SRC_DIR}\Quadtree_SM4_sig.fx /Fh ${WW_SOURCE_DIR}\generated\Quadtree_SM4_sig.h" - ADD_CUSTOM_TARGET(${TARGET} ALL) ADD_CUSTOM_COMMAND( PRE_BUILD # TARGET ${TARGET} - OUTPUT ${OUTPUT_DIR}/${FILE_WE}.h - COMMAND ${DirectX_FXC_EXECUTABLE} /I${INCLUDE_DIR} /I${INCLUDE_DIR2} /E${ENTRYPOINT} ${OPTIONS} ${FILE} /Fh ${OUTPUT_DIR}/${FILE_WE}.h + OUTPUT ${OUTPUT_FILE} + COMMAND ${DirectX_FXC_EXECUTABLE} /I${INCLUDE_DIR} /I${INCLUDE_DIR2} /E${ENTRYPOINT} ${OPTIONS} ${FILE} /Fh ${OUTPUT_FILE} ${ARGV7} ${ARGV8} MAIN_DEPENDENCY ${FILE} COMMENT "FXC Compile ${FILE}" VERBATIM diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake index 34dbdd8..33be604 100644 --- a/cmake/FindDirectX.cmake +++ b/cmake/FindDirectX.cmake @@ -75,6 +75,7 @@ if (WIN32) # See also: # - http://msdn.microsoft.com/en-us/library/windows/desktop/ee663275.aspx if (DEFINED MSVC_VERSION AND NOT ${MSVC_VERSION} LESS 1700) + MESSAGE(Using WINSDK Headers) set (USE_WINSDK_HEADERS TRUE) endif () @@ -199,6 +200,7 @@ if (WIN32) find_winsdk_header (D3D11 d3d11.h) find_winsdk_library (D3D11 d3d11) + find_winsdk_library (DXGUID dxguid) find_combined (D3D11 D3D11 D3D11) find_winsdk_header (D3D11_1 d3d11_1.h) find_combined (D3D11_1 D3D11_1 D3D11) @@ -219,7 +221,8 @@ if (WIN32) endif () find_program (DirectX_FXC_EXECUTABLE fxc - HINTS ${DirectX_BIN_SEARCH_PATH} + HINTS "${ProgramFiles}/Windows Kits/8.1/bin/x86" "${ProgramFiles}/Windows Kits/8.0/bin/x86" ${DirectX_BIN_SEARCH_PATH} + DOC "Path to fxc.exe executable." ) |