diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-16 13:12:59 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-16 13:12:59 -0300 |
| commit | edef07569ccc4e10151c676bfd440412c8592f31 (patch) | |
| tree | 4773f75bf68a2e3da31dedf30fcec96453093763 | |
| parent | 1146a7a363ab7169a7713d774571b63287508cc8 (diff) | |
| parent | bad7ce1d82f0b7da55086b8c6124eff0d35a1b1a (diff) | |
| download | ffmpeg-streaming-edef07569ccc4e10151c676bfd440412c8592f31.zip ffmpeg-streaming-edef07569ccc4e10151c676bfd440412c8592f31.tar.gz | |
Merge commit 'bad7ce1d82f0b7da55086b8c6124eff0d35a1b1a'
* commit 'bad7ce1d82f0b7da55086b8c6124eff0d35a1b1a':
makedef: Pass EXTERN_PREFIX from configure to makedef
Merged-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | compat/windows/makedef | 28 | ||||
| -rwxr-xr-x | configure | 5 |
2 files changed, 4 insertions, 29 deletions
diff --git a/compat/windows/makedef b/compat/windows/makedef index 0cd169c..7258b94 100755 --- a/compat/windows/makedef +++ b/compat/windows/makedef @@ -58,33 +58,7 @@ fi IFS=' ' -# Determine if we're building for x86 or x86_64 and -# set the symbol prefix accordingly. -prefix="" -if [ -n "$NM" ]; then - case $ARCH in - *86) - prefix="_" - ;; - *) - ;; - esac -else - arch=$(dumpbin -headers ${libname} | - tr '\t' ' ' | - grep '^ \+.\+machine \+(.\+)' | - head -1 | - sed -e 's/^ \{1,\}.\{1,\} \{1,\}machine \{1,\}(\(.\{3,5\}\)).*/\1/') - - if [ "${arch}" = "x86" ]; then - prefix="_" - else - if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ] && [ "${arch}" != "ARM64" ]; then - echo "Unknown machine type." >&2 - exit 1 - fi - fi -fi +prefix="$EXTERN_PREFIX" started=0 regex="none" @@ -4964,7 +4964,7 @@ case $target_os in SLIB_INSTALL_LINKS= SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)' SLIB_INSTALL_EXTRA_LIB='lib$(SLIBNAME:$(SLIBSUF)=.dll.a) $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)' - SLIB_CREATE_DEF_CMD='ARCH="$(ARCH)" AR="$(AR_CMD)" NM="$(NM_CMD)" $(SRC_PATH)/compat/windows/makedef $(SUBDIR)lib$(NAME).ver $(OBJS) > $$(@:$(SLIBSUF)=.def)' + SLIB_CREATE_DEF_CMD='EXTERN_PREFIX="$(EXTERN_PREFIX)" AR="$(AR_CMD)" NM="$(NM_CMD)" $(SRC_PATH)/compat/windows/makedef $(SUBDIR)lib$(NAME).ver $(OBJS) > $$(@:$(SLIBSUF)=.def)' SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) -Wl,--disable-auto-image-base $$(@:$(SLIBSUF)=.def)' enabled x86_64 && objformat="win64" || objformat="win32" ranlib=: @@ -5000,7 +5000,7 @@ case $target_os in SLIBSUF=".dll" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)' - SLIB_CREATE_DEF_CMD='$(SRC_PATH)/compat/windows/makedef $(SUBDIR)lib$(NAME).ver $(OBJS) > $$(@:$(SLIBSUF)=.def)' + SLIB_CREATE_DEF_CMD='EXTERN_PREFIX="$(EXTERN_PREFIX)" $(SRC_PATH)/compat/windows/makedef $(SUBDIR)lib$(NAME).ver $(OBJS) > $$(@:$(SLIBSUF)=.def)' SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)' SLIB_INSTALL_LINKS= SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)' @@ -6771,6 +6771,7 @@ endif CC_IDENT=$cc_ident ARCH=$arch INTRINSICS=$intrinsics +EXTERN_PREFIX=$extern_prefix CC=$cc CXX=$cxx AS=$as |
