Files
commandergenius/project/jni/application/atari800/atari800-2.2.0rc2-cvs.diff
2011-02-04 10:58:55 +00:00

72 lines
2.8 KiB
Diff

Only in atari800/atari800/src: config.h.in
diff -ru orig/atari800/atari800/src/config.sub atari800/atari800/src/config.sub
--- orig/atari800/atari800/src/config.sub 2006-04-08 08:07:36.000000000 -0400
+++ atari800/atari800/src/config.sub 2011-02-03 10:28:16.000000000 -0500
@@ -1206,7 +1206,7 @@
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -udi* | -eabi* | -androideabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
diff -ru orig/atari800/atari800/src/configure.ac atari800/atari800/src/configure.ac
--- orig/atari800/atari800/src/configure.ac 2010-12-07 10:16:26.000000000 -0500
+++ atari800/atari800/src/configure.ac 2011-02-03 10:45:32.000000000 -0500
@@ -97,7 +97,7 @@
AC_DEFINE(DOS_DRIVES,1,[Define to enable DOS style drives support.])
AC_DEFINE(SYSTEM_WIDE_CFG_FILE,"c:\\atari800.cfg",[Alternate system-wide config file for non-Unix OS.])
;;
- linux | linux-gnu)
+ linux | linux-gnu | androideabi)
a8_host="linux"
;;
mint)
@@ -301,7 +301,7 @@
WANT_NTSC_FILTER=yes
LIBS="$LIBS `sdl-config --libs`"
OBJS="videomode.o sdl/main.o sdl/video.o sdl/video_sw.o sdl/input.o sdl/palette.o"
- CFLAGS="$CFLAGS -ansi -pedantic -Waggregate-return -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Winline"
+ CFLAGS="$CFLAGS -O3 -pedantic -Waggregate-return -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Winline"
if [[ "$a8_host" != "beos" ]]; then
dnl BeOS has a real issue with redundant-decls
CFLAGS="$CFLAGS -Wredundant-decls"
Only in atari800/atari800/src: configure.ac~
diff -ru orig/atari800/atari800/src/sdl/input.c atari800/atari800/src/sdl/input.c
--- orig/atari800/atari800/src/sdl/input.c 2010-12-07 10:16:26.000000000 -0500
+++ atari800/atari800/src/sdl/input.c 2011-02-03 10:46:35.000000000 -0500
@@ -22,9 +22,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef ANDROID
#ifdef __linux__
#define LPTJOY 1
#endif
+#endif
#ifdef LPTJOY
#include <fcntl.h>
@@ -1214,6 +1216,9 @@
int stick0, stick1;
stick0 = stick1 = INPUT_STICK_CENTRE;
+ if( !kbhits )
+ return;
+
if (PLATFORM_kbd_joy_0_enabled) {
if (kbhits[KBD_STICK_0_LEFT])
stick0 = INPUT_STICK_LEFT;
@@ -1281,6 +1286,9 @@
int trig0, trig1, i;
trig0 = trig1 = 1;
+ if( !kbhits )
+ return;
+
if (PLATFORM_kbd_joy_0_enabled) {
trig0 = kbhits[KBD_TRIG_0] ? 0 : 1;
}
Only in atari800/atari800/src/sdl: input.c~