[Premake] Update premake and submodules

2017-02-23 19:00:39 +01:00 · 2017-02-23 19:00:39 +01:00 · c737b4f216
commit c737b4f216
parent 070c7ac00a
6 changed files with 4 additions and 3 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -34,7 +34,7 @@
 [submodule "deps/protobuf"]
 	path = deps/protobuf
 	url = https://github.com/google/protobuf.git
-	branch = 3.2.x
+	branch = master
 [submodule "deps/WinToast"]
 	path = deps/WinToast
 	url = https://github.com/mohabouje/WinToast.git
--- a/deps/libtomcrypt
+++ b/deps/libtomcrypt
@ -1 +1 @@
-Subproject commit ef023f3329c44ec8afca29b9a56bae684daa88d9
+Subproject commit c39390dba1dc519988fe8f6b1af6fdec24f86fc5
--- a/deps/protobuf
+++ b/deps/protobuf
@ -1 +1 @@
-Subproject commit fa925b98937bafee6b5d7244cce5c1ad39bf9d36
+Subproject commit 17174b54ddd040a326dec6db75d1bfb5e5b3caa9
--- a/src/STDInclude.hpp
+++ b/src/STDInclude.hpp
@ -49,6 +49,7 @@ template <size_t S> class Sizer { };
 #pragma warning(disable: 4005)
 #pragma warning(disable: 4091)
 #pragma warning(disable: 4100)
+#pragma warning(disable: 4244)
 #pragma warning(disable: 4389)
 #pragma warning(disable: 4702)
 #pragma warning(disable: 4996) // _CRT_SECURE_NO_WARNINGS
--- a/tools/premake5.exe
+++ b/tools/premake5.exe
--- a/tools/protoc.exe
+++ b/tools/protoc.exe