Merge pull request #456 from davidgyu/dxfix

A couple more DX / OpenCL changes for AMD
This commit is contained in:
Takahito Tejima 2015-04-30 11:02:49 -07:00
commit b0188bf217
3 changed files with 12 additions and 0 deletions

View File

@ -355,6 +355,10 @@ if (OPENGL_FOUND AND NOT IOS)
endif() endif()
endif() endif()
if (WIN32 AND NOT NO_DX)
find_package(DXSDK)
endif()
if (NOT NO_MAYA) if (NOT NO_MAYA)
find_package(Maya 201200) find_package(Maya 201200)
endif() endif()

View File

@ -41,6 +41,10 @@ include_directories(
"${PTEX_INCLUDE_DIR}" "${PTEX_INCLUDE_DIR}"
) )
if (OPENCL_FOUND)
include_directories("${OPENCL_INCLUDE_DIRS}")
endif()
set(SOURCE_FILES set(SOURCE_FILES
dxPtexViewer.cpp dxPtexViewer.cpp
) )

View File

@ -39,6 +39,10 @@ include_directories(
"${DXSDK_INCLUDE_DIR}" "${DXSDK_INCLUDE_DIR}"
) )
if (OPENCL_FOUND)
include_directories("${OPENCL_INCLUDE_DIRS}")
endif()
set(SOURCE_FILES set(SOURCE_FILES
dxViewer.cpp dxViewer.cpp
) )