AuroraMiddleware/D3D12MemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git synced 2024-11-21 19:50:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' into 'development'

Browse Source 
Doxygen generation fix, small cleanup

See merge request gpuopen/GPUOpen-LibrariesAndSDKs/d3d12memoryallocator!2
This commit is contained in:
Sawicki, Adam 2021-10-06 12:10:31 +00:00
commit 9e2ad5312d
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CMakeLists.txt
View File

@ -52,11 +52,13 @@ if (D3D12MA_BUILD_SAMPLE)
set_source_files_properties( ${VERTEX_SHADERS}
PROPERTIES
VS_SHADER_TYPE Vertex
VS_SETTINGS "ExcludedFromBuild=true"
)
set_source_files_properties( ${PIXEL_SHADERS}
PROPERTIES
VS_SHADER_TYPE Pixel
VS_SETTINGS "ExcludedFromBuild=true"
)
add_executable(D3D12Sample ${D3D12_SAMPLE_SOURCE_FILES} ${SHADERS})
@ -101,7 +103,3 @@ if (D3D12MA_BUILD_SAMPLE)
message(STATUS "D3D12Sample application is not supported to Linux")
endif()
endif()
if(D3D12MA_BUILD_SAMPLE_SHADERS)
# add_subdirectory(Shaders)
endif()

4
src/Doxyfile
View File

@ -58,7 +58,7 @@ PROJECT_LOGO =
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
OUTPUT_DIRECTORY = ../docs
OUTPUT_DIRECTORY = @CMAKE_SOURCE_DIR@/docs
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@ -823,7 +823,7 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.
INPUT = @CMAKE_CURRENT_SOURCE_DIR@/src/D3D12MemAlloc.h
INPUT = @CMAKE_SOURCE_DIR@/src/D3D12MemAlloc.h
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses