From a30bd6e6d712dc6d4e64e33414b461e1377d4056 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Mon, 17 Jun 2013 12:01:41 +0800 Subject: [PATCH] Externals - Added start of a libSDL port, added autoreconf support --- Externals/common.mk | 9 +- Externals/sdl12/Makefile | 15 ++ Externals/sdl12/patches/configure.in.patch | 168 +++++++++++++++++++++ 3 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 Externals/sdl12/Makefile create mode 100644 Externals/sdl12/patches/configure.in.patch diff --git a/Externals/common.mk b/Externals/common.mk index 7a86c40e..42386e5a 100644 --- a/Externals/common.mk +++ b/Externals/common.mk @@ -33,6 +33,7 @@ HOST=$(BFD)-acess_proxy-elf # [?]ARCHIVE : Optional forced archive (Defaults to latest) # [?]CONFIGURE_LINE : Command to create makefile (defaults to autotools configure) # [?]NOBDIR : Set to non-empty to disable use of a separate build dir +# [?]AUTORECONF : Set to non-empty to regenerate ./configure BTARGETS ?= all @@ -88,7 +89,13 @@ $(DIR)/%: patches/% _patch: $(DIR) $(addprefix $(DIR)/,$(PATCHES)) -$(BDIR)/Makefile: _patch ../common.mk Makefile +_autoreconf: _patch +ifeq ($(AUTORECONF),) +else + cd $(DIR) && autoreconf --force --install +endif + +$(BDIR)/Makefile: _autoreconf ../common.mk Makefile mkdir -p $(BDIR) cd $(BDIR) && $(CONFIGURE_LINE) diff --git a/Externals/sdl12/Makefile b/Externals/sdl12/Makefile new file mode 100644 index 00000000..96acd04e --- /dev/null +++ b/Externals/sdl12/Makefile @@ -0,0 +1,15 @@ +# +# Acess2 External: libsdl1.2 +# - Makefile and patches by John Hodge (thePowersGang) +# + +DEPS := +TARBALL_PATTERN := SDL-*.tar.gz +TARBALL_TO_DIR_L := %.tar.gz +TARBALL_TO_DIR_R := % +PATCHES := configure.in +CONFIGURE_ARGS = +AUTORECONF = yes + +include ../common.mk + diff --git a/Externals/sdl12/patches/configure.in.patch b/Externals/sdl12/patches/configure.in.patch new file mode 100644 index 00000000..3507a9ca --- /dev/null +++ b/Externals/sdl12/patches/configure.in.patch @@ -0,0 +1,168 @@ +--- SDL-1.2.15_orig/configure.in 2013-06-17 11:39:39.670720710 +0800 ++++ SDL-1.2.15/configure.in 2013-06-17 11:48:09.149384231 +0800 +@@ -43,6 +43,147 @@ + AC_SUBST(LT_REVISION) + AC_SUBST(LT_AGE) + ++AH_TEMPLATE(HAVE_ALTIVEC_H, []) ++AH_TEMPLATE(HAVE_CLOCK_GETTIME, []) ++AH_TEMPLATE(HAVE_LIBC, []) ++AH_TEMPLATE(HAVE_MEMCMP, []) ++AH_TEMPLATE(HAVE_MPROTECT, []) ++AH_TEMPLATE(HAVE_SA_SIGACTION, []) ++AH_TEMPLATE(HAVE_SEM_TIMEDWAIT, []) ++AH_TEMPLATE(HAVE_STRTOD, []) ++AH_TEMPLATE(SDL_ALTIVEC_BLITTERS, []) ++AH_TEMPLATE(SDL_ASSEMBLY_ROUTINES, []) ++AH_TEMPLATE(SDL_AUDIO_DISABLED, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_ALSA, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_ALSA_DYNAMIC, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_ARTS, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_BAUDIO, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_BSD, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_COREAUDIO, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_DISK, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_DMEDIA, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_DSOUND, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_DUMMY, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_ESD, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_ESD_DYNAMIC, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_MINT, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_MMEAUDIO, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_NAS, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_NAS_DYNAMIC, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_OSS, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_PAUD, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_PULSE, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_PULSE_DYNAMIC, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_QNXNTO, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_SUNAUDIO, []) ++AH_TEMPLATE(SDL_AUDIO_DRIVER_WAVEOUT, []) ++AH_TEMPLATE(SDL_BYTEORDER, []) ++AH_TEMPLATE(SDL_CDROM_AIX, []) ++AH_TEMPLATE(SDL_CDROM_BEOS, []) ++AH_TEMPLATE(SDL_CDROM_BSDI, []) ++AH_TEMPLATE(SDL_CDROM_DISABLED, []) ++AH_TEMPLATE(SDL_CDROM_FREEBSD, []) ++AH_TEMPLATE(SDL_CDROM_LINUX, []) ++AH_TEMPLATE(SDL_CDROM_MACOSX, []) ++AH_TEMPLATE(SDL_CDROM_MINT, []) ++AH_TEMPLATE(SDL_CDROM_OPENBSD, []) ++AH_TEMPLATE(SDL_CDROM_OSF, []) ++AH_TEMPLATE(SDL_CDROM_QNX, []) ++AH_TEMPLATE(SDL_CDROM_WIN32, []) ++AH_TEMPLATE(SDL_CPUINFO_DISABLED, []) ++AH_TEMPLATE(SDL_EVENTS_DISABLED, []) ++AH_TEMPLATE(SDL_FILE_DISABLED, []) ++AH_TEMPLATE(SDL_HAS_64BIT_TYPE, []) ++AH_TEMPLATE(SDL_HERMES_BLITTERS, []) ++AH_TEMPLATE(SDL_INPUT_LINUXEV, []) ++AH_TEMPLATE(SDL_INPUT_TSLIB, []) ++AH_TEMPLATE(SDL_JOYSTICK_BEOS, []) ++AH_TEMPLATE(SDL_JOYSTICK_DISABLED, []) ++AH_TEMPLATE(SDL_JOYSTICK_DUMMY, []) ++AH_TEMPLATE(SDL_JOYSTICK_IOKIT, []) ++AH_TEMPLATE(SDL_JOYSTICK_LINUX, []) ++AH_TEMPLATE(SDL_JOYSTICK_MINT, []) ++AH_TEMPLATE(SDL_JOYSTICK_RISCOS, []) ++AH_TEMPLATE(SDL_JOYSTICK_USBHID, []) ++AH_TEMPLATE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H, []) ++AH_TEMPLATE(SDL_JOYSTICK_WINMM, []) ++AH_TEMPLATE(SDL_LOADSO_BEOS, []) ++AH_TEMPLATE(SDL_LOADSO_DISABLED, []) ++AH_TEMPLATE(SDL_LOADSO_DLCOMPAT, []) ++AH_TEMPLATE(SDL_LOADSO_DLOPEN, []) ++AH_TEMPLATE(SDL_LOADSO_LDG, []) ++AH_TEMPLATE(SDL_LOADSO_WIN32, []) ++AH_TEMPLATE(SDL_THREADS_DISABLED, []) ++AH_TEMPLATE(SDL_THREAD_BEOS, []) ++AH_TEMPLATE(SDL_THREAD_PTH, []) ++AH_TEMPLATE(SDL_THREAD_PTHREAD, []) ++AH_TEMPLATE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX, []) ++AH_TEMPLATE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP, []) ++AH_TEMPLATE(SDL_THREAD_SPROC, []) ++AH_TEMPLATE(SDL_THREAD_WIN32, []) ++AH_TEMPLATE(SDL_TIMERS_DISABLED, []) ++AH_TEMPLATE(SDL_TIMER_BEOS, []) ++AH_TEMPLATE(SDL_TIMER_MINT, []) ++AH_TEMPLATE(SDL_TIMER_RISCOS, []) ++AH_TEMPLATE(SDL_TIMER_UNIX, []) ++AH_TEMPLATE(SDL_TIMER_WIN32, []) ++AH_TEMPLATE(SDL_TIMER_WINCE, []) ++AH_TEMPLATE(SDL_VIDEO_DISABLED, []) ++AH_TEMPLATE(SDL_VIDEO_DISABLE_SCREENSAVER, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_AALIB, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_ACESS, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_BWINDOW, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_CACA, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_DDRAW, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_DGA, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_DIRECTFB, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_DUMMY, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_FBCON, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_GEM, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_GGI, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_IPOD, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_NANOX, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_PHOTON, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_PICOGUI, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_PS2GS, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_PS3, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_QTOPIA, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_QUARTZ, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_RISCOS, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_SVGALIB, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_TOOLBOX, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_VGL, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_WINDIB, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_WSCONS, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_X11, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_X11_DGAMOUSE, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_X11_DYNAMIC, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_X11_VIDMODE, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_X11_XINERAMA, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_X11_XME, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_X11_XRANDR, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_X11_XV, []) ++AH_TEMPLATE(SDL_VIDEO_DRIVER_XBIOS, []) ++AH_TEMPLATE(SDL_VIDEO_OPENGL, []) ++AH_TEMPLATE(SDL_VIDEO_OPENGL_GLX, []) ++AH_TEMPLATE(SDL_VIDEO_OPENGL_OSMESA, []) ++AH_TEMPLATE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC, []) ++AH_TEMPLATE(SDL_VIDEO_OPENGL_WGL, []) ++AH_TEMPLATE(int8_t, [Signed 8-bit int]) ++AH_TEMPLATE(int16_t, [Signed 16-bit int]) ++AH_TEMPLATE(int32_t, [Signed 32-bit int]) ++AH_TEMPLATE(int64_t, [Signed 64-bit int]) ++AH_TEMPLATE(uint8_t, [Unigned 8-bit int]) ++AH_TEMPLATE(uint16_t, [Unigned 16-bit int]) ++AH_TEMPLATE(uint32_t, [Unigned 32-bit int]) ++AH_TEMPLATE(uint64_t, [Unigned 64-bit int]) ++AH_TEMPLATE(uintptr_t, [Unsigned pointer-sized integer]) ++ + dnl Detect the canonical build and host environments + AC_CONFIG_AUX_DIR([build-scripts]) + dnl AC_CANONICAL_HOST +@@ -2831,6 +2972,17 @@ + # The RISC OS platform requires special setup. + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ljpeg -ltiff -lpng -lz" + ;; ++ *-acess*) ++ ARCH=acess ++ # Set up files for the video library ++ if test x$enable_video = xyes; then ++ AC_DEFINE(SDL_VIDEO_DRIVER_ACESS) ++ SOURCES="$SOURCES $srcdir/src/video/acess/*.c" ++ SOURCES="$SOURCES $srcdir/src/video/acess/*.S" ++ have_video=yes ++ fi ++ # TODO: Joystick ++ ;; + *) + AC_MSG_ERROR([ + *** Unsupported host: Please add to configure.in -- 2.20.1