sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK 

Former-commit-id: 2fb1ef362dd4474968d96b9c2bbe3bed7a9e02da
This commit is contained in:
Lynix 2015-08-21 12:46:32 +02:00
parent 481a191693 c4c8904aca
commit dce9831c19
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/scripts/common.lua
View File

@ -35,6 +35,9 @@ function NazaraBuild:Execute()
libdirs("../extlibs/lib/mingw/x64") libdirs("../extlibs/lib/mingw/x64")
targetdir("../extlibs/lib/mingw/x64") targetdir("../extlibs/lib/mingw/x64")
configuration("vs*")
buildoptions("/MP")
configuration({"vs*", "x32"}) configuration({"vs*", "x32"})
libdirs("../extlibs/lib/msvc/x86") libdirs("../extlibs/lib/msvc/x86")
targetdir("../extlibs/lib/msvc/x86") targetdir("../extlibs/lib/msvc/x86")
@ -131,9 +134,11 @@ function NazaraBuild:Execute()
buildoptions("-fvisibility=hidden") buildoptions("-fvisibility=hidden")
configuration("vs*") configuration("vs*")
buildoptions("/MP")
defines("_CRT_SECURE_NO_WARNINGS") defines("_CRT_SECURE_NO_WARNINGS")
defines("_SCL_SECURE_NO_WARNINGS") defines("_SCL_SECURE_NO_WARNINGS")
-- Spécification des modules -- Spécification des modules
if (_OPTIONS["united"]) then if (_OPTIONS["united"]) then
project("NazaraEngine") project("NazaraEngine")