OpenSSL 1.0.1i; cleanup obsolete build info

indolering · Aug 12, 2014 · 0470611 · 0470611
1 parent d02ec9f
commit 0470611
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 119 deletions.
diff --git a/contrib/easywinbuilder/set_vars.bat b/contrib/easywinbuilder/set_vars.bat
@@ -12,7 +12,7 @@
 @set QTDOWNLOADPATH=http://download.qt-project.org/official_releases/qt/5.3/5.3.0/qt-opensource-windows-x86-mingw482_opengl-5.3.0.exe
 
 @rem Library Paths
-@set OPENSSL=openssl-1.0.1h
+@set OPENSSL=openssl-1.0.1i
 @set BERKELEYDB=db-4.8.30.NC
 @set BOOST=boost_1_54_0
 @set BOOSTVERSION=1.54.0

diff --git a/doc/build-msw.txt b/doc/build-msw.txt
diff --git a/libs/readme.txt b/libs/readme.txt
@@ -5,10 +5,3 @@ Put libraries here, namely:
  Berkeley DB
  MiniUPnPc
 
-
-Alternatively, provide paths to these libraries when running qmake. An example for Windows is shown in project\run_qmake.bat, which uses the following directories:
-
- boost_1_50_0
- openssl-1.0.1h
- db-4.7.25.NC
- miniupnpc-1.8.20130211
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.1h/include \
+	-I../libs/openssl-1.0.1i/include \
 	-I../libs/db-4.7.25.NC/build_unix \
 	-I../libs/boost_1_50_0
 
 LIBPATHS= \
-	-L../libs/openssl-1.0.1h \
+	-L../libs/openssl-1.0.1i \
 	-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.1h/include \
+	-I../libs/openssl-1.0.1i/include \
 	-I../libs/db-4.7.25.NC/build_unix \
 	-I../libs/boost_1_50_0
 
 LIBPATHS?= \
-	-L../libs/openssl-1.0.1h \
+	-L../libs/openssl-1.0.1i \
 	-L../libs/db-4.7.25.NC/build_unix \
 	-L../libs/boost_1_50_0/stage/lib