[PATCH 17/20] Add the possibility to enable the Jaguar code in the build system

[Thomas Huth <huth@xxxxxxxxxxxxx>]

---
 CMakeLists.txt            |  2 ++
 cmake/config-cmake.h      |  3 +++
 configure                 |  7 +++++++
 src/CMakeLists.txt        |  8 ++++++++
 src/jaguar/CMakeLists.txt |  7 +++++++
 src/main.c                | 10 ++++++++++
 6 files changed, 37 insertions(+)
 create mode 100644 src/jaguar/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a00f1698..5591d918 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,8 @@ set(ENABLE_DSP_EMU 1
     CACHE BOOL "Enable DSP 56k emulator for Falcon mode")
 set(ENABLE_TRACING 1
     CACHE BOOL "Enable tracing messages for debugging")
+set(ENABLE_JAGUAR 1
+    CACHE BOOL "Enable Jaguar emulation")
 
 # Run-time checks with GCC / LLVM (Clang) AddressSanitizer:
 # - stack protection
diff --git a/cmake/config-cmake.h b/cmake/config-cmake.h
index 78cfaa9a..9cde429b 100644
--- a/cmake/config-cmake.h
+++ b/cmake/config-cmake.h
@@ -102,6 +102,9 @@
 /* Define to 1 to enable DSP 56k emulation for Falcon mode */
 #cmakedefine ENABLE_DSP_EMU 1
 
+/* Define to 1 to enable Jaguar emulation */
+#cmakedefine ENABLE_JAGUAR 1
+
 /* Define to 1 to enable trace logs - undefine to slightly increase speed */
 #cmakedefine ENABLE_TRACING 1
 
diff --git a/configure b/configure
index a4e7110a..f86f52a2 100755
--- a/configure
+++ b/configure
@@ -17,6 +17,7 @@ print_help()
   echo "  --enable-asan              Enable address sanitizer debug build"
   echo "  --enable-debug             Enable debug (non-optimized) build"
   echo "  --disable-dsp              Disable DSP emulation for Falcon mode."
+  echo "  --enable-jaguar            Enable Jaguar emulation code"
   echo "  --disable-tracing          Disable tracing messages for debugging"
   echo "  --disable-osx-bundle       Disable application bundling on macOS"
   echo "  --enable-ubsan             Enable undefined behavior sanitizer debug build"
@@ -64,6 +65,12 @@ do
     --disable-dsp)
       cmake_args="$cmake_args -DENABLE_DSP_EMU:BOOL=0"
     ;;
+    --enable-jaguar)
+      cmake_args="$cmake_args -DENABLE_JAGUAR:BOOL=1"
+    ;;
+    --disable-jaguar)
+      cmake_args="$cmake_args -DENABLE_JAGUAR:BOOL=0"
+    ;;
     --enable-tracing)
       cmake_args="$cmake_args -DENABLE_TRACING:BOOL=1"
     ;;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 770d44df..b8892415 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -86,6 +86,10 @@ add_subdirectory(falcon)
 add_subdirectory(gui-sdl)
 add_subdirectory(cpu)
 
+if(ENABLE_JAGUAR)
+	add_subdirectory(jaguar)
+endif()
+
 # When building for macOS, add specific sources
 if(ENABLE_OSX_BUNDLE)
 	add_executable(${APP_NAME} MACOSX_BUNDLE ${GUIOSX_RSRCS} ${GUIOSX_DOCS} ${SOURCES} ${GUIOSX_SOURCES})
@@ -220,6 +224,10 @@ endif(SDL2_OTHER_CFLAGS)
 
 target_link_libraries(${APP_NAME} Falcon UaeCpu GuiSdl Floppy Debug ${SDL2_LIBRARIES})
 
+if(ENABLE_JAGUAR)
+	target_link_libraries(${APP_NAME} Jaguar)
+endif()
+
 if(Math_FOUND AND NOT APPLE)
 	target_link_libraries(${APP_NAME} ${MATH_LIBRARY})
 endif()
diff --git a/src/jaguar/CMakeLists.txt b/src/jaguar/CMakeLists.txt
new file mode 100644
index 00000000..284f1c05
--- /dev/null
+++ b/src/jaguar/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+add_library(Jaguar
+	    blitter.c cdintf.c cdrom.c crc32.c dac.c dsp.c eeprom.c event.c
+	    file.c filedb.c gpu.c jagdasm.c jaguar.c jagScreen.c jerry.c
+	    joystick.c log.c memory.c objectp.c settings.c tom.c wavetable.c)
+
+target_link_libraries(Jaguar PRIVATE ${SDL2_LIBRARIES})
diff --git a/src/main.c b/src/main.c
index 55096d84..2ba2dd3c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -66,6 +66,10 @@ const char Main_fileid[] = "Hatari main.c";
 #include "falcon/dsp.h"
 #include "falcon/videl.h"
 
+#if ENABLE_JAGUAR
+#include "jaguar/jaguar.h"
+#endif
+
 #if HAVE_GETTIMEOFDAY
 #include <sys/time.h>
 #endif
@@ -1004,6 +1008,12 @@ int main(int argc, char *argv[])
 	/* Set default configuration values */
 	Configuration_SetDefault();
 
+#if ENABLE_JAGUAR
+	if (argc > 1 && File_DoesFileExtensionMatch(argv[1], "j64")) {
+		return Jag_Main(argv[1]);
+	}
+#endif
+
 	/* Now load the values from the configuration file */
 	Main_LoadInitialConfig();
 
-- 
2.48.1


--MP_/VkVZp1l8MIESxWVe2vPSxV2
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename=0018-Silence-compiler-warnings-in-joystick.c.patch