Merge remote-tracking branch 'origin/BuildSystem-Update' into NDK
Conflicts: build/scripts/common.lua build/scripts/module/audio.lua build/scripts/module/core.lua build/scripts/module/graphics.lua build/scripts/module/lua.lua build/scripts/module/noise.lua build/scripts/module/physics.lua build/scripts/module/renderer.lua build/scripts/module/utility.lua Former-commit-id: 8374b17a214e0efbdc7d35e81ed809f8dc9d3b79
This commit is contained in:
@@ -1,41 +1,14 @@
|
||||
kind "ConsoleApp"
|
||||
EXAMPLE.Name = "FirstScene"
|
||||
|
||||
files "main.cpp"
|
||||
EXAMPLE.Console = true
|
||||
|
||||
if (_OPTIONS["united"]) then
|
||||
configuration "DebugStatic"
|
||||
links "NazaraEngine-s-d"
|
||||
EXAMPLE.Files = {
|
||||
"main.cpp"
|
||||
}
|
||||
|
||||
configuration "ReleaseStatic"
|
||||
links "NazaraEngine-s"
|
||||
|
||||
configuration "DebugDLL"
|
||||
links "NazaraEngine-d"
|
||||
|
||||
configuration "ReleaseDLL"
|
||||
links "NazaraEngine"
|
||||
else
|
||||
configuration "DebugStatic"
|
||||
links "NazaraGraphics-s-d"
|
||||
links "NazaraRenderer-s-d"
|
||||
links "NazaraUtility-s-d"
|
||||
links "NazaraCore-s-d"
|
||||
|
||||
configuration "ReleaseStatic"
|
||||
links "NazaraGraphics-s"
|
||||
links "NazaraRenderer-s"
|
||||
links "NazaraUtility-s"
|
||||
links "NazaraCore-s"
|
||||
|
||||
configuration "DebugDLL"
|
||||
links "NazaraGraphics-d"
|
||||
links "NazaraRenderer-d"
|
||||
links "NazaraUtility-d"
|
||||
links "NazaraCore-d"
|
||||
|
||||
configuration "ReleaseDLL"
|
||||
links "NazaraGraphics"
|
||||
links "NazaraRenderer"
|
||||
links "NazaraUtility"
|
||||
links "NazaraCore"
|
||||
end
|
||||
EXAMPLE.Libraries = {
|
||||
"NazaraCore",
|
||||
"NazaraGraphics",
|
||||
"NazaraRenderer",
|
||||
"NazaraUtility"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user