Attempt to fix issues with win/android build

GeniusVentures · Jan 22, 2025 · b5af9c1 · b5af9c1
1 parent 0475f7e
commit b5af9c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/build/CommonTargets.CMake b/build/CommonTargets.CMake
@@ -349,7 +349,7 @@ set(_FINDPACKAGE_LIBP2P_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/libp2p/include"
 #elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS")
 #    set(IS_APPLE_PLATFORM ON)
 #endif()
-#if(NOT ANDROID AND NOT IS_APPLE_PLATFORM)
+if(NOT ANDROID)
     # Vulkan-Headers
     ExternalProject_Add(
         Vulkan-Headers
@@ -379,7 +379,7 @@ set(_FINDPACKAGE_LIBP2P_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/libp2p/include"
 
     set(ENV{VULKAN_SDK} "${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader")
     set(vulkanTarget Vulkan-Loader)
-#endif()
+endif()
 
 if(NOT APPLE OR (APPLE AND CMAKE_OSX_SYSROOT MATCHES "iPhoneOS"))
 ExternalProject_Add(MNN

diff --git a/build/Windows/CMakeLists.txt b/build/Windows/CMakeLists.txt
@@ -34,7 +34,8 @@ ExternalProject_Add(Boost
     BUILD_COMMAND <SOURCE_DIR>/b2${CMAKE_EXECUTABLE_SUFFIX} cxxstd=${CMAKE_CXX_STANDARD} visibility=global runtime-link=static link=static threading=multi --build-type=minimal ${BOOST_INCLUDE_LIBRARIES_EXPANDED} address-model=64 architecture=x86 variant=${BOOST_VARIANT} --prefix=${BOOST_ROOT} -d0 install
     BUILD_IN_SOURCE TRUE
 
-    PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/boost_patch_185.diff
+    PATCH_COMMAND ${CMAKE_COMMAND} -E echo "Applying patch to Boost"
+    COMMAND ${CMAKE_COMMAND} -E chdir ${THIRDPARTY_DIR}/boost patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/boost_patch_185.diff
 
     INSTALL_COMMAND ""
 )