[Premake] Update premake and submodules

This commit is contained in:
momo5502 2017-02-23 19:00:39 +01:00
parent 070c7ac00a
commit c737b4f216
6 changed files with 4 additions and 3 deletions

2
.gitmodules vendored
View File

@ -34,7 +34,7 @@
[submodule "deps/protobuf"] [submodule "deps/protobuf"]
path = deps/protobuf path = deps/protobuf
url = https://github.com/google/protobuf.git url = https://github.com/google/protobuf.git
branch = 3.2.x branch = master
[submodule "deps/WinToast"] [submodule "deps/WinToast"]
path = deps/WinToast path = deps/WinToast
url = https://github.com/mohabouje/WinToast.git url = https://github.com/mohabouje/WinToast.git

2
deps/libtomcrypt vendored

@ -1 +1 @@
Subproject commit ef023f3329c44ec8afca29b9a56bae684daa88d9 Subproject commit c39390dba1dc519988fe8f6b1af6fdec24f86fc5

2
deps/protobuf vendored

@ -1 +1 @@
Subproject commit fa925b98937bafee6b5d7244cce5c1ad39bf9d36 Subproject commit 17174b54ddd040a326dec6db75d1bfb5e5b3caa9

View File

@ -49,6 +49,7 @@ template <size_t S> class Sizer { };
#pragma warning(disable: 4005) #pragma warning(disable: 4005)
#pragma warning(disable: 4091) #pragma warning(disable: 4091)
#pragma warning(disable: 4100) #pragma warning(disable: 4100)
#pragma warning(disable: 4244)
#pragma warning(disable: 4389) #pragma warning(disable: 4389)
#pragma warning(disable: 4702) #pragma warning(disable: 4702)
#pragma warning(disable: 4996) // _CRT_SECURE_NO_WARNINGS #pragma warning(disable: 4996) // _CRT_SECURE_NO_WARNINGS

Binary file not shown.

Binary file not shown.