AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into urde-tags

This commit is contained in:
Jack Andersen 2016-03-04 18:04:10 -10:00
parent f03a3fc373 d4bd30d207
commit b576778427
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -2,8 +2,12 @@ cmake_minimum_required(VERSION 3.0)
cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0054 NEW)
project(urde) project(urde)
if(MSVC) if(MSVC)
if(${CMAKE_GENERATOR} MATCHES "Visual Studio*")
set(VS_DEFINES "/MP")
endif()
# Shaddup MSVC # 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 # Link-time Code Generation for Release builds
set(CMAKE_C_FLAGS_RELEASE "/DNDEBUG /O2 /Oy /GL /Gy /MD") set(CMAKE_C_FLAGS_RELEASE "/DNDEBUG /O2 /Oy /GL /Gy /MD")

2
hecl

@ -1 +1 @@
Subproject commit f17dcd4d03b87262594a89bdae2c8426c8b50978 Subproject commit 0df19b29fbc5024511d3bb444e9b9f7ef57d766d

2
nod

@ -1 +1 @@
Subproject commit 556a5868bb79d740d5cfd5eccd5135c2fd0f39c1 Subproject commit a98927d4a00926a04caca202a2da88763c08ac7c