encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libtool upgrade to 2.4.6 - 17/n: SDL customizations 

fixes Windows linkage and the DLL name convention.
This commit is contained in:
Ozkan Sezer 2021-12-01 01:55:32 +03:00
parent 6a5aeaf948
commit 5ae2f0fd19
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
acinclude/libtool.m4 vendored
View File

@ -2553,13 +2553,15 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in case $host_os in
cygwin*) cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib' # Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' #soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
soname_spec='`echo $libname | sed -e 's/^lib//'`$shared_ext' # SDL customization
m4_if([$1], [],[ m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;; ;;
mingw* | cegcc*) mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix # MinGW DLLs use traditional 'lib' prefix
soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' #soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
soname_spec='`echo $libname | $SED -e 's/^lib//'`$shared_ext' # SDL customization
;; ;;
pw32*) pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib' # pw32 DLLs use 'pw' prefix rather than 'lib'
@ -3469,6 +3471,7 @@ cygwin*)
# func_win32_libid is a shell function defined in ltmain.sh # func_win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid' lt_cv_file_magic_cmd='func_win32_libid'
lt_cv_deplibs_check_method=pass_all # SDL customization
;; ;;
mingw* | pw32*) mingw* | pw32*)
@ -3483,6 +3486,7 @@ mingw* | pw32*)
lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f' lt_cv_file_magic_cmd='$OBJDUMP -f'
fi fi
lt_cv_deplibs_check_method=pass_all # SDL customization
;; ;;
cegcc*) cegcc*)

6
build-scripts/ltmain.sh
View File

@ -6500,14 +6500,16 @@ func_mode_link ()
# we shouldn't force the makefile maintainer to figure out # we shouldn't force the makefile maintainer to figure out
# what system we are compiling for in order to pass an extra # what system we are compiling for in order to pass an extra
# flag for every libtool invocation. # flag for every libtool invocation.
# allow_undefined=no # SDL customization: SDL code doesn't have any undefined symbols
allow_undefined=no
# FIXME: Unfortunately, there are problems with the above when trying # FIXME: Unfortunately, there are problems with the above when trying
# to make a dll that has undefined symbols, in which case not # to make a dll that has undefined symbols, in which case not
# even a static library is built. For now, we need to specify # even a static library is built. For now, we need to specify
# -no-undefined on the libtool link line when we can be certain # -no-undefined on the libtool link line when we can be certain
# that all symbols are satisfied, otherwise we get a static library. # that all symbols are satisfied, otherwise we get a static library.
allow_undefined=yes # SDL customization: SDL code doesn't have any undefined symbols
# allow_undefined=yes
;; ;;
*) *)
allow_undefined=yes allow_undefined=yes