Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Aug 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions build-debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions build-debug-g3
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 5 additions & 0 deletions build-debug-g3-sdl2
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 5 additions & 0 deletions build-debug-gcc-prof
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 5 additions & 0 deletions build-debug-sdl2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down