Release v3 updates

src/makefile.mingw

@@ -4,11 +4,6 @@
 
 # Makefile for the MinGW g++ compiler/toolchain
 #
-# Assumes Berkeley DB, Boost, and OpenSSL have all been compiled and installed
-# into /usr/local (/usr/local/include, /usr/local/lib).
-#
-# If dependencies are somewhere else, run 'make DEPSDIR=/path/'
-#
 # Boost libraries are given wacky names that include the particular version of
 # boost you're using; set BOOST_SUFFIX appropriately.
 #
@@ -20,38 +15,37 @@ CXX ?= g++
 USE_UPNP:=-
 USE_IPV6:=1
 
-DEPSDIR?=/usr/local
-BOOST_SUFFIX?=-mgw49-mt-s-1_55
+BOOST_SUFFIX?=-mt
 
 INCLUDEPATHS= \
  -I"$(CURDIR)" \
- -I"C:\deps\boost_1_55_0" \
- -I"C:\deps\db-4.8.30.NC\build_unix" \
- -I"C:\deps\openssl-1.0.2d\include" \
- -I"C:\deps\qrencode-3.4.3"
+ -I"C:/msys64/usr/src/deps32/boost_1_60_0" \
+ -I"C:/msys64/usr/src/deps32/db-4.8.30.NC/build_unix" \
+ -I"C:/msys64/usr/src/deps32/openssl-1.0.2g/include" \
+ -I"C:/msys64/usr/src/deps32/qrencode-3.4.4"
 
 LIBPATHS= \
  -L"$(CURDIR)/leveldb" \
- -L"C:\deps\boost_1_55_0\stage\lib" \
- -L"C:\deps\db-4.8.30.NC\build_unix" \
- -L"C:\deps\openssl-1.0.2d" \
- -L"C:\deps\qrencode-3.4.3\.libs"
+ -L"C:/msys64/usr/src/deps32/boost_1_60_0/stage/lib" \
+ -L"C:/msys64/usr/src/deps32/db-4.8.30.NC/build_unix" \
+ -L"C:/msys64/usr/src/deps32/openssl-1.0.2g" \
+ -L"C:/msys64/usr/src/deps32/qrencode-3.4.4/.libs"
 
 LIBS= \
- -l leveldb \
- -l memenv \
- -l boost_system$(BOOST_SUFFIX) \
- -l boost_filesystem$(BOOST_SUFFIX) \
- -l boost_program_options$(BOOST_SUFFIX) \
- -l boost_thread$(BOOST_SUFFIX) \
- -l boost_chrono$(BOOST_SUFFIX) \
- -l db_cxx \
- -l ssl \
- -l crypto
+ -lleveldb \
+ -lmemenv \
+ -lboost_system$(BOOST_SUFFIX) \
+ -lboost_filesystem$(BOOST_SUFFIX) \
+ -lboost_program_options$(BOOST_SUFFIX) \
+ -lboost_thread$(BOOST_SUFFIX) \
+ -lboost_chrono$(BOOST_SUFFIX) \
+ -ldb_cxx \
+ -lssl \
+ -lcrypto
 
 DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6 -D__NO_SYSTEM_INCLUDES
 DEBUGFLAGS=-g
-CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) -static
+CFLAGS=-mthreads -O2 -std=c++11 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) -static
 # enable: ASLR, DEP and large address aware
 LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware -static
 
@@ -69,7 +63,7 @@ ifneq (${USE_IPV6}, -)
 	DEFS += -DUSE_IPV6=$(USE_IPV6)
 endif
 
-LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi -l pthread
+LIBS += -lmingwthrd -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lws2_32 -lmswsock -lshlwapi -lpthread
 
 # TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are
 HEADERS = $(wildcard *.h)