summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineD3DBase
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2017-12-04 06:49:58 +0000
committerEgor Yusov <egor.yusov@gmail.com>2017-12-04 06:49:58 +0000
commit31ef1439afad23453772ab694f532ff589c92939 (patch)
tree0f15b5f12ccd8d114cf00357ab3497aa05e61472 /Graphics/GraphicsEngineD3DBase
parentFixed Android build issues (diff)
downloadDiligentCore-31ef1439afad23453772ab694f532ff589c92939.tar.gz
DiligentCore-31ef1439afad23453772ab694f532ff589c92939.zip
Added cmake files
Diffstat (limited to 'Graphics/GraphicsEngineD3DBase')
-rw-r--r--Graphics/GraphicsEngineD3DBase/CMakeLists.txt61
-rw-r--r--Graphics/GraphicsEngineD3DBase/include/ShaderResources.h3
-rw-r--r--Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp1
3 files changed, 65 insertions, 0 deletions
diff --git a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt
new file mode 100644
index 00000000..1eb2eed6
--- /dev/null
+++ b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt
@@ -0,0 +1,61 @@
+cmake_minimum_required (VERSION 3.3)
+
+project(GraphicsEngineD3DBase)
+
+set(INCLUDE
+ include/D3DErrors.h
+ include/D3DShaderResourceLoader.h
+ include/D3DTypeConversionImpl.h
+ include/D3DViewDescConversionImpl.h
+ include/DXGITypeConversions.h
+ include/HLSLDefinitions.fxh
+ include/RenderDeviceD3DBase.h
+ include/ShaderD3DBase.h
+ include/ShaderResources.h
+ include/ShaderVariableD3DBase.h
+)
+
+set(SOURCE
+ src/DXGITypeConversions.cpp
+ src/ShaderD3DBase.cpp
+ src/ShaderResources.cpp
+ include/HLSLDefinitions_inc.fxh
+)
+
+add_library(GraphicsEngineD3DBase STATIC
+ ${SOURCE} ${INCLUDE}
+)
+
+set_source_files_properties(
+ include/HLSLDefinitions_inc.fxh
+ PROPERTIES GENERATED TRUE
+)
+
+# Create custom target to convert HLSLDefinitions.fxh to HLSLDefinitions_inc.fxh
+add_custom_target(ProcessHLSLDefinitions)
+add_dependencies(ProcessHLSLDefinitions File2String)
+
+add_custom_command(TARGET ProcessHLSLDefinitions
+ # Unfortunately it is not possible to set TARGET directly to GraphicsEngineD3DBase
+ # because PRE_BUILD is only supported on Visual Studio 8 or later. For all other generators
+ # PRE_BUILD is treated as PRE_LINK.
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../../Utilities/File2Include/File2String.exe include/HLSLDefinitions.fxh include/HLSLDefinitions_inc.fxh
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ COMMENT "Processing HLSLDefinitions.fxh"
+ VERBATIM
+)
+
+add_dependencies(GraphicsEngineD3DBase ProcessHLSLDefinitions)
+
+target_include_directories(GraphicsEngineD3DBase
+PUBLIC
+ include
+ interface
+PRIVATE
+ ../GraphicsTools/include
+)
+
+target_link_libraries(GraphicsEngineD3DBase PRIVATE BuildSettings GraphicsEngine PlatformInterface Common)
+
+source_group("src" FILES ${SOURCE})
+source_group("include" FILES ${INCLUDE})
diff --git a/Graphics/GraphicsEngineD3DBase/include/ShaderResources.h b/Graphics/GraphicsEngineD3DBase/include/ShaderResources.h
index 7f03563f..7eba6b48 100644
--- a/Graphics/GraphicsEngineD3DBase/include/ShaderResources.h
+++ b/Graphics/GraphicsEngineD3DBase/include/ShaderResources.h
@@ -54,6 +54,9 @@
#define NOMINMAX
#include <d3dcommon.h>
+#include "Shader.h"
+#include "STDAllocator.h"
+
namespace Diligent
{
diff --git a/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp b/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp
index e5a62f98..06d5b0e4 100644
--- a/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp
+++ b/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp
@@ -22,6 +22,7 @@
*/
#include "pch.h"
+#include "EngineMemory.h"
#include "StringTools.h"
#include "ShaderResources.h"