sync with upstream

1 files changed, 3 insertions, 22 deletions

diff --git a/project/cmake/modules/FindD3DX11Effects.cmake b/project/cmake/modules/FindD3DX11Effects.cmake
index 9de8c2b..d7468e1 100644
--- a/project/cmake/modules/FindD3DX11Effects.cmake
+++ b/project/cmake/modules/FindD3DX11Effects.cmake
@@ -1,28 +1,8 @@
-# - Builds D3DX11Effects as external project
+# - Finds D3DX11 dependencies
 # Once done this will define
 #
-# D3DX11EFFECTS_FOUND - system has D3DX11Effects
-# D3DX11EFFECTS_INCLUDE_DIRS - the D3DX11Effects include directories
 # D3DCOMPILER_DLL - Path to the Direct3D Compiler
-
-include(ExternalProject)
-ExternalProject_Add(d3dx11effects
-            SOURCE_DIR ${CORE_SOURCE_DIR}/lib/win32/Effects11
-            PREFIX ${CORE_BUILD_DIR}/Effects11
-            CONFIGURE_COMMAND ""
-            BUILD_COMMAND msbuild ${CORE_SOURCE_DIR}/lib/win32/Effects11/Effects11_2013.sln
-                                  /t:Effects11 /p:Configuration=${CORE_BUILD_CONFIG}
-            INSTALL_COMMAND "")
-
-set(D3DX11EFFECTS_FOUND 1)
-set(D3DX11EFFECTS_INCLUDE_DIRS ${CORE_SOURCE_DIR}/lib/win32/Effects11/inc)
-
-set(D3DX11EFFECTS_LIBRARY_RELEASE ${CORE_SOURCE_DIR}/lib/win32/Effects11/libs/Effects11/Release/Effects11.lib)
-set(D3DX11EFFECTS_LIBRARY_DEBUG ${CORE_SOURCE_DIR}/lib/win32/Effects11/libs/Effects11/Debug/Effects11.lib)
-include(SelectLibraryConfigurations)
-select_library_configurations(D3DX11EFFECTS)
-
-mark_as_advanced(D3DX11EFFECTS_FOUND)
+# FXC - Path to the DirectX Effects Compiler (FXC)
 
 find_file(D3DCOMPILER_DLL
           NAMES d3dcompiler_47.dll d3dcompiler_46.dll
@@ -36,6 +16,7 @@ if(NOT D3DCOMPILER_DLL)
   message(WARNING "Could NOT find Direct3D Compiler")
 endif()
 mark_as_advanced(D3DCOMPILER_DLL)
+copy_file_to_buildtree(${D3DCOMPILER_DLL} DIRECTORY .)
 
 find_program(FXC fxc
              PATHS