From b9ff9943ef59e85724455a038826a0c1e27b21b9 Mon Sep 17 00:00:00 2001
From: Jookia <contact@jookia.org>
Date: Sun, 11 Sep 2022 15:41:17 +1000
Subject: [PATCH] build: Don't use --(dis|en)able-core-inline

---
 BUILD.md                                 | 5 -----
 build                                    | 2 +-
 build-debug                              | 2 +-
 build-debug-g3                           | 2 +-
 build-debug-g3-sdl2                      | 2 +-
 build-debug-gcc-prof                     | 2 +-
 build-debug-macos                        | 2 +-
 build-debug-macos-sdl2                   | 2 +-
 build-debug-sdl2                         | 2 +-
 build-debug-with-clang                   | 2 +-
 build-macos                              | 2 +-
 build-macos-sdl2                         | 2 +-
 build-mingw                              | 2 +-
 build-mingw-hx-dos                       | 2 +-
 build-mingw-lowend                       | 2 +-
 build-mingw-lowend-sdl2                  | 2 +-
 build-mingw-sdl2                         | 2 +-
 build-mingw-sdldraw                      | 2 +-
 build-riscos                             | 2 +-
 build-sdl2                               | 2 +-
 contrib/linux/com.dosbox_x.DOSBox-X.yaml | 1 -
 contrib/linux/dosbox-x.spec.in           | 2 +-
 22 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/BUILD.md b/BUILD.md
index c281406b0..467535e27 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -423,11 +423,6 @@ The DOSBox-X configure script accepts the following switches, which you can use
         
         Disables FFMPEG avcodec support
 
-* --disable-core-inline
-        
-        Disables some memory increasing inlines. This will reduces compiletime 
-        for a possible speed decrease.
-
 * --disable-fpu
         
         Disables the emulated FPU. Although the FPU emulation code isn't
diff --git a/build b/build
index 32779be3d..9f222c9f3 100755
--- a/build
+++ b/build
@@ -19,6 +19,6 @@ echo Compiling our internal SDLnet 1.x
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --enable-debug --prefix=/usr "$@" || exit 1
+./configure --enable-debug --prefix=/usr "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-debug b/build-debug
index 8c6693622..28423f012 100755
--- a/build-debug
+++ b/build-debug
@@ -37,6 +37,6 @@ echo Compiling our internal SDLnet 1.x
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1
+./configure --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1
 make -j3 || exit 1
 
diff --git a/build-debug-g3 b/build-debug-g3
index 28a4482b7..58131a1c4 100755
--- a/build-debug-g3
+++ b/build-debug-g3
@@ -31,6 +31,6 @@ echo Compiling our internal SDLnet 1.x
 # now compile ourself
 echo Compiling DOSBox-X
 # NTS: --disable-dynamic-core is needed. the dynamic core doesn't work properly with the CFLAGS given above
-./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --disable-dynamic-core "$@" || exit 1
+./configure --enable-debug=heavy --prefix=/usr --disable-dynamic-core "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-debug-g3-sdl2 b/build-debug-g3-sdl2
index 3135b86a5..27fe4346e 100755
--- a/build-debug-g3-sdl2
+++ b/build-debug-g3-sdl2
@@ -36,6 +36,6 @@ echo Compiling our internal SDLnet 1.x
 (cd vs/sdlnet && ./build-dosbox.sh) || exit 1
 
 # NTS: --disable-dynamic-core is needed. the dynamic core doesn't work properly with the CFLAGS given above
-./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --disable-dynamic-core --enable-sdl2 "$@" || exit 1
+./configure --enable-debug=heavy --prefix=/usr --disable-dynamic-core --enable-sdl2 "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-debug-gcc-prof b/build-debug-gcc-prof
index e04e030a5..0a0e11db3 100755
--- a/build-debug-gcc-prof
+++ b/build-debug-gcc-prof
@@ -30,6 +30,6 @@ echo Compiling our internal SDLnet 1.x
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1
+./configure --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1
 make -j3 || exit 1
 
diff --git a/build-debug-macos b/build-debug-macos
index 9b05df6d2..b094d45d5 100755
--- a/build-debug-macos
+++ b/build-debug-macos
@@ -75,6 +75,6 @@ fi
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --enable-debug=heavy --prefix=/usr $opts "$@" || exit 1
+./configure --enable-debug=heavy --prefix=/usr $opts "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-debug-macos-sdl2 b/build-debug-macos-sdl2
index 8c8d1aaa7..30d072083 100755
--- a/build-debug-macos-sdl2
+++ b/build-debug-macos-sdl2
@@ -72,6 +72,6 @@ fi
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --enable-sdl2 $opts "$@" || exit 1
+./configure --enable-debug=heavy --prefix=/usr --enable-sdl2 $opts "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-debug-sdl2 b/build-debug-sdl2
index 5a2db24bc..e4b661e01 100755
--- a/build-debug-sdl2
+++ b/build-debug-sdl2
@@ -33,6 +33,6 @@ echo Compiling our internal SDLnet 1.x
 (cd vs/sdlnet && ./build-dosbox.sh) || exit 1
 
 chmod +x configure
-./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --enable-sdl2 "$@" $opt || exit 1
+./configure --enable-debug=heavy --prefix=/usr --enable-sdl2 "$@" $opt || exit 1
 make -j3 || exit 1
 
diff --git a/build-debug-with-clang b/build-debug-with-clang
index a28b81e88..707d6d13f 100755
--- a/build-debug-with-clang
+++ b/build-debug-with-clang
@@ -32,6 +32,6 @@ echo Compiling our internal SDLnet 1.x
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1
+./configure --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1
 make -j3 || exit 1
 
diff --git a/build-macos b/build-macos
index a801c7d87..d504e7d95 100755
--- a/build-macos
+++ b/build-macos
@@ -75,6 +75,6 @@ fi
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --enable-debug=heavy --prefix=/usr $opts "$@" || exit 1
+./configure --enable-debug=heavy --prefix=/usr $opts "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-macos-sdl2 b/build-macos-sdl2
index bd972fb84..05ea294b9 100755
--- a/build-macos-sdl2
+++ b/build-macos-sdl2
@@ -72,6 +72,6 @@ fi
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --enable-sdl2 $opts "$@" || exit 1
+./configure --enable-debug=heavy --prefix=/usr --enable-sdl2 $opts "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-mingw b/build-mingw
index e3a894be7..bcdee9fc8 100644
--- a/build-mingw
+++ b/build-mingw
@@ -65,6 +65,6 @@ pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
 echo Compiling DOSBox-X
 chmod +x configure
 # FIXME: I would like MinGW builds to enable the debugger, eventually
-./configure --enable-core-inline --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr "$@" || exit 1
+./configure --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-mingw-hx-dos b/build-mingw-hx-dos
index da8d043db..aad037b1d 100644
--- a/build-mingw-hx-dos
+++ b/build-mingw-hx-dos
@@ -58,6 +58,6 @@ export INTERNAL_FREETYPE=1
 echo Compiling DOSBox-X
 chmod +x configure
 # FIXME: I would like MinGW builds to enable the debugger, eventually
-./configure --enable-core-inline --disable-libfluidsynth --disable-opengl --enable-hx-dos --prefix=/usr "$@" || exit 1
+./configure --disable-libfluidsynth --disable-opengl --enable-hx-dos --prefix=/usr "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-mingw-lowend b/build-mingw-lowend
index 7fadec458..7c5ae28f7 100644
--- a/build-mingw-lowend
+++ b/build-mingw-lowend
@@ -58,6 +58,6 @@ export INTERNAL_FREETYPE=1
 echo Compiling DOSBox-X
 chmod +x configure
 # FIXME: I would like MinGW builds to enable the debugger, eventually
-./configure --enable-core-inline --disable-libfluidsynth --disable-libslirp --enable-d3d9 --enable-d3d-shaders --prefix=/usr "$@" || exit 1
+./configure --disable-libfluidsynth --disable-libslirp --enable-d3d9 --enable-d3d-shaders --prefix=/usr "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-mingw-lowend-sdl2 b/build-mingw-lowend-sdl2
index af92b9a2a..9e1e5f436 100644
--- a/build-mingw-lowend-sdl2
+++ b/build-mingw-lowend-sdl2
@@ -61,6 +61,6 @@ export INTERNAL_FREETYPE=1
 echo Compiling DOSBox-X
 chmod +x configure
 # FIXME: I would like MinGW builds to enable the debugger, eventually
-./configure --enable-core-inline --disable-libfluidsynth --disable-libslirp --enable-d3d9 --enable-d3d-shaders --prefix=/usr --enable-sdl2 "$@" || exit 1
+./configure --disable-libfluidsynth --disable-libslirp --enable-d3d9 --enable-d3d-shaders --prefix=/usr --enable-sdl2 "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-mingw-sdl2 b/build-mingw-sdl2
index 7b315ec3b..6a425e641 100644
--- a/build-mingw-sdl2
+++ b/build-mingw-sdl2
@@ -63,6 +63,6 @@ pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
 echo Compiling DOSBox-X
 chmod +x configure
 # FIXME: I would like MinGW builds to enable the debugger, eventually
-./configure --enable-core-inline --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr --enable-sdl2 "$@" || exit 1
+./configure --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr --enable-sdl2 "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-mingw-sdldraw b/build-mingw-sdldraw
index 4f5750982..34b99f1a5 100644
--- a/build-mingw-sdldraw
+++ b/build-mingw-sdldraw
@@ -60,6 +60,6 @@ pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
 echo Compiling DOSBox-X
 chmod +x configure
 # FIXME: I would like MinGW builds to enable the debugger, eventually
-./configure --enable-core-inline --enable-force-menu-sdldraw --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr "$@" || exit 1
+./configure --enable-force-menu-sdldraw --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/build-riscos b/build-riscos
index 26b8f1959..45a2dea9f 100755
--- a/build-riscos
+++ b/build-riscos
@@ -13,7 +13,7 @@ export PATH=$GCCSDK_INSTALL_ENV/bin:$PATH
 export CPPFLAGS=-I$GCCSDK_INSTALL_ENV/include
 export LDFLAGS="-L$GCCSDK_INSTALL_ENV/lib -static"
 
-./configure --host=arm-unknown-riscos --enable-core-inline "$@"
+./configure --host=arm-unknown-riscos "$@"
 make -j3 || exit 1
 elf2aif src/dosbox-x !DosBox-X/dosbox-x,ff8
 cp contrib/fonts/FREECG98.BMP !DosBox-X/resources/freecg98.bmp,69c
diff --git a/build-sdl2 b/build-sdl2
index ca074cc26..53bca494e 100644
--- a/build-sdl2
+++ b/build-sdl2
@@ -19,6 +19,6 @@ echo Compiling our internal SDLnet 1.x
 # now compile ourself
 echo Compiling DOSBox-X
 chmod +x configure
-./configure --enable-core-inline --enable-debug --prefix=/usr --enable-sdl2 "$@" || exit 1
+./configure --enable-debug --prefix=/usr --enable-sdl2 "$@" || exit 1
 make -j3 || exit 1
 
diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.yaml b/contrib/linux/com.dosbox_x.DOSBox-X.yaml
index f06ab7c55..748d9ebd2 100644
--- a/contrib/linux/com.dosbox_x.DOSBox-X.yaml
+++ b/contrib/linux/com.dosbox_x.DOSBox-X.yaml
@@ -75,7 +75,6 @@ modules:
   - name: dosbox-x
     buildsystem: autotools
     config-opts:
-      - --enable-core-inline
       - --enable-debug=heavy
       - --enable-sdl2
     sources:
diff --git a/contrib/linux/dosbox-x.spec.in b/contrib/linux/dosbox-x.spec.in
index 293addd80..c768cdcb0 100644
--- a/contrib/linux/dosbox-x.spec.in
+++ b/contrib/linux/dosbox-x.spec.in
@@ -57,7 +57,7 @@ options and features.
 
 %build
 ./autogen.sh
-%configure --enable-core-inline --enable-debug=heavy --enable-sdl2
+%configure --enable-debug=heavy --enable-sdl2
 %make_build
 
 %install