3rdparty: Fix Atari build

- Lua
- Zlib
- SDL-1.2 atari timer patch
This commit is contained in:
Thomas Bernard 2019-02-09 04:59:36 +01:00
parent 96c6ce2221
commit 5d12292b43
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
3 changed files with 29 additions and 2 deletions

10
3rdparty/Makefile vendored
View File

@ -102,7 +102,8 @@ LUAARCH=$(LUA).tar.gz
LUAURL=https://www.lua.org/ftp/$(LUAARCH)
LUAURLALT=https://www.tecgraf.puc-rio.br/lua/mirror/ftp/$(LUAARCH)
LUASHA256=0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac
LUAPATCHES = lua-atari-log2.patch
LUAPATCHES = lua-atari-log2.patch \
lua-atari-inttype.patch
# https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-0.6.1.tar.gz
RECOILVER=4.3.1
RECOIL=recoil-$(RECOILVER)
@ -510,7 +511,12 @@ else
# configure [--const] [--zprefix] [--prefix=PREFIX] [--eprefix=EXPREFIX]
# [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]
# [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]
cd $(ZLIB) && CC=$(CC) AR=$(AR) RANLIB=$(RANLIB) ./configure --prefix=$(PREFIX) && $(MAKE) test
cd $(ZLIB) && CC=$(CC) AR=$(AR) RANLIB=$(RANLIB) ./configure --prefix=$(PREFIX)
ifdef ATARICROSS
cd $(ZLIB) && $(MAKE)
else
cd $(ZLIB) && $(MAKE) test
endif
cd $(ZLIB) && $(MAKE) install
endif
$(CP) $(ZLIB)/README ../doc/README-zlib1.txt

View File

@ -560,3 +560,13 @@ diff -r 7f4407040fbd -r 4a9c67d11c9f src/video/gem/SDL_gemevents.c
resultat = evnt_multi(
MU_MESAG|MU_TIMER|MU_KEYBD,
0,0,0,
--- SDL-1.2.15/configure.orig 2019-02-09 05:22:11.106966000 +0100
+++ SDL-1.2.15/configure 2019-02-09 05:22:35.734516000 +0100
@@ -30122,7 +30122,6 @@
_ACEOF
SOURCES="$SOURCES $srcdir/src/timer/mint/*.c"
- SOURCES="$SOURCES $srcdir/src/timer/mint/*.S"
fi
have_timers=yes
fi

11
3rdparty/lua-atari-inttype.patch vendored Normal file
View File

@ -0,0 +1,11 @@
--- lua-5.3.5/src/luaconf.h.orig 2019-02-09 04:47:51.683095000 +0100
+++ lua-5.3.5/src/luaconf.h 2019-02-09 04:48:29.946857000 +0100
@@ -77,7 +77,7 @@
** C89 ('long' and 'double'); Windows always has '__int64', so it does
** not need to use this case.
*/
-#if defined(LUA_USE_C89) && !defined(LUA_USE_WINDOWS)
+#if (defined(LUA_USE_C89) && !defined(LUA_USE_WINDOWS)) || defined(__atarist__) || defined(__MINT__)
#define LUA_C89_NUMBERS
#endif