mirror of
https://github.com/JaCzekanski/Avocado.git
synced 2024-06-02 03:07:39 -04:00
build: fixed macos builds (ARM related)
This commit is contained in:
parent
a0f91c74c2
commit
bd3a4caffc
|
@ -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
|
||||
|
|
|
@ -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"}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "system.h"
|
||||
#include "system_options.h"
|
||||
#include "config.h"
|
||||
#include <imgui.h>
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
#pragma once
|
||||
// Note: should be system.h, but it conflicts with main "system.h"
|
||||
|
||||
namespace gui::options {
|
||||
class System {
|
Loading…
Reference in a new issue