From f5324e23eff28359ffd3fb0f5b0375dd4fddd036 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 31 Mar 2020 19:35:19 +0200 Subject: [PATCH 1/2] closes https://github.com/assimp/assimp/pull/3104: remove unused includes. --- samples/SimpleTexturedOpenGL/CMakeLists.txt | 3 +-- .../SimpleTexturedOpenGL/include/boost_includes.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/include/boost_includes.h diff --git a/samples/SimpleTexturedOpenGL/CMakeLists.txt b/samples/SimpleTexturedOpenGL/CMakeLists.txt index e40c40f29..83cd2746e 100644 --- a/samples/SimpleTexturedOpenGL/CMakeLists.txt +++ b/samples/SimpleTexturedOpenGL/CMakeLists.txt @@ -17,7 +17,6 @@ if ( MSVC ) endif () INCLUDE_DIRECTORIES( - ${Assimp_SOURCE_DIR}/include ${Assimp_SOURCE_DIR}/code ${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR} @@ -30,7 +29,6 @@ LINK_DIRECTORIES( ) ADD_EXECUTABLE( assimp_simpletexturedogl WIN32 - SimpleTexturedOpenGL/include/boost_includes.h SimpleTexturedOpenGL/src/model_loading.cpp ${SAMPLES_SHARED_CODE_DIR}/UTFConverter.cpp ${SAMPLES_SHARED_CODE_DIR}/UTFConverter.h @@ -47,3 +45,4 @@ SET_TARGET_PROPERTIES( assimp_simpletexturedogl PROPERTIES INSTALL( TARGETS assimp_simpletexturedogl DESTINATION "${ASSIMP_BIN_INSTALL_DIR}" COMPONENT assimp-dev ) + diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/include/boost_includes.h b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/include/boost_includes.h deleted file mode 100644 index 7b9c0860e..000000000 --- a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/include/boost_includes.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file From 323686f878d1bc7d84eceb6d5683995ab52e8f96 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 31 Mar 2020 19:59:02 +0200 Subject: [PATCH 2/2] Fix funding --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index a932e5377..e0c2bec9e 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,2 @@ patreon: assimp -Paypal: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4JRJVPXC4QJM4 +custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4JRJVPXC4QJM4