actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use standard tomcrypt header

Browse Source
This commit is contained in:
Martin Kröning
2020-06-21 22:55:00 +02:00
committed by Martin Kröning
parent 1aaebaa712
commit 43ecbf918b
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+1 -2
View File
@@ -56,7 +56,6 @@ jobs:
ninja-build ninja-build
- name: Configure - name: Configure
# TODO: png: https://github.com/stepmania/stepmania/issues/1881 # TODO: png: https://github.com/stepmania/stepmania/issues/1881
# TODO: tomcrypt: https://github.com/stepmania/stepmania/issues/1885
run: cmake -G Ninja -B build run: cmake -G Ninja -B build
-DWITH_SYSTEM_FFMPEG=ON -DWITH_SYSTEM_FFMPEG=ON
-DWITH_SYSTEM_GLEW=ON -DWITH_SYSTEM_GLEW=ON
@@ -66,7 +65,7 @@ jobs:
-DWITH_SYSTEM_OGG=ON -DWITH_SYSTEM_OGG=ON
-DWITH_SYSTEM_PCRE=ON -DWITH_SYSTEM_PCRE=ON
-DWITH_SYSTEM_PNG=OFF -DWITH_SYSTEM_PNG=OFF
-DWITH_SYSTEM_TOMCRYPT=OFF -DWITH_SYSTEM_TOMCRYPT=ON
-DWITH_SYSTEM_TOMMATH=ON -DWITH_SYSTEM_TOMMATH=ON
-DWITH_SYSTEM_ZLIB=ON -DWITH_SYSTEM_ZLIB=ON
- name: Build - name: Build
src/CMakeLists.txt
+3
View File
@@ -681,6 +681,9 @@ elseif(NOT WITH_SYSTEM_PNG)
list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/libpng/include") list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/libpng/include")
endif() 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}) target_include_directories("${SM_EXE_NAME}" PUBLIC ${SM_INCLUDE_DIRS})
src/CryptHelpers.h
+1 -1
View File
@@ -3,7 +3,7 @@
#if !defined(DISABLE_CRYPTO) #if !defined(DISABLE_CRYPTO)
#include "libtomcrypt/src/headers/tomcrypt.h" #include <tomcrypt.h>
class PRNGWrapper class PRNGWrapper
{ {
src/CryptManager.cpp
+3 -2
View File
@@ -1,4 +1,7 @@
#include "global.h" #include "global.h"
#include <tomcrypt.h>
#include "CryptManager.h" #include "CryptManager.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageLog.h" #include "RageLog.h"
@@ -9,8 +12,6 @@
#include "LuaReference.h" #include "LuaReference.h"
#include "LuaManager.h" #include "LuaManager.h"
#include "libtomcrypt/src/headers/tomcrypt.h"
CryptManager* CRYPTMAN = nullptr; // global and accessible from anywhere in our program CryptManager* CRYPTMAN = nullptr; // global and accessible from anywhere in our program
static const RString PRIVATE_KEY_PATH = "Data/private.rsa"; static const RString PRIVATE_KEY_PATH = "Data/private.rsa";