Libraries for Linux x86_64

pharo-project · Nov 28, 2022 · 82d6d38 · 82d6d38
1 parent 5cdb731
commit 82d6d38
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/cmake/importCairo.cmake b/cmake/importCairo.cmake
@@ -22,11 +22,15 @@ if (BUILD_BUNDLE)
       add_third_party_dependency("cairo-1.17.4")
       add_third_party_dependency("libpng-1.6.37")
     endif()
-  else() #Linux, only for arm
+  else() #Linux
     If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
       add_third_party_dependency("pixman-0.40.0")
       add_third_party_dependency("cairo-1.16.0")
       add_third_party_dependency("libpng-1.6.37")
-    endif()
+    else()
+      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()  
   endif()
 endif()
diff --git a/cmake/importFreetype2.cmake b/cmake/importFreetype2.cmake
@@ -31,7 +31,11 @@ function(download_Freetype)
   else() # linuxes, only for ARM
     If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
       add_third_party_dependency("freetype-2.10.0")
-    endif()    
+    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()
   endif()
 endfunction()
 

diff --git a/cmake/importSDL2.cmake b/cmake/importSDL2.cmake
@@ -25,7 +25,7 @@ function(download_SDL2)
     If(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l" OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
       add_third_party_dependency("SDL2-2.0.14")
     else()
-      add_third_party_dependency("SDL2-2.0.7")
+      add_third_party_dependency("SDL2-2.24.1")
     endif()
   endif()
 endfunction()