More build corrections.

CMakeLists.txt

@@ -49,6 +49,12 @@ else()
 	set(MU_LIBRETRO_OBJECT_LIB OFF)
 endif()
 
+if(MU_LIBRETRO_OBJECT_LIB)
+	set(MU_CORE_BUILD_TYPE OBJECT)
+else()
+	set(MU_CORE_BUILD_TYPE STATIC)
+endif()
+
 # Where should dynamic libraries go when output?
 if(NOT DEFINED MU_DYLIB_OUTPUT_DIR)
 	set(MU_DYLIB_OUTPUT_DIR

libretroBuildSystem/CMakeLists.txt

@@ -1,5 +1,9 @@
 if(MU_LIBRETRO_OBJECT_LIB)
-	set(MU_LIBRETRO_OBJECT_LIB_USE $<TARGET_OBJECTS:MuCore>)
+	set(MU_LIBRETRO_OBJECT_LIB_USE
+		$<TARGET_OBJECTS:MuCore>
+		$<TARGET_OBJECTS:MuCoreFileLauncher>
+		$<TARGET_OBJECTS:MuCoreAudio>
+		$<TARGET_OBJECTS:MuCoreM68k>)
 else()
 	set(MU_LIBRETRO_OBJECT_LIB_USE)
 endif()

src/CMakeLists.txt

@@ -1,9 +1,3 @@
-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 ${MU_CORE_BUILD_TYPE}
 	ads7846.c

src/audio/CMakeLists.txt

@@ -1,5 +1,5 @@
 # m68k Module
-add_library(MuCoreAudio STATIC
+add_library(MuCoreAudio ${MU_CORE_BUILD_TYPE}
 	blip_buf.c)
 
 # Make this position independent so it can be linked into shared libraries

src/m68k/CMakeLists.txt

@@ -1,5 +1,5 @@
 # m68k Module
-add_library(MuCoreM68k STATIC
+add_library(MuCoreM68k ${MU_CORE_BUILD_TYPE}
 	m68kcpu.c
 	m68kdasm.c
 	m68kopac.c