|
|
|
@ -2878,7 +2878,7 @@ case $target_os in |
|
|
|
|
fi |
|
|
|
|
LIBTARGET=i386 |
|
|
|
|
if enabled x86_64; then |
|
|
|
|
LIBTARGET=x64 |
|
|
|
|
LIBTARGET="i386:x86-64" |
|
|
|
|
elif enabled arm; then |
|
|
|
|
LIBTARGET=arm-wince |
|
|
|
|
fi |
|
|
|
@ -2887,7 +2887,15 @@ case $target_os in |
|
|
|
|
SLIBSUF=".dll" |
|
|
|
|
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' |
|
|
|
|
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)' |
|
|
|
|
SLIB_EXTRA_CMD='-lib.exe /machine:$(LIBTARGET) /def:$$(@:$(SLIBSUF)=.def) /out:$(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib)' |
|
|
|
|
dlltool="${cross_prefix}dlltool" |
|
|
|
|
if check_cmd lib.exe; then |
|
|
|
|
SLIB_EXTRA_CMD='-lib.exe /machine:$(LIBTARGET) /def:$$(@:$(SLIBSUF)=.def) /out:$(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib)' |
|
|
|
|
if enabled x86_64; then |
|
|
|
|
LIBTARGET=x64 |
|
|
|
|
fi |
|
|
|
|
elif check_cmd $dlltool --version; then |
|
|
|
|
SLIB_EXTRA_CMD=-'$(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) -D $(SLIBNAME_WITH_MAJOR)' |
|
|
|
|
fi |
|
|
|
|
SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)' |
|
|
|
|
SLIB_INSTALL_LINKS= |
|
|
|
|
SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)' |
|
|
|
@ -3891,6 +3899,7 @@ DEPCC=$dep_cc |
|
|
|
|
DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS) |
|
|
|
|
DEPAS=$as |
|
|
|
|
DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS) |
|
|
|
|
DLLTOOL=$dlltool |
|
|
|
|
YASM=$yasmexe |
|
|
|
|
DEPYASM=$yasmexe |
|
|
|
|
AR=$ar |
|
|
|
|