Merge commit 'b49e0953b14be38cdeada86df84a59c92e38aeff' into main
commit
00f93e4082
|
@ -25556,31 +25556,6 @@ $as_echo "#define SDL_FILESYSTEM_HAIKU 1" >>confdefs.h
|
||||||
# The Haiku platform requires special setup.
|
# The Haiku platform requires special setup.
|
||||||
SOURCES="$srcdir/src/main/haiku/*.cc $SOURCES"
|
SOURCES="$srcdir/src/main/haiku/*.cc $SOURCES"
|
||||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding"
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding"
|
||||||
# Haiku's x86 spins use libstdc++.r4.so (for binary compat?), but
|
|
||||||
# other spins, like x86-64, use a more standard "libstdc++.so.*"
|
|
||||||
as_ac_File=`$as_echo "ac_cv_file_"/boot/system/lib/libstdc++.r4.so"" | $as_tr_sh`
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"/boot/system/lib/libstdc++.r4.so\"" >&5
|
|
||||||
$as_echo_n "checking for \"/boot/system/lib/libstdc++.r4.so\"... " >&6; }
|
|
||||||
if eval \${$as_ac_File+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
test "$cross_compiling" = yes &&
|
|
||||||
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
|
|
||||||
if test -r ""/boot/system/lib/libstdc++.r4.so""; then
|
|
||||||
eval "$as_ac_File=yes"
|
|
||||||
else
|
|
||||||
eval "$as_ac_File=no"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
eval ac_res=\$$as_ac_File
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
||||||
$as_echo "$ac_res" >&6; }
|
|
||||||
if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
|
|
||||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lstdc++.r4"
|
|
||||||
else
|
|
||||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lstdc++"
|
|
||||||
fi
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
*-ios-*)
|
*-ios-*)
|
||||||
ARCH=ios
|
ARCH=ios
|
||||||
|
|
Loading…
Reference in New Issue