v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
assimp/samples/SimpleTexturedDirectx11/CMakeLists.txt

50 lines
1.4 KiB
CMake
Raw Normal View History

closes https://github.com/assimp/assimp/issues/2681: add dx11-sample to cmake.
2019-11-15 19:52:13 +00:00
FIND_PACKAGE(DirectX)
IF ( MSVC )
SET(M_LIB)
Removed uneeded expression in else() and endif() constructs. The following changes were tested against building with a master copy. For a more detailed report, please read the followings below: The flags that were checked were the ones checked by default + the following: ASSIMP_BUILD_ASSIMP_VIEW ASSIMP_BUILD_SAMPLES The list of compilable projects in Visual Studio were the following: - assimp - assimp_cmd - assimp_simpleogl - assimp_simpletextureddirectx11 - assimp_simpletexturedogl - assimp_viewer - INSTALL - IrrXML - uninstall - unit - UpdateAssimpLibsDebugSymbolsAndDLLs - ZERO_CHECK - zlib - zlibstatic The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run. UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004.
2020-02-23 12:09:35 +00:00
ENDIF ()
closes https://github.com/assimp/assimp/issues/2681: add dx11-sample to cmake.
2019-11-15 19:52:13 +00:00
if ( MSVC )
ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
REMOVE_DEFINITIONS( -DUNICODE -D_UNICODE )
Removed uneeded expression in else() and endif() constructs. The following changes were tested against building with a master copy. For a more detailed report, please read the followings below: The flags that were checked were the ones checked by default + the following: ASSIMP_BUILD_ASSIMP_VIEW ASSIMP_BUILD_SAMPLES The list of compilable projects in Visual Studio were the following: - assimp - assimp_cmd - assimp_simpleogl - assimp_simpletextureddirectx11 - assimp_simpletexturedogl - assimp_viewer - INSTALL - IrrXML - uninstall - unit - UpdateAssimpLibsDebugSymbolsAndDLLs - ZERO_CHECK - zlib - zlibstatic The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run. UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004.
2020-02-23 12:09:35 +00:00
endif ()
closes https://github.com/assimp/assimp/issues/2681: add dx11-sample to cmake.
2019-11-15 19:52:13 +00:00
Fixed SimpleTexturedDirectX11 sample. - Removed OpenGL/Glut references in SimpleTexturedDirectX11 CMakeFile - Moved UTFConverter from SimpleTexturedOpenGL to its own file to be able to reuse it. - Added compile definition SHADER_PATH to allow to locate the shader files in CMakeFile - Fixed compile warnings - Made global pointers null to help prevent dangling references. - Added missing members initialization in class constructors. - Removed references to missing model "Models/mymodel.fbx" - Fixed error when extracting model file directory - Added missing device context assignment in ModelLoader Load method - Fixed memory leak caused by variable 'ourModel' not deleted. - Removed call to dev->Release() in ModelLoader.cpp - Adjusted Release() calls in reverse order when cleaning up D3D - Made Throwanerror implementation throw an error instead of displaying a message box - Fixed leaking D3D resources - Added a pointer to an ID3D11Debug to dump live objects.
2020-03-06 15:26:51 +00:00
ADD_COMPILE_DEFINITIONS(SHADER_PATH="${CMAKE_CURRENT_SOURCE_DIR}/SimpleTexturedDirectx11/")
closes https://github.com/assimp/assimp/issues/2681: add dx11-sample to cmake.
2019-11-15 19:52:13 +00:00
INCLUDE_DIRECTORIES(
${Assimp_SOURCE_DIR}/include
${Assimp_SOURCE_DIR}/code
Fixed SimpleTexturedDirectX11 sample. - Removed OpenGL/Glut references in SimpleTexturedDirectX11 CMakeFile - Moved UTFConverter from SimpleTexturedOpenGL to its own file to be able to reuse it. - Added compile definition SHADER_PATH to allow to locate the shader files in CMakeFile - Fixed compile warnings - Made global pointers null to help prevent dangling references. - Added missing members initialization in class constructors. - Removed references to missing model "Models/mymodel.fbx" - Fixed error when extracting model file directory - Added missing device context assignment in ModelLoader Load method - Fixed memory leak caused by variable 'ourModel' not deleted. - Removed call to dev->Release() in ModelLoader.cpp - Adjusted Release() calls in reverse order when cleaning up D3D - Made Throwanerror implementation throw an error instead of displaying a message box - Fixed leaking D3D resources - Added a pointer to an ID3D11Debug to dump live objects.
2020-03-06 15:26:51 +00:00
${SAMPLES_SHARED_CODE_DIR}
closes https://github.com/assimp/assimp/issues/2681: add dx11-sample to cmake.
2019-11-15 19:52:13 +00:00
)
LINK_DIRECTORIES(
${Assimp_BINARY_DIR}
${Assimp_BINARY_DIR}/lib
)
ADD_EXECUTABLE( assimp_simpletextureddirectx11 WIN32
SimpleTexturedDirectx11/Mesh.h
SimpleTexturedDirectx11/ModelLoader.cpp
SimpleTexturedDirectx11/ModelLoader.h
#SimpleTexturedDirectx11/PixelShader.hlsl
SimpleTexturedDirectx11/TextureLoader.cpp
SimpleTexturedDirectx11/TextureLoader.h
#SimpleTexturedDirectx11/VertexShader.hlsl
SimpleTexturedDirectx11/main.cpp
Fixed SimpleTexturedDirectX11 sample. - Removed OpenGL/Glut references in SimpleTexturedDirectX11 CMakeFile - Moved UTFConverter from SimpleTexturedOpenGL to its own file to be able to reuse it. - Added compile definition SHADER_PATH to allow to locate the shader files in CMakeFile - Fixed compile warnings - Made global pointers null to help prevent dangling references. - Added missing members initialization in class constructors. - Removed references to missing model "Models/mymodel.fbx" - Fixed error when extracting model file directory - Added missing device context assignment in ModelLoader Load method - Fixed memory leak caused by variable 'ourModel' not deleted. - Removed call to dev->Release() in ModelLoader.cpp - Adjusted Release() calls in reverse order when cleaning up D3D - Made Throwanerror implementation throw an error instead of displaying a message box - Fixed leaking D3D resources - Added a pointer to an ID3D11Debug to dump live objects.
2020-03-06 15:26:51 +00:00
SimpleTexturedDirectx11/SafeRelease.hpp
${SAMPLES_SHARED_CODE_DIR}/UTFConverter.cpp
${SAMPLES_SHARED_CODE_DIR}/UTFConverter.h
closes https://github.com/assimp/assimp/issues/2681: add dx11-sample to cmake.
2019-11-15 19:52:13 +00:00
)
SET_PROPERTY(TARGET assimp_simpletextureddirectx11 PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
Minor changes in CMakeLists files. - Fixed condition preventing ASSIMP_BUILD_ASSIMP_VIEW showing up on first time - Set ASSIMP_BUILD_ASSIMP_VIEW to off by default. - Removed unnecessary reference to DirectX 9 library.
2020-03-10 17:47:10 +00:00
TARGET_LINK_LIBRARIES( assimp_simpletextureddirectx11 assimp comctl32.lib winmm.lib )
closes https://github.com/assimp/assimp/issues/2681: add dx11-sample to cmake.
2019-11-15 19:52:13 +00:00
SET_TARGET_PROPERTIES( assimp_simpletextureddirectx11 PROPERTIES
OUTPUT_NAME assimp_simpletextureddirectx11
)
INSTALL( TARGETS assimp_simpletextureddirectx11
DESTINATION "${ASSIMP_BIN_INSTALL_DIR}" COMPONENT assimp-dev
)