Merge pull request #1886 from mwkroening/tomcrypt-header

Use correct tomcrypt headers

.github/workflows/ci.yml

@@ -56,8 +56,6 @@ jobs:
           libxtst-dev
           ninja-build
       - name: Configure
-        # TODO: png: https://github.com/stepmania/stepmania/issues/1881
-        # TODO: tomcrypt: https://github.com/stepmania/stepmania/issues/1885
         run: cmake -G Ninja -B build
           -DWITH_SYSTEM_FFMPEG=ON
           -DWITH_SYSTEM_GLEW=ON
@@ -67,7 +65,7 @@ jobs:
           -DWITH_SYSTEM_OGG=ON
           -DWITH_SYSTEM_PCRE=ON
           -DWITH_SYSTEM_PNG=ON
-          -DWITH_SYSTEM_TOMCRYPT=OFF
+          -DWITH_SYSTEM_TOMCRYPT=ON
           -DWITH_SYSTEM_TOMMATH=ON
           -DWITH_SYSTEM_ZLIB=ON
       - name: Build

src/CMakeLists.txt

@@ -695,6 +695,9 @@ if(NOT WITH_SYSTEM_PNG)
   list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/libpng")
 endif()
 
+if(NOT WITH_SYSTEM_TOMCRYPT)
+  list(APPEND SM_INCLUDE_DIRS "${SM_SRC_DIR}/libtomcrypt/src/headers")
+endif()
 
 target_include_directories("${SM_EXE_NAME}" PUBLIC ${SM_INCLUDE_DIRS})
 

src/CryptHelpers.h

@@ -3,7 +3,7 @@
 
 #if !defined(DISABLE_CRYPTO)
 
-#include "libtomcrypt/src/headers/tomcrypt.h"
+#include <tomcrypt.h>
 
 class PRNGWrapper
 {

src/CryptManager.cpp

@@ -1,4 +1,7 @@
 #include "global.h"
+
+#include <tomcrypt.h>
+
 #include "CryptManager.h"
 #include "RageUtil.h"
 #include "RageLog.h"
@@ -9,8 +12,6 @@
 #include "LuaReference.h"
 #include "LuaManager.h"
 
-#include "libtomcrypt/src/headers/tomcrypt.h"
-
 CryptManager*	CRYPTMAN	= nullptr;	// global and accessible from anywhere in our program
 
 static const RString PRIVATE_KEY_PATH = "Data/private.rsa";