From 25441cb6508192345d3a25d6315b71562c6e25aa Mon Sep 17 00:00:00 2001 From: R4SAS Date: Fri, 14 Dec 2018 21:44:38 +0300 Subject: [PATCH] revert mingw makefile ref: https://github.com/Alexpux/MINGW-packages/issues/4773 --- Makefile.mingw | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/Makefile.mingw b/Makefile.mingw index 24b345ae..e2f9e857 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -8,16 +8,6 @@ LDFLAGS := ${LD_DEBUG} -Wl,-Bstatic -static-libgcc -static-libstdc++ # Boost libraries suffix BOOST_SUFFIX = -mt -BOOST_ARCHSUFFIX = ${BOOST_SUFFIX} - -# Since Boost 1.69.0, libraries in mingw use suffix with architecture in x32/x64 view -ifneq (, $(findstring x86_64, $(SYS))$(findstring 1.69.0, $(shell pacman -Q mingw-w64-x86_64-boost))) - BOOST_ARCHSUFFIX = ${BOOST_SUFFIX}-x64 -else ifneq (, $(findstring i686, $(SYS))$(findstring 1.69.0, $(shell pacman -Q mingw-w64-i686-boost))) - BOOST_ARCHSUFFIX = ${BOOST_SUFFIX}-x32 -else - $(error Not supported platform) -endif # UPNP Support ifeq ($(USE_UPNP),yes) @@ -26,10 +16,10 @@ ifeq ($(USE_UPNP),yes) endif LDLIBS += \ - -lboost_system$(BOOST_ARCHSUFFIX) \ - -lboost_date_time$(BOOST_ARCHSUFFIX) \ - -lboost_filesystem$(BOOST_ARCHSUFFIX) \ - -lboost_program_options$(BOOST_ARCHSUFFIX) \ + -lboost_system$(BOOST_SUFFIX) \ + -lboost_date_time$(BOOST_SUFFIX) \ + -lboost_filesystem$(BOOST_SUFFIX) \ + -lboost_program_options$(BOOST_SUFFIX) \ -lssl \ -lcrypto \ -lz \