From 5bd0d8760fb4782777f32b3035b47e89cc59e60f Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xerthesquirrel@gmail.com>
Date: Tue, 25 Jun 2024 12:47:43 -0400
Subject: [PATCH] Do not include experimental ARM core for DJGPP.

---
 .gitlab-ci.yml     | 10 +++++-----
 CMakeLists.txt     |  7 +++++++
 src/CMakeLists.txt | 23 ++++++++++++++++-------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1f16f6..4008cdc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f7eaa0..6babf66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1bef1d4..a41a7f4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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)
\ No newline at end of file
+if(MU_ARM)
+	add_subdirectory(armv5te)
+	add_subdirectory(pxa260)
+endif()
\ No newline at end of file