Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

correctly include tomsfastmath

Browse Source
This commit is contained in:
momo5502 2016-01-31 19:50:17 +01:00
parent 1fdeb17e6d
commit 55170e6ba8
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
premake5.lua
View File

@ -100,7 +100,7 @@ workspace "iw4x"
buildoptions { "-Zm200" } -- allocate ~150mb memory for the precompiled header. This should be enough, increase if necessary buildoptions { "-Zm200" } -- allocate ~150mb memory for the precompiled header. This should be enough, increase if necessary
-- Dependency on zlib, json11 and asio -- Dependency on zlib, json11 and asio
links { "zlib", "json11", "pdcurses", "libtomcrypt" } links { "zlib", "json11", "pdcurses", "libtomcrypt", "tomsfastmath" }
includedirs includedirs
{ {
"./deps/zlib", "./deps/zlib",
@ -108,6 +108,7 @@ workspace "iw4x"
"./deps/pdcurses", "./deps/pdcurses",
"./deps/asio/asio/include", "./deps/asio/asio/include",
"./deps/libtomcrypt/src/headers", "./deps/libtomcrypt/src/headers",
"./deps/tomsfastmath/src/headers",
} }
-- Virtual paths -- Virtual paths
@ -204,8 +205,11 @@ workspace "iw4x"
-- libtomcrypt -- libtomcrypt
project "libtomcrypt" project "libtomcrypt"
language "C" 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/libtomcrypt/src/headers" }
includedirs { "./deps/tomsfastmath/src/headers" }
files { "./deps/libtomcrypt/src/**.c" } files { "./deps/libtomcrypt/src/**.c" }

2
src/Components/Modules/Node.cpp
View File

@ -239,7 +239,7 @@ namespace Components
//#ifdef USE_NODE_STUFF //#ifdef USE_NODE_STUFF
Assert_Size(Node::AddressEntry, 6); Assert_Size(Node::AddressEntry, 6);
//ltc_mp = tfm_desc; ltc_mp = tfm_desc;
Dvar::OnInit([] () Dvar::OnInit([] ()
{ {

4
src/STDInclude.hpp
View File

@ -46,7 +46,7 @@
#define ZLIB_CONST #define ZLIB_CONST
//#define TFM_DESC #define TFM_DESC
#define LTC_NO_FAST #define LTC_NO_FAST
#define LTC_NO_PROTOTYPES #define LTC_NO_PROTOTYPES
#define LTC_NO_RSA_BLINDING #define LTC_NO_RSA_BLINDING
@ -57,6 +57,8 @@
#include <curses.h> #include <curses.h>
//#include <asio.hpp> //#include <asio.hpp>
#include <json11.hpp> #include <json11.hpp>
#include <tfm.h>
#include <tomcrypt.h> #include <tomcrypt.h>
#pragma warning(pop) #pragma warning(pop)