Merge pull request #5143 from MrMEEE/Linux-VHD-Fix

Changed Linux build to use 16-bit wide chars, to fix issue #5132
joncampbell123 · Aug 3, 2024 · 30b55b2 · 30b55b2
2 parents 5af9c01 + 37268a7
commit 30b55b2
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 0 deletions.
diff --git a/build b/build
@@ -9,6 +9,11 @@ if [ "$1" == "32" ]; then
     opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu"
 fi
 
+# Makes Linux use 16-bit wide chars instead of 32-bit
+CFLAGS="${CFLAGS} -fshort-wchar"
+CXXFLAGS="${CXXFLAGS} -fshort-wchar"
+export CCFLAGS CXXFLAGS
+
 # Jonathan C dev hack: refer to LNKDOS16 in /usr/src/doslib
 doslib=""
 if [ -d /usr/src/doslib ]; then doslib="/usr/src/doslib"; fi

diff --git a/build-debug b/build-debug
@@ -9,6 +9,11 @@ if [ "$1" == "32" ]; then
     opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu"
 fi
 
+# Makes Linux use 16-bit wide chars instead of 32-bit
+CFLAGS="${CFLAGS} -fshort-wchar"
+CXXFLAGS="${CXXFLAGS} -fshort-wchar"
+export CCFLAGS CXXFLAGS
+
 # Jonathan C dev hack: refer to LNKDOS16 in /usr/src/doslib
 doslib=
 if [ -d /usr/src/doslib ]; then doslib="/usr/src/doslib"; fi

diff --git a/build-debug-g3 b/build-debug-g3
@@ -8,6 +8,11 @@ if [ "${1}" == "32" ]; then
     shift
 fi
 
+# Makes Linux use 16-bit wide chars instead of 32-bit
+CFLAGS="${CFLAGS} -fshort-wchar"
+CXXFLAGS="${CXXFLAGS} -fshort-wchar"
+export CCFLAGS CXXFLAGS
+
 # I'm sick and tired of all the churn the three versions of autoconf
 # are causing in this repo. Stop committing the configure scripts
 # and just autoregen.

diff --git a/build-debug-g3-sdl2 b/build-debug-g3-sdl2
@@ -8,6 +8,11 @@ if [ "${1}" == "32" ]; then
     shift
 fi
 
+# Makes Linux use 16-bit wide chars instead of 32-bit
+CFLAGS="${CFLAGS} -fshort-wchar"
+CXXFLAGS="${CXXFLAGS} -fshort-wchar"
+export CCFLAGS CXXFLAGS
+
 # I'm sick and tired of all the churn the three versions of autoconf
 # are causing in this repo. Stop committing the configure scripts
 # and just autoregen.

diff --git a/build-debug-gcc-prof b/build-debug-gcc-prof
@@ -9,6 +9,11 @@ if [ "$1" == "32" ]; then
     opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu"
 fi
 
+# Makes Linux use 16-bit wide chars instead of 32-bit
+CFLAGS="${CFLAGS} -fshort-wchar"
+CXXFLAGS="${CXXFLAGS} -fshort-wchar"
+export CCFLAGS CXXFLAGS
+
 # I'm sick and tired of all the churn the three versions of autoconf
 # are causing in this repo. Stop committing the configure scripts
 # and just autoregen.

diff --git a/build-debug-sdl2 b/build-debug-sdl2
@@ -10,6 +10,11 @@ if [ "$1" == "32" ]; then
     opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu"
 fi
 
+# Makes Linux use 16-bit wide chars instead of 32-bit
+CFLAGS="${CFLAGS} -fshort-wchar"
+CXXFLAGS="${CXXFLAGS} -fshort-wchar"
+export CCFLAGS CXXFLAGS
+
 # Jonathan C dev hack: refer to LNKDOS16 in /usr/src/doslib
 doslib=
 if [ -d /usr/src/doslib ]; then doslib="/usr/src/doslib"; fi