Build fixes, hopefully, for RetroArch.

CMakeLists.txt

@@ -42,6 +42,13 @@ else()
 	set(MU_ARM ON)
 endif()
 
+# RetroArch must be static
+if(DJGPP OR PLATFORM_PSP OR PSP)
+	set(MU_LIBRETRO_OBJECT_LIB ON)
+else()
+	set(MU_LIBRETRO_OBJECT_LIB OFF)
+endif()
+
 # Where should dynamic libraries go when output?
 if(NOT DEFINED MU_DYLIB_OUTPUT_DIR)
 	set(MU_DYLIB_OUTPUT_DIR

libretroBuildSystem/CMakeLists.txt

@@ -1,4 +1,11 @@
+if(MU_LIBRETRO_OBJECT_LIB)
+	set(MU_LIBRETRO_OBJECT_LIB_USE $<TARGET_OBJECTS:MuCore>)
+else()
+	set(MU_LIBRETRO_OBJECT_LIB_USE)
+endif()
+
 add_library(mu_libretro SHARED
+	${MU_LIBRETRO_OBJECT_LIB_USE}
 	libretro.c
 	cursors.c
 	miniz.c
@@ -15,8 +22,10 @@ add_library(mu_libretro SHARED
 set_target_properties(mu_libretro PROPERTIES PREFIX "")
 
 # Bring all the sub-modules as needed
-target_link_libraries(mu_libretro
-	MuCore)
+if(NOT MU_LIBRETRO_OBJECT_LIB)
+	target_link_libraries(mu_libretro
+		MuCore)
+endif()
 
 # Include the required includes
 target_include_directories(mu_libretro PUBLIC

src/CMakeLists.txt

@@ -1,5 +1,11 @@
+if(MU_LIBRETRO_OBJECT_LIB)
+	set(MU_CORE_BUILD_TYPE OBJECT)
+else()
+	set(MU_CORE_BUILD_TYPE STATIC)
+endif()
+
 # Base Mu library
-add_library(MuCore STATIC
+add_library(MuCore ${MU_CORE_BUILD_TYPE}
 	ads7846.c
 	dbvz.c
 	emulator.c