build: fixed macos builds (ARM related)

JaCzekanski · Nov 16, 2021 · bd3a4ca · bd3a4ca
1 parent a0f91c7
commit bd3a4ca
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -307,7 +307,7 @@ set(SOURCES
         src/platform/windows/gui/options/bios.cpp
         src/platform/windows/gui/options/memory_card.cpp
         src/platform/windows/gui/options/options.cpp
-        src/platform/windows/gui/options/system.cpp
+        src/platform/windows/gui/options/system_options.cpp
         src/platform/windows/gui/toasts.cpp
         src/platform/windows/input/key.cpp
         src/platform/windows/input/sdl_input_manager.cpp

diff --git a/premake5.lua b/premake5.lua
@@ -77,9 +77,13 @@ filter "system:macosx"
 	platforms {"x64"}
 	defaultplatform "x64"
 	xcodebuildsettings {
+		["ARCHS"] = "x86_64",
 		["ALWAYS_SEARCH_USER_PATHS"] = "YES",
 		["MACOSX_DEPLOYMENT_TARGET"] = "10.12",
 	}
+	-- arm64 builds are currently broken (SDL2 from brew linking errors)
+	-- HACK: Temporary SDL2.0.16 xcode build fix
+    -- defines { "SDL_DISABLE_IMMINTRIN_H" }
 
 filter "system:android"
 	platforms {"arm"}

diff --git a/src/platform/windows/gui/gui.h b/src/platform/windows/gui/gui.h
@@ -14,7 +14,7 @@
 #include "options/bios.h"
 #include "options/memory_card.h"
 #include "options/options.h"
-#include "options/system.h"
+#include "options/system_options.h"
 #include "toasts.h"
 
 struct System;

diff --git a/src/platform/windows/gui/options/system.cpp → ...rm/windows/gui/options/system_options.cpp b/src/platform/windows/gui/options/system.cpp → ...rm/windows/gui/options/system_options.cpp
@@ -1,4 +1,4 @@
-#include "system.h"
+#include "system_options.h"
 #include "config.h"
 #include <imgui.h>
 

diff --git a/src/platform/windows/gui/options/system.h → ...form/windows/gui/options/system_options.h b/src/platform/windows/gui/options/system.h → ...form/windows/gui/options/system_options.h
@@ -1,4 +1,5 @@
 #pragma once
+// Note: should be system.h, but it conflicts with main "system.h"
 
 namespace gui::options {
 class System {