Can't get cryptopp to work in MSVC; switch to OpenSSL

wesnoth · May 1, 2017 · 3968e51 · 3968e51
1 parent 56e3ed6
commit 3968e51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/SConstruct b/SConstruct
@@ -382,7 +382,7 @@ if env["prereqs"]:
     have_client_prereqs = have_server_prereqs & have_sdl_other() & \
         (('TRAVIS' in os.environ and os.environ["TRAVIS_OS_NAME"] == "osx") or (conf.CheckLib("vorbisfile") & \
         conf.CheckOgg())) & \
-		conf.CheckLib("cryptopp") & \
+		conf.CheckLib("openssl") & \
         conf.CheckPNG() & \
         conf.CheckJPG() & \
         conf.CheckPango("cairo", require_version = "1.21.3") & \

diff --git a/utils/travis/install_deps.sh b/utils/travis/install_deps.sh
@@ -5,7 +5,7 @@ set -ev
 if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
 
 	brew update
-	brew install scons cairo pango moreutils sdl2_image sdl2_ttf sdl2_mixer cryptopp
+	brew install scons cairo pango moreutils sdl2_image sdl2_ttf sdl2_mixer
 
 else
 
@@ -17,7 +17,7 @@ else
 	sudo apt-get install -qq libboost-filesystem-dev libboost-iostreams-dev libboost-random-dev libboost-program-options-dev libboost-regex-dev libboost-system-dev libboost-test-dev libboost-locale-dev libboost-thread-dev
 	sudo apt-get install -qq libcairo2-dev libfribidi-dev libpango1.0-dev
 	sudo apt-get install -qq libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libvorbis-dev
-	sudo apt-get install gdb moreutils xvfb libcrypto++-dev
+	sudo apt-get install gdb moreutils xvfb libssl-dev
 
 	if [ "$USE_CMAKE" = true  ]; then
 		sudo apt-get install -qq cmake;