Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ports/assimp/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: assimp
Version: 4.1.0-4
Description: The Open Asset import library
Build-Depends: zlib, rapidjson
Source: assimp
Version: 5.0.0.rc1-1
Description: The Open Asset import library
Build-Depends: zlib, rapidjson
12 changes: 0 additions & 12 deletions ports/assimp/dont-overwrite-prefix-path.patch

This file was deleted.

24 changes: 24 additions & 0 deletions ports/assimp/fix-arm-uwp-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 37ad34b..2659cea 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -937,6 +937,10 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC

TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} )

+if (WIN32)
+ TARGET_LINK_LIBRARIES(assimp advapi32)
+endif()
+
if(ASSIMP_ANDROID_JNIIOSYSTEM)
set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI)
add_subdirectory(../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/ ../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/)
@@ -972,7 +976,7 @@ if( MSVC )
endif()

if (${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore")
- set(WindowsStore TRUE)
+ target_compile_definitions(assimp PUBLIC WindowsStore)
endif()
SET_TARGET_PROPERTIES( assimp PROPERTIES
VERSION ${ASSIMP_VERSION}
6 changes: 3 additions & 3 deletions ports/assimp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO assimp/assimp
REF v4.1.0
SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a
REF v.5.0.0.rc1
SHA512 715784e017c41d201646b8fb761fc12434084ded020553eeeb9c87113b3b7efbe33f948f8d560b5f272d79fc6c3e49ce95f8ac4c230ff4b14988e49f2d2be9f5
HEAD_REF master
PATCHES
dont-overwrite-prefix-path.patch
fix-arm-uwp-build.patch
uninitialized-variable.patch
)

Expand Down