From a74b4e68627bdbc12f248aa139caf6eff04783b4 Mon Sep 17 00:00:00 2001 From: Pavel Krajcevski Date: Fri, 24 Oct 2014 09:10:29 -0400 Subject: [PATCH 1/2] Add proper include to support min and max --- CLTool/src/tc.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/CLTool/src/tc.cpp b/CLTool/src/tc.cpp index bff90f2..158ef5d 100644 --- a/CLTool/src/tc.cpp +++ b/CLTool/src/tc.cpp @@ -53,6 +53,7 @@ #define _CRT_SECURE_NO_WARNINGS #define WIN32_LEAN_AND_MEAN +#include #include #include #include From fd2699302d72d90d3b909c55dae933a6a4495c24 Mon Sep 17 00:00:00 2001 From: Pavel Krajcevski Date: Fri, 24 Oct 2014 10:27:01 -0400 Subject: [PATCH 2/2] Update to support VS2013 --- CMakeLists.txt | 2 ++ Windows | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8beeae..b8865ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,8 @@ IF(MSVC) SET(MSVC_VERSION_STRING vc100) ELSEIF(MSVC11) SET(MSVC_VERSION_STRING vc110) + ELSEIF(MSVC12) + SET(MSVC_VERSION_STRING vc120) ELSEIF(MSVC90) SET(MSVC_VERSION_STRING vc90) ELSEIF(MSVC80) diff --git a/Windows b/Windows index 4feeeb6..6d9f6ba 160000 --- a/Windows +++ b/Windows @@ -1 +1 @@ -Subproject commit 4feeeb6550851ba3541c3f9505c76018e665667e +Subproject commit 6d9f6ba0f9ebec0f6735b1f29527ea5835ef3572