walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added SF_UNHARDEN option for Windows builds. 

The linker supplied by MXE currently doesn't support the -x option, so this
adds a way to skip that and uses that in win32build.sh.
This commit is contained in:
Layla Marchant 2020-12-26 18:05:10 -05:00
parent bc3513e5d9
commit 7e8ec72933
No known key found for this signature in database
GPG Key ID: 52FB5C20A8336782
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -18,7 +18,6 @@ AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
STARFIGHTER_CPPFLAGS="-DVERSION=\\\"$PACKAGE_VERSION\\\"" STARFIGHTER_CPPFLAGS="-DVERSION=\\\"$PACKAGE_VERSION\\\""
STARFIGHTER_LDADD="-Wl,-z,now"
# Detect MacOS # Detect MacOS
AC_CANONICAL_HOST AC_CANONICAL_HOST
@ -59,6 +58,7 @@ PKG_CHECK_MODULES([PANGO], [pango], [
]) ])
AC_ARG_VAR([SF_WARN], [Set to 1 to enable compiler warnings]) AC_ARG_VAR([SF_WARN], [Set to 1 to enable compiler warnings])
AC_ARG_VAR([SF_UNHARDEN], [Set to 1 to disable hardening flags (for compatibility)])
AC_ARG_VAR([SF_SCREEN_WIDTH], [The width of the game window in pixels]) AC_ARG_VAR([SF_SCREEN_WIDTH], [The width of the game window in pixels])
AC_ARG_VAR([SF_SCREEN_HEIGHT], [The height of the game window in pixels]) AC_ARG_VAR([SF_SCREEN_HEIGHT], [The height of the game window in pixels])
AC_ARG_VAR([SF_NOFONT], [Set to 1 to manually force the compiler not to include font/Unicode support]) AC_ARG_VAR([SF_NOFONT], [Set to 1 to manually force the compiler not to include font/Unicode support])
@ -67,6 +67,11 @@ AC_ARG_VAR([SF_RUN_IN_PLACE], [Set to 1 to compile Starfighter to run in-place (
AS_IF([test -n "$SF_WARN"], [ AS_IF([test -n "$SF_WARN"], [
STARFIGHTER_CPPFLAGS="$STARFIGHTER_CPPFLAGS -Wall -Wformat-truncation=0" STARFIGHTER_CPPFLAGS="$STARFIGHTER_CPPFLAGS -Wall -Wformat-truncation=0"
]) ])
AS_IF([test -n "$SF_UNHARDEN"], [
echo "Building without hardening flags"
], [
STARFIGHTER_LDADD="-Wl,-z,now"
])
AS_IF([test -n "$SF_SCREEN_WIDTH"], [ AS_IF([test -n "$SF_SCREEN_WIDTH"], [
STARFIGHTER_CPPFLAGS="$STARFIGHTER_CPPFLAGS -DSCREEN_WIDTH=$SF_SCREEN_WIDTH" STARFIGHTER_CPPFLAGS="$STARFIGHTER_CPPFLAGS -DSCREEN_WIDTH=$SF_SCREEN_WIDTH"
echo "Using default screen width of $SF_SCREEN_WIDTH" echo "Using default screen width of $SF_SCREEN_WIDTH"

2
win32build.sh
View File

@ -7,6 +7,6 @@
# Helper script to cross-compile for Windows with MXE. # Helper script to cross-compile for Windows with MXE.
# Note: Before running, be sure to add the MXE usr/bin location to PATH. # Note: Before running, be sure to add the MXE usr/bin location to PATH.
./configure --host=i686-w64-mingw32.static SF_RUN_IN_PLACE=1 SF_NOWARN=1 ./configure --host=i686-w64-mingw32.static SF_RUN_IN_PLACE=1 SF_UNHARDEN=1
make make
mv src/starfighter.exe . mv src/starfighter.exe .