Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix silicon support #111

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix silicon support #111

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a60d23
fix conditional order
zbeucler2018 Feb 6, 2024
3530587
Merge branch 'Farama-Foundation:master' into add-silicon-support
zbeucler2018 Apr 18, 2024
ce7e5fc
Merge branch 'master' into add-silicon-support
zbeucler2018 Aug 7, 2024
c8f4c68
rearange conditionals for siliconn support
zbeucler2018 Aug 7, 2024
4fce246
first pass at silicon ci testing
zbeucler2018 Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ if(POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
endif()

if(UNIX)
if(APPLE)
set(PYEXT_SUFFIX
".so"
".dylib"
CACHE STRING "Suffix for Python extension modules")
set(DYNLIB_SUFFIX
".so"
".dylib"
CACHE STRING "Suffix for dynamic libraries")
elseif(APPLE)
elseif(UNIX)
set(PYEXT_SUFFIX
".so"
CACHE STRING "Suffix for Python extension modules")
set(DYNLIB_SUFFIX
".dylib"
".so"
CACHE STRING "Suffix for dynamic libraries")
elseif(WIN32)
set(PYEXT_SUFFIX
Expand Down Expand Up @@ -234,7 +234,7 @@ add_core(nes fceumm)
add_core(atari2600 stella)

if(APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
message(warning "Detected Apple Silicon, skipping gambatte (gb)")
message(WARNING "Detected Apple Silicon, skipping gambatte (gb)")
else()
add_core(gb gambatte)
endif()
Expand All @@ -244,6 +244,7 @@ add_core(pce mednafen_pce_fast)
add_core(32x picodrive)
add_core(saturn mednafen_saturn)


set(CLEAN_CORES)

foreach(core IN LISTS CORE_TARGETS)
Expand Down
Loading