Skip to content

Commit

Permalink
https://github.com/ImageMagick/ImageMagick6/pull/200/
Browse files Browse the repository at this point in the history
  • Loading branch information
Cristy committed Nov 5, 2022
1 parent 53ae953 commit 9f90498
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
8 changes: 3 additions & 5 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -5126,7 +5126,7 @@ MAGICK_PATCHLEVEL_VERSION=67

MAGICK_VERSION=6.9.12-67

MAGICK_GIT_REVISION=efcac589d:20221103
MAGICK_GIT_REVISION=53ae953ec:20221105


# Substitute library versioning
Expand Down Expand Up @@ -5160,7 +5160,7 @@ PACKAGE_LIB_VERSION=0x69C

PACKAGE_LIB_VERSION_NUMBER=6,9,12,67

PACKAGE_RELEASE_DATE=2022-11-03
PACKAGE_RELEASE_DATE=2022-11-05


# Ensure that make can run correctly
Expand Down Expand Up @@ -9799,9 +9799,6 @@ Please re-run configure with these options:
LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386"
fi
;;
mingw* )
LDFLAGS="$LDFLAGS -municode"
;;
esac

#
Expand Down Expand Up @@ -23627,6 +23624,7 @@ fi
MODULE_EXTRA_CPPFLAGS=''
LIBRARY_EXTRA_CPPFLAGS=''
if test "${native_win32_build}" = 'yes'; then
MAGICK_LDFLAGS="$MAGICK_LDFLAGS -municode"
if test "${libtool_build_shared_libs}" = 'yes'; then
CPPFLAGS="$CPPFLAGS -D_DLL"
MAGICK_CPPFLAGS="$MAGICK_CPPFLAGS -D_DLL"
Expand Down
4 changes: 1 addition & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,6 @@ Please re-run configure with these options:
LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386"
fi
;;
mingw* )
LDFLAGS="$LDFLAGS -municode"
;;
esac

#
Expand Down Expand Up @@ -901,6 +898,7 @@ AC_PROG_GCC_TRADITIONAL
MODULE_EXTRA_CPPFLAGS=''
LIBRARY_EXTRA_CPPFLAGS=''
if test "${native_win32_build}" = 'yes'; then
MAGICK_LDFLAGS="$MAGICK_LDFLAGS -municode"
if test "${libtool_build_shared_libs}" = 'yes'; then
CPPFLAGS="$CPPFLAGS -D_DLL"
MAGICK_CPPFLAGS="$MAGICK_CPPFLAGS -D_DLL"
Expand Down

0 comments on commit 9f90498

Please sign in to comment.