Updating Win X86 thirdparty

pharo-project · Nov 14, 2022 · d91fc4e · d91fc4e
1 parent 0213f44
commit d91fc4e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/cmake/importCairo.cmake b/cmake/importCairo.cmake
@@ -8,9 +8,9 @@ if (BUILD_BUNDLE)
       add_third_party_dependency("libpng-1.6.37")
     else()
       # X86 and X86_64
-      add_third_party_dependency("pixman-0.34.0")
-      add_third_party_dependency("cairo-1.15.4")
-      add_third_party_dependency("libpng-1.6.34")
+      add_third_party_dependency("pixman-0.40.0")
+      add_third_party_dependency("cairo-1.17.4")
+      add_third_party_dependency("libpng-1.6.37")
     endif()
   elseif(OSX)
     If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")

diff --git a/cmake/importFreetype2.cmake b/cmake/importFreetype2.cmake
@@ -11,7 +11,13 @@ endfunction()
 
 function(download_Freetype)
   if (WIN)
-	add_third_party_dependency("freetype-2.9.1")
+    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ARM64")
+      add_third_party_dependency("freetype-2.9.1")
+    else()
+      add_third_party_dependency("freetype-2.12.1")
+      add_third_party_dependency("fontconfig-2.13.1")
+      add_third_party_dependency("harfbuzz-5.3.1")
+    endif()
   elseif(OSX)
     If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
       add_third_party_dependency("freetype-2.10.0")

diff --git a/cmake/importSDL2.cmake b/cmake/importSDL2.cmake
@@ -10,7 +10,11 @@ endfunction()
 function(download_SDL2)
   message(STATUS "Downloading SDL2 binary")
   if(WIN)
-    add_third_party_dependency("SDL2-2.0.5")
+    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ARM64")
+      add_third_party_dependency("SDL2-2.0.5")
+    else()
+      add_third_party_dependency("SDL2-2.24.1")
+    endif()
   elseif(OSX)   
     if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
       add_third_party_dependency("SDL2-2.0.14")