From 5102cb31e0a84825d2d58c69c53b23bf27032b47 Mon Sep 17 00:00:00 2001
From: Jonathan Campbell <jonathan@castus.tv>
Date: Sun, 17 Mar 2019 16:10:03 -0700
Subject: [PATCH] changelog, and use configure flags

---
 CHANGELOG              | 4 ++++
 build-debug            | 3 ++-
 build-debug-no-avcodec | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d13d0abe5..9d27e56be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
 0.82.17 (next)
+  - Updated build-debug scripts to accept "32" on the command
+    line as a sign to compile 32-bit (i686) on a 64-bit (x86_64)
+    system. You will need a multilib-capable GCC and 32-bit
+    libraries installed on your system for this to work.
   - SDL2 OpenGL fixed color order issue
   - OpenGL is now supported in SDL2 builds.
   - Changed MPU-401 reset duration (DOSBox SVN).
diff --git a/build-debug b/build-debug
index e7a900876..c7e619f20 100755
--- a/build-debug
+++ b/build-debug
@@ -5,6 +5,7 @@ if [ "$1" == "32" ]; then
     export CC=`which gcc`" -m32"
     export CXX=`which g++`" -m32"
     shift
+    opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu"
 fi
 
 # Jonathan C dev hack: refer to LNKDOS16 in /usr/src/doslib
@@ -36,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 --enable-avcodec --prefix=/usr "$@" || exit 1
+./configure --enable-core-inline --enable-debug=heavy --enable-avcodec --prefix=/usr "$@" $opt || exit 1
 make -j3 || exit 1
 
diff --git a/build-debug-no-avcodec b/build-debug-no-avcodec
index bf0da2019..26f39976d 100755
--- a/build-debug-no-avcodec
+++ b/build-debug-no-avcodec
@@ -5,6 +5,7 @@ if [ "$1" == "32" ]; then
     export CC=`which gcc`" -m32"
     export CXX=`which g++`" -m32"
     shift
+    opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu"
 fi
 
 # I'm sick and tired of all the churn the three versions of autoconf
@@ -26,6 +27,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 "$@" || exit 1
+./configure --enable-core-inline --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1
 make -j3 || exit 1