Make CD32 support optional, exclude it in Android build

Android.mk

@@ -9,7 +9,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := amiberry
 
 SDL_PATH := ../SDL
-LIBMPEG2_PATH := ../mpeg2
+#LIBMPEG2_PATH := ../mpeg2
 LIBPNG_PATH := ../SDL_image/external/libpng-1.6.37
 LIBXML_PATH := ../xml2
 
@@ -20,20 +20,19 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
                     $(LOCAL_PATH)/src/archivers \
                     $(LOCAL_PATH)/guisan-dev/include \
                     $(LOCAL_PATH)/$(SDL_PATH)/include \
-                    $(LOCAL_PATH)/$(LIBMPEG2_PATH)/include \
                     $(LOCAL_PATH)/$(LIBPNG_PATH) \
                     $(LOCAL_PATH)/$(LIBXML_PATH)/include
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-    LOCAL_CFLAGS := -DCPU_arm -DARM_HAS_DIV -DARMV6T2 -DARMV6_ASSEMBLY -DAMIBERRY -D_REENTRANT
+    LOCAL_CFLAGS := -DCPU_arm -DARM_HAS_DIV -DARMV6T2 -DARMV6_ASSEMBLY -DAMIBERRY -D_REENTRANT -D_FILE_OFFSET_BITS=64
 else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-    LOCAL_CFLAGS := -DCPU_AARCH64 -DAMIBERRY -D_REENTRANT
+    LOCAL_CFLAGS := -DCPU_AARCH64 -DAMIBERRY -D_REENTRANT -D_FILE_OFFSET_BITS=64
 endif
 
 LOCAL_CPPFLAGS := -std=gnu++14 -pipe -frename-registers \
                     -Wno-shift-overflow -Wno-narrowing -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed
 
-LOCAL_LDFLAGS += -fuse-ld=gold
+LOCAL_LDFLAGS +=
 
 # Add your application source files here...
 LOCAL_SRC_FILES := src/archivers/7z/BraIA64.c \
@@ -53,8 +52,6 @@ LOCAL_SRC_FILES := src/archivers/7z/BraIA64.c \
                     src/blkdev_cdimage.cpp \
                     src/bsdsocket.cpp \
                     src/calc.cpp \
-                    src/cd32_fmv.cpp \
-                    src/cd32_fmv_genlock.cpp \
                     src/cdrom.cpp \
                     src/cfgfile.cpp \
                     src/cia.cpp \
@@ -210,7 +207,7 @@ LOCAL_SRC_FILES += src/newcpu.cpp \
                     src/jit/compemu_fpp.cpp \
                     src/jit/compemu_support.cpp
 
-LOCAL_SHARED_LIBRARIES := SDL2 SDL2_image SDL2_ttf SDL2_mixer xml2 mpeg2 mpg123 guisan
+LOCAL_SHARED_LIBRARIES := SDL2 SDL2_image SDL2_ttf SDL2_mixer xml2 mpg123 guisan
 
 LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -lz
 

src/devices.cpp

@@ -7,8 +7,10 @@
 #include "threaddep/thread.h"
 #include "memory.h"
 #include "audio.h"
+#ifdef CD32
 #include "cd32_fmv.h"
 #include "akiko.h"
+#endif
 #include "disk.h"
 #include "cia.h"
 #include "inputdevice.h"
@@ -252,7 +254,9 @@ void devices_update_sound(double clk, double syncadjust)
 
 void devices_update_sync(double svpos, double syncadjust)
 {
+#ifdef CD32
 	cd32_fmv_set_sync(svpos, syncadjust);
+#endif
 }
 
 void do_leave_program (void)

src/drawing.cpp

@@ -47,7 +47,9 @@ happening, all ports should restrict window widths to be multiples of 16 pixels.
 #include "drawing.h"
 #include "savestate.h"
 #include "statusline.h"
+#ifdef CD32
 #include "cd32_fmv.h"
+#endif
 #include "audio.h"
 #include "devices.h"
 
@@ -3585,7 +3587,7 @@ static void finish_drawing_frame(bool drawlines)
 			draw_status_line(line, i);
 		}
 	}
-		
+#ifdef CD32
 	// cd32 fmv
 	if (currprefs.cs_cd32fmv) {
 		if (cd32_fmv_active) {
@@ -3593,7 +3595,7 @@ static void finish_drawing_frame(bool drawlines)
 			setnativeposition(vb);
 		}
 	}
-
+#endif
 	unlockscr();
 #ifdef AMIBERRY
 	next_line_to_render = 0;

src/expansion.cpp

@@ -21,7 +21,9 @@
 #include "newcpu.h"
 #include "savestate.h"
 #include "gfxboard.h"
+#ifdef CD32
 #include "cd32_fmv.h"
+#endif
 #include "gayle.h"
 #include "autoconf.h"
 #include "devices.h"
@@ -2631,12 +2633,14 @@ void restore_expansion_finish(void)
 
 const struct expansionromtype expansionroms[] = {
 
-		/* built-in controllers */
+	/* built-in controllers */
+#ifdef CD32
 	{
 		_T("cd32fmv"), _T("CD32 FMV"), _T("Commodore"),
 		expamem_init_cd32fmv, NULL, ROMTYPE_CD32CART, BOARD_AUTOCONFIG_Z2, 
 		EXPANSIONTYPE_INTERNAL
 	},
+#endif
 	{
 		_T("ide_mb"), _T("A600/A1200/A4000 IDE"), _T("Commodore"),
 		gayle_ide_init, gayle_add_ide_unit, ROMTYPE_MB_IDE | ROMTYPE_NOT, BOARD_NONAUTOCONFIG_BEFORE,

src/osdep/sysconfig.h

@@ -28,7 +28,9 @@
 /* #define ENFORCER */ /* UAE Enforcer */
 #define ECS_DENISE /* ECS DENISE new features */
 #define AGA /* AGA chipset emulation (ECS_DENISE must be enabled) */
+#ifndef ANDROID
 #define CD32 /* CD32 emulation */
+#endif
 /* #define CDTV */ /* CDTV emulation */
 /* #define PARALLEL_PORT */ /* parallel port emulation */
 /* #define PARALLEL_DIRECT */ /* direct parallel port emulation */