From 21047a3da3ad6bce0e779b3158c036431bfc1ebc Mon Sep 17 00:00:00 2001 From: momo5502 Date: Tue, 14 Jun 2016 15:28:42 +0200 Subject: [PATCH] Use develop branch for libtommath --- .gitmodules | 1 + deps/libtommath | 2 +- premake5.lua | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 841e6d3f..aa8ed2b2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,6 +8,7 @@ [submodule "deps/libtommath"] path = deps/libtommath url = https://github.com/libtom/libtommath.git + branch = develop [submodule "deps/protobuf"] path = deps/protobuf url = https://github.com/google/protobuf.git diff --git a/deps/libtommath b/deps/libtommath index f551dbc8..2e1446f9 160000 --- a/deps/libtommath +++ b/deps/libtommath @@ -1 +1 @@ -Subproject commit f551dbc8acc4b9c5b82fc4891523656996118da1 +Subproject commit 2e1446f93639d3b619a5b17cdcc44bbd63ca0c7e diff --git a/premake5.lua b/premake5.lua index 90a6df9a..10af74b9 100644 --- a/premake5.lua +++ b/premake5.lua @@ -240,7 +240,6 @@ workspace "iw4x" kind "StaticLib" removedefines { "ZLIB_DLL" } - -- json11 project "json11" language "C++" @@ -260,7 +259,6 @@ workspace "iw4x" -- always build as static lib, as json11 doesn't export anything kind "StaticLib" - -- mongoose project "mongoose" language "C"