joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 10:48:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed Linux build to use 16-bit wide chars, to fix issue #5132

Browse Source
This commit is contained in:
Martin Juhl
2024-07-30 13:10:35 +02:00
parent 33f903355a
commit 37268a7517
6 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build
View File

@@ -9,6 +9,11 @@ if [ "$1" == "32" ]; then
opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu" opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu"
fi 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 # Jonathan C dev hack: refer to LNKDOS16 in /usr/src/doslib
doslib="" doslib=""
if [ -d /usr/src/doslib ]; then doslib="/usr/src/doslib"; fi if [ -d /usr/src/doslib ]; then doslib="/usr/src/doslib"; fi

5
build-debug
View File

@@ -9,6 +9,11 @@ if [ "$1" == "32" ]; then
opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu" opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu"
fi 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 # Jonathan C dev hack: refer to LNKDOS16 in /usr/src/doslib
doslib= doslib=
if [ -d /usr/src/doslib ]; then doslib="/usr/src/doslib"; fi if [ -d /usr/src/doslib ]; then doslib="/usr/src/doslib"; fi

5
build-debug-g3
View File

@@ -8,6 +8,11 @@ if [ "${1}" == "32" ]; then
shift shift
fi 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 # I'm sick and tired of all the churn the three versions of autoconf
# are causing in this repo. Stop committing the configure scripts # are causing in this repo. Stop committing the configure scripts
# and just autoregen. # and just autoregen.

5
build-debug-g3-sdl2
View File

@@ -8,6 +8,11 @@ if [ "${1}" == "32" ]; then
shift shift
fi 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 # I'm sick and tired of all the churn the three versions of autoconf
# are causing in this repo. Stop committing the configure scripts # are causing in this repo. Stop committing the configure scripts
# and just autoregen. # and just autoregen.

5
build-debug-gcc-prof
View File

@@ -9,6 +9,11 @@ if [ "$1" == "32" ]; then
opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu" opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu"
fi 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 # I'm sick and tired of all the churn the three versions of autoconf
# are causing in this repo. Stop committing the configure scripts # are causing in this repo. Stop committing the configure scripts
# and just autoregen. # and just autoregen.

5
build-debug-sdl2
View File

@@ -10,6 +10,11 @@ if [ "$1" == "32" ]; then
opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu" opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu"
fi 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 # Jonathan C dev hack: refer to LNKDOS16 in /usr/src/doslib
doslib= doslib=
if [ -d /usr/src/doslib ]; then doslib="/usr/src/doslib"; fi if [ -d /usr/src/doslib ]; then doslib="/usr/src/doslib"; fi