Merge branch 'namecoinq' into rawtx-nameupdate

namecoin · Apr 24, 2014 · f18e37f · f18e37f
2 parents cce8bf1 + 0b6c554
commit f18e37f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/contrib/easywinbuilder/set_vars.bat b/contrib/easywinbuilder/set_vars.bat
@@ -4,7 +4,7 @@
 @set LANG=en_US.UTF8
 @set LC_ALL=en_US.UTF8
 
-@set OPENSSL=openssl-1.0.1e
+@set OPENSSL=openssl-1.0.1g
 @set BERKELEYDB=db-4.8.30.NC
 @set BOOST=boost_1_54_0
 @set BOOSTVERSION=1.54.0
@@ -32,4 +32,4 @@
 @rem the following will be set as additional CXXFLAGS and CFLAGS for everything - no ' or ", space is ok
 @set ADDITIONALCCFLAGS=-fno-guess-branch-probability -frandom-seed=1984 -Wno-unused-variable -Wno-unused-value -Wno-sign-compare -Wno-strict-aliasing
 
-@rem Note: Variables set here can NOT be overwritten in makefiles
+@rem Note: Variables set here can NOT be overwritten in makefiles
diff --git a/src/Makefile b/src/Makefile
@@ -9,12 +9,12 @@ MINGW=$(shell uname -s|grep -i mingw32)
 DEFS += -DBOOST_THREAD_USE_LIB
 
 INCLUDEPATHS= \
-	-I../libs/openssl-1.0.1e/include \
+	-I../libs/openssl-1.0.1g/include \
 	-I../libs/db-4.7.25.NC/build_unix \
 	-I../libs/boost_1_50_0
 
 LIBPATHS= \
-	-L../libs/openssl-1.0.1e \
+	-L../libs/openssl-1.0.1g \
 	-L../libs/db-4.7.25.NC/build_unix \
 	-L../libs/boost_1_50_0/stage/lib
 

diff --git a/src/makefile.mingw b/src/makefile.mingw
@@ -9,12 +9,12 @@ MINGW=$(shell uname -s|grep -i mingw32)
 DEFS += -DBOOST_THREAD_USE_LIB
 
 INCLUDEPATHS?= \
-	-I../libs/openssl-1.0.1e/include \
+	-I../libs/openssl-1.0.1g/include \
 	-I../libs/db-4.7.25.NC/build_unix \
 	-I../libs/boost_1_50_0
 
 LIBPATHS?= \
-	-L../libs/openssl-1.0.1e \
+	-L../libs/openssl-1.0.1g \
 	-L../libs/db-4.7.25.NC/build_unix \
 	-L../libs/boost_1_50_0/stage/lib