Do not include experimental ARM core for DJGPP.

This commit is contained in:
Stephanie Gawroriski
2024-06-25 12:47:43 -04:00
parent 91af9cc623
commit 5bd0d8760f
3 changed files with 28 additions and 12 deletions

View File

@@ -299,8 +299,8 @@ libretro-build-rs90-odbeta-mips32:
- .libretro-rs90-odbeta-cmake-mips32
- .core-defs
## djgpp-static-cmake.yml
#libretro-build-djgpp: # TODO: What should this be called?
# extends:
# - .libretro-djgpp-static-cmake-retroarch-master
# - .core-defs
# djgpp-static-cmake.yml
libretro-build-djgpp: # TODO: What should this be called?
extends:
- .libretro-djgpp-static-cmake-retroarch-master
- .core-defs

View File

@@ -24,6 +24,13 @@ else()
set(MU_FPIC ON)
endif()
# Do not include experimental ARM core for some platforms
if(DJGPP)
set(MU_ARM OFF)
else()
set(MU_ARM ON)
endif()
# Where should dynamic libraries go when output?
if(NOT DEFINED MU_DYLIB_OUTPUT_DIR)
set(MU_DYLIB_OUTPUT_DIR

View File

@@ -20,11 +20,18 @@ if(MU_FPIC)
endif()
# Bring all the sub-modules as needed
target_link_libraries(MuCore
MuCorePxa260Experimental
MuCoreFileLauncher
MuCoreAudio
MuCoreM68k)
if(MU_ARM)
target_link_libraries(MuCore
MuCorePxa260Experimental
MuCoreFileLauncher
MuCoreAudio
MuCoreM68k)
else()
target_link_libraries(MuCore
MuCoreFileLauncher
MuCoreAudio
MuCoreM68k)
endif()
# Includes for the project
target_include_directories(MuCore PUBLIC
@@ -39,5 +46,7 @@ add_subdirectory(fileLauncher)
add_subdirectory(m68k)
# Experimental ARM Cores
add_subdirectory(armv5te)
add_subdirectory(pxa260)
if(MU_ARM)
add_subdirectory(armv5te)
add_subdirectory(pxa260)
endif()