[win32] arm fixes

ossia · May 30, 2024 · 1f353b0 · 1f353b0
1 parent a96d630
commit 1f353b0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/app/StartScreen.hpp b/src/app/StartScreen.hpp
@@ -332,7 +332,7 @@ StartScreen::StartScreen(const QPointer<QRecentFilesMenu>& recentFiles, QWidget*
     // new version
     auto m_getLastVersion = new HTTPGet{
         QUrl("https://ossia.io/score-last-version.txt"),
-        [=](const QByteArray& data) {
+        [this, titleFont](const QByteArray& data) {
       auto version = QString::fromUtf8(data.simplified());
       if(SCORE_TAG_NO_V < version)
       {
@@ -350,8 +350,7 @@ StartScreen::StartScreen(const QPointer<QRecentFilesMenu>& recentFiles, QWidget*
         label->move(280, 170);
         label->show();
       }
-    },
-        [] {}};
+    }, [] {}};
   }
 
   float label_x = 300;

diff --git a/src/plugins/score-plugin-gfx/CMakeLists.txt b/src/plugins/score-plugin-gfx/CMakeLists.txt
@@ -328,10 +328,12 @@ endif()
 if(WIN32)
   target_sources(${PROJECT_NAME} PRIVATE Gfx/CameraDevice.win32.cpp)
 
-  add_subdirectory("${3RDPARTY_FOLDER}/Spout" "${CMAKE_CURRENT_BINARY_DIR}/Spout")
-  target_link_libraries(${PROJECT_NAME} PRIVATE Spout)
-  target_compile_definitions(${PROJECT_NAME} PRIVATE HAS_SPOUT)
-  list(APPEND SCORE_FEATURES_LIST spout)
+  if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
+    add_subdirectory("${3RDPARTY_FOLDER}/Spout" "${CMAKE_CURRENT_BINARY_DIR}/Spout")
+    target_link_libraries(${PROJECT_NAME} PRIVATE Spout)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE HAS_SPOUT)
+    list(APPEND SCORE_FEATURES_LIST spout)
+  endif()
 elseif(APPLE)
   target_sources(${PROJECT_NAME} PRIVATE Gfx/CameraDevice.avf.mm)
 

diff --git a/src/plugins/score-plugin-jit/CMakeLists.txt b/src/plugins/score-plugin-jit/CMakeLists.txt
@@ -4,6 +4,12 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
   return()
 endif()
 
+if(NOT APPLE)
+  if(CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
+    return()
+  endif()
+endif()
+
 if(SCORE_FAST_DEV_BUILD)
   return()
 endif()