From 37268a7517ec6f693fb352c1be4dea3fe608d63a Mon Sep 17 00:00:00 2001 From: Martin Juhl Date: Tue, 30 Jul 2024 13:10:35 +0200 Subject: [PATCH 1/2] Changed Linux build to use 16-bit wide chars, to fix issue #5132 --- build | 5 +++++ build-debug | 5 +++++ build-debug-g3 | 5 +++++ build-debug-g3-sdl2 | 5 +++++ build-debug-gcc-prof | 5 +++++ build-debug-sdl2 | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/build b/build index defdc787f2..e4456accc8 100755 --- 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 index f8545bc8eb..279aab8ca4 100755 --- 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 index c0ff1b7f38..48cfc05aec 100755 --- 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 index 8f4458d592..a44a099541 100755 --- 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 index db657024b4..ee6d69f0e5 100755 --- 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 index 803ee99a97..47202f1463 100755 --- 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 From c557b3d9effb4bf103cc3cb1cb01ed49d8b57117 Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Sat, 3 Aug 2024 03:28:51 -0700 Subject: [PATCH 2/2] whoops --- build | 5 ----- build-debug | 5 ----- build-debug-g3 | 5 ----- build-debug-g3-sdl2 | 5 ----- build-debug-gcc-prof | 5 ----- build-debug-sdl2 | 5 ----- 6 files changed, 30 deletions(-) diff --git a/build b/build index e4456accc8..defdc787f2 100755 --- a/build +++ b/build @@ -9,11 +9,6 @@ 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 index 279aab8ca4..f8545bc8eb 100755 --- a/build-debug +++ b/build-debug @@ -9,11 +9,6 @@ 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 index 48cfc05aec..c0ff1b7f38 100755 --- a/build-debug-g3 +++ b/build-debug-g3 @@ -8,11 +8,6 @@ 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 index a44a099541..8f4458d592 100755 --- a/build-debug-g3-sdl2 +++ b/build-debug-g3-sdl2 @@ -8,11 +8,6 @@ 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 index ee6d69f0e5..db657024b4 100755 --- a/build-debug-gcc-prof +++ b/build-debug-gcc-prof @@ -9,11 +9,6 @@ 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 index 47202f1463..803ee99a97 100755 --- a/build-debug-sdl2 +++ b/build-debug-sdl2 @@ -10,11 +10,6 @@ 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