ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qb: Don't overwrite defaults 

Haiku really should use the configure flags provided, that is why they exists.

In this case.

./configure \
  --global-config-dir=$PREFIX/settings
  --with-assets_dir=$PREFIX/data
  --with-mand_dir=$PREFIX/documentation/man

Changing the defaults just makes the script more complicated for no good reason.
This commit is contained in:
orbea 2018-01-20 09:26:57 -08:00
parent 6ce57ffe18
commit cc26f4a88c
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qb/config.libs.sh
View File

@ -10,15 +10,10 @@ add_define MAKEFILE NOUNUSED_VARIABLE "$HAVE_NOUNUSED_VARIABLE"
[ -z "$CROSS_COMPILE" ] && [ -d /opt/local/lib ] && add_dirs LIBRARY /opt/local/lib [ -z "$CROSS_COMPILE" ] && [ -d /opt/local/lib ] && add_dirs LIBRARY /opt/local/lib
[ "$GLOBAL_CONFIG_DIR" ] || \ [ "$GLOBAL_CONFIG_DIR" ] || \
{ { case "$PREFIX" in
if [ "$OS" = 'Haiku' ]; then /usr*) GLOBAL_CONFIG_DIR=/etc ;;
GLOBAL_CONFIG_DIR="$PREFIX"/settings *) GLOBAL_CONFIG_DIR="$PREFIX"/etc ;;
else esac
case "$PREFIX" in
/usr*) GLOBAL_CONFIG_DIR=/etc ;;
*) GLOBAL_CONFIG_DIR="$PREFIX"/etc ;;
esac
fi
} }
DYLIB=-ldl; DYLIB=-ldl;
@ -162,16 +157,9 @@ fi
add_define MAKEFILE libretro "$LIBRETRO" add_define MAKEFILE libretro "$LIBRETRO"
} }
if [ "$OS" = 'Haiku' ]; then
add_define MAKEFILE ASSETS_DIR "${ASSETS_DIR:-${PREFIX}/data}"
add_define MAKEFILE MAN_DIR "${MAN_DIR:-${PREFIX}/documentation/man}"
else
add_define MAKEFILE ASSETS_DIR "${ASSETS_DIR:-${PREFIX}/share}" add_define MAKEFILE ASSETS_DIR "${ASSETS_DIR:-${PREFIX}/share}"
add_define MAKEFILE MAN_DIR "${MAN_DIR:-${PREFIX}/share/man}"
fi
add_define MAKEFILE BIN_DIR "${BIN_DIR:-${PREFIX}/bin}" add_define MAKEFILE BIN_DIR "${BIN_DIR:-${PREFIX}/bin}"
add_define MAKEFILE MAN_DIR "${MAN_DIR:-${PREFIX}/share/man}"
if [ "$OS" = 'DOS' ]; then if [ "$OS" = 'DOS' ]; then
HAVE_SHADERPIPELINE=no HAVE_SHADERPIPELINE=no

6
qb/qb.libs.sh
View File

@ -1,11 +1,7 @@
MAKEFILE_DEFINES='' MAKEFILE_DEFINES=''
CONFIG_DEFINES='' CONFIG_DEFINES=''
if [ "$OS" = 'Haiku' ]; then [ "$PREFIX" ] || PREFIX="/usr/local"
[ "$PREFIX" ] || PREFIX="/boot/home/config/non-packaged"
else
[ "$PREFIX" ] || PREFIX="/usr/local"
fi
add_define() # $1 = MAKEFILE or CONFIG $2 = define $3 = value add_define() # $1 = MAKEFILE or CONFIG $2 = define $3 = value
{ eval "${1}_DEFINES=\"\${${1}_DEFINES} $2=$3\""; } { eval "${1}_DEFINES=\"\${${1}_DEFINES} $2=$3\""; }