pidgin/android/libpurple

win32: Use the libssp-0.dll from the gcc bin directory instead of based on a separate dependency.
release-2.x.y
2013-02-18, Daniel Atallah
910bab8c9dac
Parents 81c1f235dce6
Children 49eb0136f2ec
win32: Use the libssp-0.dll from the gcc bin directory instead of based on a separate dependency.

* Fixes #15521
2 files changed, 2 insertions(+), 2 deletions(-)
  • +1 -1
    Makefile.mingw
  • +1 -1
    libpurple/win32/global.mak
    • --- a/Makefile.mingw Mon Feb 18 18:24:08 2013 -0500
    +++ b/Makefile.mingw Mon Feb 18 22:10:12 2013 -0500
    @@ -109,7 +109,7 @@
    cp $(ENCHANT_TOP)/bin/libenchant.dll $(PIDGIN_INSTALL_DIR)/spellcheck
    cp -R $(ENCHANT_TOP)/lib/enchant/*.dll $(PIDGIN_INSTALL_DIR)/spellcheck/lib/enchant
    cp $(PIDGIN_INST_DEP_DIR)/exchndl.dll $(PIDGIN_INSTALL_DIR)
    - cp $(GCC_SSP_TOP)/bin/libssp-0.dll $(PIDGIN_INSTALL_DIR)
    + cp $(GCC_SSP_TOP)/libssp-0.dll $(PIDGIN_INSTALL_DIR)
    gtk_runtime_zip:
    pidgin/win32/nsis/generate_gtk_zip.sh "`pwd`" "$(GPG_SIGN)"
    --- a/libpurple/win32/global.mak Mon Feb 18 18:24:08 2013 -0500
    +++ b/libpurple/win32/global.mak Mon Feb 18 22:10:12 2013 -0500
    @@ -22,7 +22,7 @@
    SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.10
    TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5
    GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13
    -GCC_SSP_TOP ?= $(WIN32_DEV_TOP)/gcc-core-4.4.0-mingw32-dll
    +GCC_SSP_TOP ?= $(shell dirname $(shell which $(CC)))
    CYRUS_SASL_TOP ?= $(WIN32_DEV_TOP)/cyrus-sasl-2.1.25
    # Where we installing this stuff to?