Trying to build on Kali "-rolling -dev" About the same as Debian Testing.
Got some link errors. Anyone spot whats wrong?
Code:
diff -Nurd uae4arm/Makefile uae4arm-lnx/Makefile
--- uae4arm/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ uae4arm-lnx/Makefile 2015-11-02 17:44:48.344332322 +0100
@@ -0,0 +1,203 @@
+MORE_CFLAGS += -DRPI2
+# PREFIX = /usr
+$(shell ./link_RPI2_dirs.sh)
+
+# SDL_BASE = $(PREFIX)/bin/
+SDL_BASE = /usr/bin/
+
+NAME = uae4arm
+O = o
+RM = rm -f
+CXX = g++
+STRIP = strip
+#AS = as
+
+PROG = $(NAME)
+
+all: $(PROG)
+
+PANDORA=1
+
+DEFAULT_CFLAGS = `sdl-config --cflags`
+LDFLAGS += -L/usr/lib/ -L/usr/lib/arm-linux-gnueabihf/ -lSDL_ttf -lguichan_sdl -lguichan -lpthread -lz -lSDL_image -lpng -lrt -lSDL
+
+MORE_CFLAGS += -DGP2X -DPANDORA -DARMV6_ASSEMBLY -DUSE_ARMNEON
+MORE_CFLAGS += -DCPU_arm -DARM_ASSEMBLY
+#MORE_CFLAGS += -DWITH_LOGGING
+#MORE_CFLAGS += -DDEBUG_M68K
+
+MORE_CFLAGS += -I/usr/include/SDL -Isrc -Isrc/include -fomit-frame-pointer -Wno-unused -Wno-format -Wno-write-strings -DUSE_SDL
+MORE_CFLAGS += -fexceptions
+MORE_CFLAGS += -mfloat-abi=hard -ffast-math -D_GLIBCXX_USE_CXX11_ABI=0
+
+
+MORE_CFLAGS += -DROM_PATH_PREFIX=\"./\" -DDATA_PREFIX=\"./data/\" -DSAVE_PREFIX=\"./saves/\"
+
+MORE_CFLAGS += -march=armv7-a -mfloat-abi=hard -mfpu=neon
+
+ifndef DEBUG
+MORE_CFLAGS += -O3 -fexpensive-optimizations
+MORE_CFLAGS += -fstrict-aliasing -mstructure-size-boundary=32
+MORE_CFLAGS += -fweb -frename-registers -fomit-frame-pointer
+#MORE_CFLAGS += -falign-functions=32 -falign-loops -falign-labels -falign-jumps
+MORE_CFLAGS += -falign-functions=32
+MORE_CFLAGS += -finline -finline-functions -fno-builtin
+#MORE_CFLAGS += -S
+else
+MORE_CFLAGS += -ggdb
+endif
+
+ASFLAGS += -mfloat-abi=hard -Wall -mfpu=neon
+
+CFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS)
+
+OBJS = \
+ src/audio.o \
+ src/autoconf.o \
+ src/blitfunc.o \
+ src/blittable.o \
+ src/blitter.o \
+ src/cfgfile.o \
+ src/cia.o \
+ src/crc32.o \
+ src/custom.o \
+ src/disk.o \
+ src/drawing.o \
+ src/ersatz.o \
+ src/expansion.o \
+ src/filesys.o \
+ src/fpp.o \
+ src/fsdb.o \
+ src/fsdb_unix.o \
+ src/fsusage.o \
+ src/gfxutil.o \
+ src/hardfile.o \
+ src/inputdevice.o \
+ src/keybuf.o \
+ src/main.o \
+ src/memory.o \
+ src/missing.o \
+ src/native2amiga.o \
+ src/savestate.o \
+ src/traps.o \
+ src/uaelib.o \
+ src/uaeresource.o \
+ src/zfile.o \
+ src/zfile_archive.o \
+ src/archivers/7z/7zAlloc.o \
+ src/archivers/7z/7zBuffer.o \
+ src/archivers/7z/7zCrc.o \
+ src/archivers/7z/7zDecode.o \
+ src/archivers/7z/7zExtract.o \
+ src/archivers/7z/7zHeader.o \
+ src/archivers/7z/7zIn.o \
+ src/archivers/7z/7zItem.o \
+ src/archivers/7z/7zMethodID.o \
+ src/archivers/7z/LzmaDecode.o \
+ src/archivers/dms/crc_csum.o \
+ src/archivers/dms/getbits.o \
+ src/archivers/dms/maketbl.o \
+ src/archivers/dms/pfile.o \
+ src/archivers/dms/tables.o \
+ src/archivers/dms/u_deep.o \
+ src/archivers/dms/u_heavy.o \
+ src/archivers/dms/u_init.o \
+ src/archivers/dms/u_medium.o \
+ src/archivers/dms/u_quick.o \
+ src/archivers/dms/u_rle.o \
+ src/archivers/lha/crcio.o \
+ src/archivers/lha/dhuf.o \
+ src/archivers/lha/header.o \
+ src/archivers/lha/huf.o \
+ src/archivers/lha/larc.o \
+ src/archivers/lha/lhamaketbl.o \
+ src/archivers/lha/lharc.o \
+ src/archivers/lha/shuf.o \
+ src/archivers/lha/slide.o \
+ src/archivers/lha/uae_lha.o \
+ src/archivers/lha/util.o \
+ src/archivers/lzx/unlzx.o \
+ src/archivers/wrp/warp.o \
+ src/archivers/zip/unzip.o \
+ src/machdep/support.o \
+ src/osdep/neon_helper.o \
+ src/osdep/fsdb_host.o \
+ src/osdep/joystick.o \
+ src/osdep/keyboard.o \
+ src/osdep/inputmode.o \
+ src/osdep/picasso96.o \
+ src/osdep/writelog.o \
+ src/osdep/pandora.o \
+ src/osdep/pandora_filesys.o \
+ src/osdep/pandora_gui.o \
+ src/osdep/pandora_gfx.o \
+ src/osdep/pandora_mem.o \
+ src/osdep/sigsegv_handler.o \
+ src/osdep/menu/menu_config.o \
+ src/sounddep/sound.o \
+ src/osdep/gui/UaeRadioButton.o \
+ src/osdep/gui/UaeDropDown.o \
+ src/osdep/gui/UaeCheckBox.o \
+ src/osdep/gui/UaeListBox.o \
+ src/osdep/gui/InGameMessage.o \
+ src/osdep/gui/SelectorEntry.o \
+ src/osdep/gui/ShowMessage.o \
+ src/osdep/gui/SelectFolder.o \
+ src/osdep/gui/SelectFile.o \
+ src/osdep/gui/CreateFilesysHardfile.o \
+ src/osdep/gui/EditFilesysVirtual.o \
+ src/osdep/gui/EditFilesysHardfile.o \
+ src/osdep/gui/PanelPaths.o \
+ src/osdep/gui/PanelConfig.o \
+ src/osdep/gui/PanelCPU.o \
+ src/osdep/gui/PanelChipset.o \
+ src/osdep/gui/PanelROM.o \
+ src/osdep/gui/PanelRAM.o \
+ src/osdep/gui/PanelFloppy.o \
+ src/osdep/gui/PanelHD.o \
+ src/osdep/gui/PanelDisplay.o \
+ src/osdep/gui/PanelSound.o \
+ src/osdep/gui/PanelInput.o \
+ src/osdep/gui/PanelMisc.o \
+ src/osdep/gui/PanelSavestate.o \
+ src/osdep/gui/main_window.o \
+ src/osdep/gui/Navigation.o
+ifdef ANDROID
+OBJS += src/osdep/gui/PanelOnScreen.o
+endif
+ifdef PANDORA
+OBJS += src/osdep/gui/sdltruetypefont.o
+endif
+
+ifdef USE_XFD
+OBJS += src/cpu_small.o \
+ src/cpuemu_small.o \
+ src/cpustbl_small.o \
+ src/archivers/xfd/xfd.o
+endif
+
+OBJS += src/newcpu.o
+OBJS += src/readcpu.o
+OBJS += src/cpudefs.o
+OBJS += src/cpustbl.o
+OBJS += src/cpuemu_0.o
+OBJS += src/cpuemu_4.o
+OBJS += src/cpuemu_11.o
+OBJS += src/jit/compemu.o
+OBJS += src/jit/compemu_fpp.o
+OBJS += src/jit/compstbl.o
+OBJS += src/jit/compemu_support.o
+
+CPPFLAGS = $(CFLAGS)
+
+src/osdep/neon_helper.o: src/osdep/neon_helper.s
+ $(CXX) -falign-functions=32 -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=hard -Wall -o src/osdep/neon_helper.o -c src/osdep/neon_helper.s
+
+$(PROG): $(OBJS)
+ $(CXX) $(CFLAGS) -o $(PROG) $(OBJS) $(LDFLAGS)
+ifndef DEBUG
+ $(STRIP) $(PROG)
+endif
+
+clean:
+ $(RM) $(PROG) $(OBJS)
Binary files uae4arm/.Makefile.android.armv7a-neon-hardfp.swp and uae4arm-lnx/.Makefile.android.armv7a-neon-hardfp.swp differ
diff -Nurd uae4arm/Makefile-lnx uae4arm-lnx/Makefile-lnx
--- uae4arm/Makefile-lnx 1970-01-01 01:00:00.000000000 +0100
+++ uae4arm-lnx/Makefile-lnx 2015-11-02 17:39:46.424332439 +0100
@@ -0,0 +1,203 @@
+MORE_CFLAGS += -DRPI2
+# PREFIX = /usr
+$(shell ./link_RPI2_dirs.sh)
+
+# SDL_BASE = $(PREFIX)/bin/
+SDL_BASE = /usr/bin/
+
+NAME = uae4arm
+O = o
+RM = rm -f
+CXX = g++
+STRIP = strip
+#AS = as
+
+PROG = $(NAME)
+
+all: $(PROG)
+
+PANDORA=1
+
+DEFAULT_CFLAGS = `sdl-config --cflags`
+LDFLAGS += -L/usr/lib/ -L/usr/lib/arm-linux-gnueabihf/ -lSDL_ttf -lguichan_sdl -lguichan -lpthread -lz -lSDL_image -lpng -lrt -lSDL
+
+MORE_CFLAGS += -DGP2X -DPANDORA -DARMV6_ASSEMBLY -DUSE_ARMNEON
+MORE_CFLAGS += -DCPU_arm -DARM_ASSEMBLY
+#MORE_CFLAGS += -DWITH_LOGGING
+#MORE_CFLAGS += -DDEBUG_M68K
+
+MORE_CFLAGS += -I/usr/include/SDL -Isrc -Isrc/include -fomit-frame-pointer -Wno-unused -Wno-format -Wno-write-strings -DUSE_SDL
+MORE_CFLAGS += -fexceptions
+MORE_CFLAGS += -mfloat-abi=hard -ffast-math -D_GLIBCXX_USE_CXX11_ABI=0
+
+
+MORE_CFLAGS += -DROM_PATH_PREFIX=\"./\" -DDATA_PREFIX=\"./data/\" -DSAVE_PREFIX=\"./saves/\"
+
+MORE_CFLAGS += -march=armv7-a -mfloat-abi=hard -mfpu=neon
+
+ifndef DEBUG
+MORE_CFLAGS += -O3 -fexpensive-optimizations
+MORE_CFLAGS += -fstrict-aliasing -mstructure-size-boundary=32
+MORE_CFLAGS += -fweb -frename-registers -fomit-frame-pointer
+#MORE_CFLAGS += -falign-functions=32 -falign-loops -falign-labels -falign-jumps
+MORE_CFLAGS += -falign-functions=32
+MORE_CFLAGS += -finline -finline-functions -fno-builtin
+#MORE_CFLAGS += -S
+else
+MORE_CFLAGS += -ggdb
+endif
+
+ASFLAGS += -mfloat-abi=hard -Wall -mfpu=neon
+
+CFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS)
+
+OBJS = \
+ src/audio.o \
+ src/autoconf.o \
+ src/blitfunc.o \
+ src/blittable.o \
+ src/blitter.o \
+ src/cfgfile.o \
+ src/cia.o \
+ src/crc32.o \
+ src/custom.o \
+ src/disk.o \
+ src/drawing.o \
+ src/ersatz.o \
+ src/expansion.o \
+ src/filesys.o \
+ src/fpp.o \
+ src/fsdb.o \
+ src/fsdb_unix.o \
+ src/fsusage.o \
+ src/gfxutil.o \
+ src/hardfile.o \
+ src/inputdevice.o \
+ src/keybuf.o \
+ src/main.o \
+ src/memory.o \
+ src/missing.o \
+ src/native2amiga.o \
+ src/savestate.o \
+ src/traps.o \
+ src/uaelib.o \
+ src/uaeresource.o \
+ src/zfile.o \
+ src/zfile_archive.o \
+ src/archivers/7z/7zAlloc.o \
+ src/archivers/7z/7zBuffer.o \
+ src/archivers/7z/7zCrc.o \
+ src/archivers/7z/7zDecode.o \
+ src/archivers/7z/7zExtract.o \
+ src/archivers/7z/7zHeader.o \
+ src/archivers/7z/7zIn.o \
+ src/archivers/7z/7zItem.o \
+ src/archivers/7z/7zMethodID.o \
+ src/archivers/7z/LzmaDecode.o \
+ src/archivers/dms/crc_csum.o \
+ src/archivers/dms/getbits.o \
+ src/archivers/dms/maketbl.o \
+ src/archivers/dms/pfile.o \
+ src/archivers/dms/tables.o \
+ src/archivers/dms/u_deep.o \
+ src/archivers/dms/u_heavy.o \
+ src/archivers/dms/u_init.o \
+ src/archivers/dms/u_medium.o \
+ src/archivers/dms/u_quick.o \
+ src/archivers/dms/u_rle.o \
+ src/archivers/lha/crcio.o \
+ src/archivers/lha/dhuf.o \
+ src/archivers/lha/header.o \
+ src/archivers/lha/huf.o \
+ src/archivers/lha/larc.o \
+ src/archivers/lha/lhamaketbl.o \
+ src/archivers/lha/lharc.o \
+ src/archivers/lha/shuf.o \
+ src/archivers/lha/slide.o \
+ src/archivers/lha/uae_lha.o \
+ src/archivers/lha/util.o \
+ src/archivers/lzx/unlzx.o \
+ src/archivers/wrp/warp.o \
+ src/archivers/zip/unzip.o \
+ src/machdep/support.o \
+ src/osdep/neon_helper.o \
+ src/osdep/fsdb_host.o \
+ src/osdep/joystick.o \
+ src/osdep/keyboard.o \
+ src/osdep/inputmode.o \
+ src/osdep/picasso96.o \
+ src/osdep/writelog.o \
+ src/osdep/pandora.o \
+ src/osdep/pandora_filesys.o \
+ src/osdep/pandora_gui.o \
+ src/osdep/pandora_gfx.o \
+ src/osdep/pandora_mem.o \
+ src/osdep/sigsegv_handler.o \
+ src/osdep/menu/menu_config.o \
+ src/sounddep/sound.o \
+ src/osdep/gui/UaeRadioButton.o \
+ src/osdep/gui/UaeDropDown.o \
+ src/osdep/gui/UaeCheckBox.o \
+ src/osdep/gui/UaeListBox.o \
+ src/osdep/gui/InGameMessage.o \
+ src/osdep/gui/SelectorEntry.o \
+ src/osdep/gui/ShowMessage.o \
+ src/osdep/gui/SelectFolder.o \
+ src/osdep/gui/SelectFile.o \
+ src/osdep/gui/CreateFilesysHardfile.o \
+ src/osdep/gui/EditFilesysVirtual.o \
+ src/osdep/gui/EditFilesysHardfile.o \
+ src/osdep/gui/PanelPaths.o \
+ src/osdep/gui/PanelConfig.o \
+ src/osdep/gui/PanelCPU.o \
+ src/osdep/gui/PanelChipset.o \
+ src/osdep/gui/PanelROM.o \
+ src/osdep/gui/PanelRAM.o \
+ src/osdep/gui/PanelFloppy.o \
+ src/osdep/gui/PanelHD.o \
+ src/osdep/gui/PanelDisplay.o \
+ src/osdep/gui/PanelSound.o \
+ src/osdep/gui/PanelInput.o \
+ src/osdep/gui/PanelMisc.o \
+ src/osdep/gui/PanelSavestate.o \
+ src/osdep/gui/main_window.o \
+ src/osdep/gui/Navigation.o
+ifdef ANDROID
+OBJS += src/osdep/gui/PanelOnScreen.o
+endif
+ifdef PANDORA
+OBJS += src/osdep/gui/sdltruetypefont.o
+endif
+
+ifdef USE_XFD
+OBJS += src/cpu_small.o \
+ src/cpuemu_small.o \
+ src/cpustbl_small.o \
+ src/archivers/xfd/xfd.o
+endif
+
+OBJS += src/newcpu.o
+OBJS += src/readcpu.o
+OBJS += src/cpudefs.o
+OBJS += src/cpustbl.o
+OBJS += src/cpuemu_0.o
+OBJS += src/cpuemu_4.o
+OBJS += src/cpuemu_11.o
+OBJS += src/jit/compemu.o
+OBJS += src/jit/compemu_fpp.o
+OBJS += src/jit/compstbl.o
+OBJS += src/jit/compemu_support.o
+
+CPPFLAGS = $(CFLAGS)
+
+src/osdep/neon_helper.o: src/osdep/neon_helper.s
+ $(CXX) -falign-functions=32 -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=hard -Wall -o src/osdep/neon_helper.o -c src/osdep/neon_helper.s
+
+$(PROG): $(OBJS)
+ $(CXX) $(CFLAGS) -o $(PROG) $(OBJS) $(LDFLAGS)
+ifndef DEBUG
+ $(STRIP) $(PROG)
+endif
+
+clean:
+ $(RM) $(PROG) $(OBJS)
diff -Nurd uae4arm/src/od-sdl-guichan/gui/SelectFolder.cpp uae4arm-lnx/src/od-sdl-guichan/gui/SelectFolder.cpp
--- uae4arm/src/od-sdl-guichan/gui/SelectFolder.cpp 2015-11-02 17:46:59.624332274 +0100
+++ uae4arm-lnx/src/od-sdl-guichan/gui/SelectFolder.cpp 2015-11-02 17:04:38.814333243 +0100
@@ -327,9 +327,13 @@
dialogFinished = false;
InitSelectFolder(title);
checkfoldername(value);
+#ifdef ANDROID
__android_log_print(ANDROID_LOG_INFO, "SDL", "FIXME folderloop start");
+#endif
SelectFolderLoop();
+#ifdef ANDROID
__android_log_print(ANDROID_LOG_INFO, "SDL", "FIXME folderloop end");
+#endif
ExitSelectFolder();
if(dialogResult)
{
diff -Nurd uae4arm/src/od-sdl-guichan/pandora.cpp uae4arm-lnx/src/od-sdl-guichan/pandora.cpp
--- uae4arm/src/od-sdl-guichan/pandora.cpp 2015-11-02 17:46:59.634332274 +0100
+++ uae4arm-lnx/src/od-sdl-guichan/pandora.cpp 2015-11-02 17:02:38.464333287 +0100
@@ -335,7 +335,8 @@
|| cfgfile_intval (option, value, "button2", &p->pandora_button2, 1)
|| cfgfile_intval (option, value, "autofire_button", &p->pandora_autofireButton1, 1)
|| cfgfile_intval (option, value, "jump", &p->pandora_jump, 1)
- || cfgfile_intval (option, value, "onscreen", &p->onScreen, 1)
+#ifdef ANDROIDSDL
+ || cfgfile_intval (option, value, "onscreen", &p->onScreen, 1)
|| cfgfile_intval (option, value, "onscreen_textinput", &p->onScreen_textinput, 1)
|| cfgfile_intval (option, value, "onscreen_dpad", &p->onScreen_dpad, 1)
|| cfgfile_intval (option, value, "onscreen_button1", &p->onScreen_button1, 1)
@@ -362,7 +363,8 @@
|| cfgfile_intval (option, value, "pos_x_button6", &p->pos_x_button6, 1)
|| cfgfile_intval (option, value, "pos_y_button6", &p->pos_y_button6, 1)
|| cfgfile_intval (option, value, "floating_joystick", &p->FloatingJoystick, 1)
- );
+#endif
+ );
}
diff -Nurd uae4arm/src/osdep/gui/SelectFolder.cpp uae4arm-lnx/src/osdep/gui/SelectFolder.cpp
--- uae4arm/src/osdep/gui/SelectFolder.cpp 2015-11-02 17:46:59.624332274 +0100
+++ uae4arm-lnx/src/osdep/gui/SelectFolder.cpp 2015-11-02 17:04:38.814333243 +0100
@@ -327,9 +327,13 @@
dialogFinished = false;
InitSelectFolder(title);
checkfoldername(value);
+#ifdef ANDROID
__android_log_print(ANDROID_LOG_INFO, "SDL", "FIXME folderloop start");
+#endif
SelectFolderLoop();
+#ifdef ANDROID
__android_log_print(ANDROID_LOG_INFO, "SDL", "FIXME folderloop end");
+#endif
ExitSelectFolder();
if(dialogResult)
{
diff -Nurd uae4arm/src/osdep/pandora.cpp uae4arm-lnx/src/osdep/pandora.cpp
--- uae4arm/src/osdep/pandora.cpp 2015-11-02 17:46:59.634332274 +0100
+++ uae4arm-lnx/src/osdep/pandora.cpp 2015-11-02 17:02:38.464333287 +0100
@@ -335,7 +335,8 @@
|| cfgfile_intval (option, value, "button2", &p->pandora_button2, 1)
|| cfgfile_intval (option, value, "autofire_button", &p->pandora_autofireButton1, 1)
|| cfgfile_intval (option, value, "jump", &p->pandora_jump, 1)
- || cfgfile_intval (option, value, "onscreen", &p->onScreen, 1)
+#ifdef ANDROIDSDL
+ || cfgfile_intval (option, value, "onscreen", &p->onScreen, 1)
|| cfgfile_intval (option, value, "onscreen_textinput", &p->onScreen_textinput, 1)
|| cfgfile_intval (option, value, "onscreen_dpad", &p->onScreen_dpad, 1)
|| cfgfile_intval (option, value, "onscreen_button1", &p->onScreen_button1, 1)
@@ -362,7 +363,8 @@
|| cfgfile_intval (option, value, "pos_x_button6", &p->pos_x_button6, 1)
|| cfgfile_intval (option, value, "pos_y_button6", &p->pos_y_button6, 1)
|| cfgfile_intval (option, value, "floating_joystick", &p->FloatingJoystick, 1)
- );
+#endif
+ );
}