FS-UAE 2.5.4dev

ChangeLog

@@ -1,3 +1,7 @@
+Version 2.5.4dev:
+
+* Some more autoconf / build updates.
+
 Version 2.5.3dev:
 
 * Merged code from WinUAE 2800.

Makefile.py

@@ -575,23 +575,18 @@ def main():
 mo: $(catalogs)
 
 distdir-base:
-    rm -Rf $(dist_dir)/*
+    rm -Rf $(dist_dir)
     mkdir -p $(dist_dir)
-    # cp -a $(dist_dir_launcher) $(dist_dir)/launcher
 
-    mkdir -p $(dist_dir)/obj
-    touch $(dist_dir)/obj/.dummy
-    mkdir -p $(dist_dir)/out
-    touch $(dist_dir)/out/.dummy
     cp -a INSTALL README COPYING NEWS AUTHORS $(dist_dir)
     cp -a VERSION SERIES ChangeLog $(dist_dir)
-    # windows.mk macosx.mk debian.mk
     cp -a fs-uae.spec $(dist_dir)
     cp -a example.conf $(dist_dir)
     cp -a configure.ac $(dist_dir)
     cp -a bootstrap.sh $(dist_dir)
     cp -a Makefile.py $(dist_dir)
     cp -a src contrib share licenses $(dist_dir)
+
     rm -Rf $(dist_dir)/src/od-win32
     rm -Rf $(dist_dir)/src/prowizard
     rm -Rf $(dist_dir)/src/archivers/lha
@@ -604,8 +599,6 @@ def main():
     rm -f $(dist_dir)/src/catweasel.cpp
 
     find $(dist_dir)/share -name "*.mo" -delete
-    # mkdir -p $(dist_dir)/gensrc
-    # cp -a gensrc/*.cpp gensrc/*.h $(dist_dir)/gensrc
 
     mkdir -p $(dist_dir)/libfsemu
     cp -a $(libfsemu_dir)/COPYING $(dist_dir)/libfsemu
@@ -750,6 +743,12 @@ def main():
     rm -f fs-uae-device-helper fs-uae-device-helper.exe
 
 distclean: clean clean-dist
+    rm -f config.h
+    rm -f config.log
+    rm -f config.status
+    rm -f Makefile
+    rm -Rf share/locale/
+    rm -f stamp-h1
 """
 
 if __name__ == "__main__":

VERSION

@@ -1 +1 @@
-2.5.3dev
+2.5.4dev

configure.ac

@@ -356,11 +356,79 @@ AS_CASE([$target_os],
 #])
 
 
-# Features
+# JIT support
 
-AC_DEFINE([WITH_NETPLAY], [1], [Define to 1 to enable net play])
-# AC_DEFINE([WITH_LUA], [1], [Define to 1 to enable LUA scripting])
-AC_DEFINE([WITH_XML_SHADER], [1], [Define to 1 to enable XML shaders])
+AC_ARG_ENABLE([jit], [
+    AS_HELP_STRING([--enable-jit],
+        [enable support for JIT compilation @<:@default=check@:>@])
+    ], [], [enable_jit=check])
+
+AS_IF([test "x$enable_jit" != xno], [
+    AC_TRY_COMPILE([
+    ], [
+        #ifndef __i386__
+        #error JIT is only supported on x86
+        #endif
+        #if defined(__OpenBSD__) || defined(__FreeBSD__)
+        #error no JIT on OpenBSD/FreeBSD right now
+        #endif
+    ], [
+        AC_DEFINE([JIT], [1], [Define to 1 to enable JIT compilation])
+    ], [
+        if test "x$enable_jit" != xcheck; then
+            AC_MSG_FAILURE(
+                [--enable-jit was given, but arch is not supported])
+        fi
+    ]) 
+], [])
+
+
+# Netplay feature.
+
+AC_ARG_ENABLE([netplay], [
+    AS_HELP_STRING([--disable-netplay],
+        [disable netplay support])
+    ], [], [enable_netplay=yes])
+
+AS_IF([test "x$enable_netplay" != xno], [
+    AC_DEFINE([WITH_NETPLAY], [1], [Define to 1 to enable net play])
+], [])
+
+
+# LUA scripting feature.
+
+AC_ARG_ENABLE([lua], [
+    AS_HELP_STRING([--enable-lua],
+        [enable Lua scripting support]
+    )], [], [enable_lua=no])
+
+AS_IF([test "x$enable_lua" != xno], [
+    AC_DEFINE([WITH_LUA], [1], [Define to 1 to enable LUA scripting])
+], [])
+
+
+# Optional uaenative.library support.
+
+AC_ARG_ENABLE([uaenative], [
+    AS_HELP_STRING([--disable-uaenative],
+        [disable UAE native library interface]
+    )], [], [enable_uaenative=yes])
+
+AS_IF([test "x$enable_uaenative" != xno], [
+    AC_DEFINE([WITH_UAENATIVE], [1], [Define to 1 to enable uaenative.library])
+], [])
+
+
+# XML shader feature.
+
+AC_ARG_ENABLE([xml-shader], [
+    AS_HELP_STRING([--disable-xml-shader],
+        [disable XML shader support]
+    )], [], [enable_xml_shader=yes])
+
+AS_IF([test "x$enable_xml_shader" != xno], [
+    AC_DEFINE([WITH_XML_SHADER], [1], [Define to 1 to enable XML shaders])
+], [])
 
 
 # Byte swapping

src/include/uae/jitconfig.h

@@ -1,10 +1,7 @@
 #ifndef _UAE_JITCONFIG_H_
 #define _UAE_JITCONFIG_H_
 
-#if defined(__i386__) && !defined(OPENBSD) && !defined(FREEBSD)
-#define JIT
 // #define JIT_DEBUG
-#endif
 
 #if defined(__i386__)
 // set up correct REGPARAMS for JIT

src/od-fs/defines.h

@@ -122,7 +122,6 @@ extern FILE *g_fs_uae_sync_debug_file;
 #ifdef LINUX
 #define WITH_SCSI_IOCTL
 #endif
-#define WITH_UAENATIVE
 
 #define XARCADE
 #define GNU_SOURCE 1