medfall

commit 755afc713fcc05c4003f34e95904af250fbc1782
parent b4ac402fd00535456ade2f90a3119d5657e80bdb
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sun, 18 Feb 2018 20:41:31 +0200

Call csprng_init in main

Diffstat:
main.cc
 | 
4
++++
make.lua
 | 
6
+++---

2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/main.cc b/main.cc
@@ -13,6 +13,8 @@
 #include "text_renderer.h"
 #include "autogdb.h"
 
+#include "rng/csprng.h"
+
 #define GLFW_INCLUDE_NONE
 #include "libs/glfw/include/GLFW/glfw3.h"
 
@@ -38,6 +40,8 @@ int main( int argc, char ** argv ) {
 	logger_thread_name( "main" );
 	profiler_init();
 
+	csprng_init();
+
 	GLFWwindow * window = gl_init( WINDOW_GAME );
 	renderer_init();
 	shaders_init();
diff --git a/make.lua b/make.lua
@@ -1,11 +1,11 @@
 require( "scripts.gen_makefile" )
 
 local common_objs = { "memory_arena", "log", "ggformat", "patterns", "strlcpy", "strlcat", "strtonum", "profiler", "stats", "rng/well512", "breakbools" }
-local game_objs = { "work_queue", "renderer", "shaders", "gl", "glad", "immediate", "text_renderer", "liberation", "obj", "blue_noise", common_objs }
-local game_libs = { "glfw", "stb_image", "stb_truetype", "tinyobjloader" }
+local game_objs = { "work_queue", "renderer", "shaders", "gl", "glad", "immediate", "text_renderer", "liberation", "obj", "blue_noise", "rng/csprng", "ggentropy", common_objs }
+local game_libs = { "glfw", "stb_image", "stb_truetype", "monocypher", "tinyobjloader" }
 
 if OS ~= "windows" then
-	bin( "srv", { "server/main", "platform_network", common_objs } )
+	bin( "srv", { "server/main", "platform_network", "ggentropy", "rng/csprng", "ggentropy", common_objs }, { "monocypher" } )
 end
 
 if OS == "openbsd" then