Upgrade dependancies and tweak build process.
* Upgrade to use miniupnpc 1.6 * Upgrade to wxWidgets 2.9.2 * Upgrade to Bost 1.47 for Win32 Builds
This commit is contained in:
@@ -7,19 +7,19 @@ DEPSDIR:=/usr/i586-mingw32msvc
|
||||
USE_UPNP:=0
|
||||
|
||||
INCLUDEPATHS= \
|
||||
-I"$(DEPSDIR)/boost_1_43_0" \
|
||||
-I"$(DEPSDIR)/db-4.7.25.NC/build_unix" \
|
||||
-I"$(DEPSDIR)/boost_1_47_0" \
|
||||
-I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
|
||||
-I"$(DEPSDIR)/openssl-1.0.0d/include" \
|
||||
-I"$(DEPSDIR)/wxWidgets-2.9.1/lib/gcc_lib/mswud" \
|
||||
-I"$(DEPSDIR)/wxWidgets-2.9.1/include" \
|
||||
-I"$(DEPSDIR)/wxWidgets-2.9.1/lib/wx/include/i586-mingw32msvc-msw-unicode-static-2.9/" \
|
||||
-I"$(DEPSDIR)/wxWidgets-2.9.2/lib/gcc_lib/mswud" \
|
||||
-I"$(DEPSDIR)/wxWidgets-2.9.2/include" \
|
||||
-I"$(DEPSDIR)/wxWidgets-2.9.2/lib/wx/include/i586-mingw32msvc-msw-unicode-static-2.9/" \
|
||||
-I"$(DEPSDIR)"
|
||||
|
||||
LIBPATHS= \
|
||||
-L"$(DEPSDIR)/boost_1_43_0/stage/lib" \
|
||||
-L"$(DEPSDIR)/db-4.7.25.NC/build_unix" \
|
||||
-L"$(DEPSDIR)/boost_1_47_0/stage/lib" \
|
||||
-L"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
|
||||
-L"$(DEPSDIR)/openssl-1.0.0d" \
|
||||
-L"$(DEPSDIR)/wxWidgets-2.9.1/lib"
|
||||
-L"$(DEPSDIR)/wxWidgets-2.9.2/lib"
|
||||
|
||||
WXLIBS= -l wx_mswu-2.9-i586-mingw32msvc
|
||||
|
||||
@@ -32,7 +32,7 @@ LIBS= \
|
||||
-l ssl \
|
||||
-l crypto
|
||||
|
||||
DEFS=-D_MT -DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL
|
||||
DEFS=-D_MT -DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL -DBOOST_THREAD_USE_LIB
|
||||
DEBUGFLAGS=-g -D__WXDEBUG__
|
||||
CFLAGS=-O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
|
||||
HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
|
||||
@@ -40,8 +40,7 @@ HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h
|
||||
crypter.h init.h
|
||||
|
||||
ifdef USE_UPNP
|
||||
INCLUDEPATHS += -I"$(DEPSDIR)/upnpc-exe-win32-20110215"
|
||||
LIBPATHS += -L"$(DEPSDIR)/upnpc-exe-win32-20110215"
|
||||
LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
|
||||
LIBS += -l miniupnpc -l iphlpapi
|
||||
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user