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

SDL2: configure.ac modified to match only iOS for iOS, instead of assuming iOS if ARM and Darwin

Browse Source
This commit is contained in:
Jonathan Campbell
2020-11-27 15:28:41 -08:00
parent 143116a938
commit 3f7286e414
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vs2015/sdl2/configure vendored
View File

@@ -18283,7 +18283,7 @@ if ac_fn_c_try_link "$LINENO"; then :
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
else
echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means ESD was incorrectly installed"
echo "*** exact error that occurred. This usually means ESD was incorrectly installed"
echo "*** or that you have moved ESD since it was installed. In the latter case, you"
echo "*** may want to edit the esd-config script: $ESD_CONFIG"
fi
@@ -24520,7 +24520,9 @@ else
fi
;;
arm*-apple-darwin*|*-ios-*)
*-ios-*)
# NTS: DOSBox-X specific modification: This used to match ANY ARM-based Darwin, but the new ARM-based Macbooks are not iOS
# so the Darwin match here was deleted.
ARCH=ios
CheckVisibilityHidden
@@ -24809,7 +24811,7 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
;;
*)
as_fn_error $? "
*** Unsupported host: Please add to configure.in
*** Unsupported host: Please add to configure.ac
" "$LINENO" 5
;;
esac

4
vs2015/sdl2/configure.ac
View File

@@ -3764,7 +3764,9 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
# other spins, like x86-64, use a more standard "libstdc++.so.*"
AC_CHECK_FILE("/boot/system/lib/libstdc++.r4.so", EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lstdc++.r4", EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lstdc++")
;;
arm*-apple-darwin*|*-ios-*)
*-ios-*)
# NTS: DOSBox-X specific modification: This used to match ANY ARM-based Darwin, but the new ARM-based Macbooks are not iOS
# so the Darwin match here was deleted.
ARCH=ios
CheckVisibilityHidden

2
vs2015/sdl2/test/aclocal.m4 vendored
View File

@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occurred. This usually means SDL was incorrectly installed"
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
echo "*** may want to edit the sdl2-config script: $SDL_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"

2
vs2015/sdl2/test/configure vendored
View File

@@ -3437,7 +3437,7 @@ if ac_fn_c_try_link "$LINENO"; then :
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
else
echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occurred. This usually means SDL was incorrectly installed"
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
echo "*** may want to edit the sdl2-config script: $SDL_CONFIG"
fi