From 55170e6ba87d0e4102755f5fde3cf2981494b51a Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sun, 31 Jan 2016 19:50:17 +0100 Subject: [PATCH] correctly include tomsfastmath --- premake5.lua | 8 ++++++-- src/Components/Modules/Node.cpp | 2 +- src/STDInclude.hpp | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/premake5.lua b/premake5.lua index 2fe960ef..6984a323 100644 --- a/premake5.lua +++ b/premake5.lua @@ -100,7 +100,7 @@ workspace "iw4x" buildoptions { "-Zm200" } -- allocate ~150mb memory for the precompiled header. This should be enough, increase if necessary -- Dependency on zlib, json11 and asio - links { "zlib", "json11", "pdcurses", "libtomcrypt" } + links { "zlib", "json11", "pdcurses", "libtomcrypt", "tomsfastmath" } includedirs { "./deps/zlib", @@ -108,6 +108,7 @@ workspace "iw4x" "./deps/pdcurses", "./deps/asio/asio/include", "./deps/libtomcrypt/src/headers", + "./deps/tomsfastmath/src/headers", } -- Virtual paths @@ -204,8 +205,11 @@ workspace "iw4x" -- libtomcrypt project "libtomcrypt" language "C" - defines { "_LIB", "LTC_SOURCE", "LTC_NO_RSA_BLINDING" } + defines { "_LIB", "LTC_SOURCE", "LTC_NO_RSA_BLINDING", "TFM_DESC" } + + links { "tomsfastmath" } includedirs { "./deps/libtomcrypt/src/headers" } + includedirs { "./deps/tomsfastmath/src/headers" } files { "./deps/libtomcrypt/src/**.c" } diff --git a/src/Components/Modules/Node.cpp b/src/Components/Modules/Node.cpp index d29d01b6..506a48ef 100644 --- a/src/Components/Modules/Node.cpp +++ b/src/Components/Modules/Node.cpp @@ -239,7 +239,7 @@ namespace Components //#ifdef USE_NODE_STUFF Assert_Size(Node::AddressEntry, 6); - //ltc_mp = tfm_desc; + ltc_mp = tfm_desc; Dvar::OnInit([] () { diff --git a/src/STDInclude.hpp b/src/STDInclude.hpp index c019bfab..34d6d5c9 100644 --- a/src/STDInclude.hpp +++ b/src/STDInclude.hpp @@ -46,7 +46,7 @@ #define ZLIB_CONST -//#define TFM_DESC +#define TFM_DESC #define LTC_NO_FAST #define LTC_NO_PROTOTYPES #define LTC_NO_RSA_BLINDING @@ -57,6 +57,8 @@ #include //#include #include + +#include #include #pragma warning(pop)