From e01105256cbcb0508ad062bf59744688adecfd21 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Fri, 4 Mar 2016 17:34:27 -1000 Subject: [PATCH] Windows fixes --- CMakeLists.txt | 6 +++++- hecl | 2 +- nod | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed5aab5d3..4d0250f16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,12 @@ cmake_minimum_required(VERSION 3.0) cmake_policy(SET CMP0054 NEW) project(urde) if(MSVC) + if(${CMAKE_GENERATOR} MATCHES "Visual Studio*") + set(VS_DEFINES "/MP") + endif() + # Shaddup MSVC - add_definitions(-DUNICODE=1 -D_UNICODE=1 -D__SSE__=1 -D_CRT_SECURE_NO_WARNINGS=1 -DD_SCL_SECURE_NO_WARNINGS=1 /wd4267 /wd4244 /wd4305 /MP) + add_definitions(-DUNICODE=1 -D_UNICODE=1 -D__SSE__=1 -D_CRT_SECURE_NO_WARNINGS=1 -DD_SCL_SECURE_NO_WARNINGS=1 /wd4267 /wd4244 /wd4305 ${VS_DEFINES}) # Link-time Code Generation for Release builds set(CMAKE_C_FLAGS_RELEASE "/DNDEBUG /O2 /Oy /GL /Gy /MD") diff --git a/hecl b/hecl index f17dcd4d0..0df19b29f 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit f17dcd4d03b87262594a89bdae2c8426c8b50978 +Subproject commit 0df19b29fbc5024511d3bb444e9b9f7ef57d766d diff --git a/nod b/nod index 556a5868b..6302acfce 160000 --- a/nod +++ b/nod @@ -1 +1 @@ -Subproject commit 556a5868bb79d740d5cfd5eccd5135c2fd0f39c1 +Subproject commit 6302acfce46ceb6f2faf4bc22fa2b598c3daa7bb