From a2fa9721102497bb6caacefc59ba3ef427944130 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sat, 6 Jul 2019 21:47:32 +0200 Subject: [PATCH] Fixed build paths for windows --- client | 2 +- cmake/FindTomCrypt.cmake | 4 ++-- cmake/FindTomMath.cmake | 2 +- cmake/Findfvad.cmake | 2 +- shared | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client b/client index 26457e4..005c67b 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 26457e40bf1b1acf8385ec32604bae51ebececfa +Subproject commit 005c67bb5150fb5567e2ac58170c93eda9a2d4fa diff --git a/cmake/FindTomCrypt.cmake b/cmake/FindTomCrypt.cmake index bc90142..6bde4c8 100644 --- a/cmake/FindTomCrypt.cmake +++ b/cmake/FindTomCrypt.cmake @@ -32,12 +32,12 @@ find_path(TomCrypt_INCLUDE_DIR ) find_library(TomCrypt_LIBRARIES_STATIC - NAMES libtomcrypt.lib libtomcrypt.a + NAMES tomcrypt.lib libtomcrypt.lib libtomcrypt.a HINTS ${TomCrypt_ROOT_DIR} ${TomCrypt_ROOT_DIR}/lib ) find_library(TomCrypt_LIBRARIES_SHARED - NAMES libtomcrypt.dll libtomcrypt.so + NAMES tomcrypt.dll libtomcrypt.dll libtomcrypt.so HINTS ${TomCrypt_ROOT_DIR} ${TomCrypt_ROOT_DIR}/lib ) diff --git a/cmake/FindTomMath.cmake b/cmake/FindTomMath.cmake index 0224f7a..c3c4ecd 100644 --- a/cmake/FindTomMath.cmake +++ b/cmake/FindTomMath.cmake @@ -27,7 +27,7 @@ find_path(TomMath_INCLUDE_DIR ) find_library(TomMath_LIBRARIES_STATIC - NAMES tommath.lib tommath.a libtommath.a libtommathStatic.a + NAMES tommathStatic.lib tommath.lib tommath.a libtommath.a libtommathStatic.a HINTS ${TomMath_ROOT_DIR} ${TomMath_ROOT_DIR}/${BUILD_OUTPUT} ${TomMath_ROOT_DIR}/lib ) diff --git a/cmake/Findfvad.cmake b/cmake/Findfvad.cmake index b156d13..13378bf 100644 --- a/cmake/Findfvad.cmake +++ b/cmake/Findfvad.cmake @@ -32,7 +32,7 @@ find_path(fvad_INCLUDE_DIR ) find_library(fvad_LIBRARIES_STATIC - NAMES libfvad.a libfvad.lib + NAMES fvad.lib libfvad.a libfvad.lib HINTS ${fvad_ROOT_DIR} ${fvad_ROOT_DIR}/lib ) diff --git a/shared b/shared index 0bb0eb5..c7a547d 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 0bb0eb5df1d9e35a53d7ff050a84fb9c25764403 +Subproject commit c7a547da12f326b2578f801f3a65a5ead4d50b28