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

Build: Fix with-extlibs option being required for compilation

Browse Source 
Former-commit-id: 41219e06c9f0a05221440eefb6268222757af8e1 [formerly fdb27339a5b90fce1bbea576012c72c433615e23]
Former-commit-id: e979847fb2bc6d6f80b9fc02956d08113bae1e39
This commit is contained in:
Lynix
2016-06-01 13:52:59 +02:00
parent 37f32bdb13
commit e846934960
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
build/scripts/common.lua
View File

@@ -15,7 +15,7 @@ function NazaraBuild:Execute()
if (self.Actions[_ACTION] == nil) then if (self.Actions[_ACTION] == nil) then
local makeLibDir = os.is("windows") and "mingw" or "gmake" local makeLibDir = os.is("windows") and "mingw" or "gmake"
if (#self.OrderedExtLibs > 0) then if (_OPTIONS["with-extlibs"]) then
workspace("NazaraExtlibs") workspace("NazaraExtlibs")
platforms(platformData) platforms(platformData)
@@ -494,26 +494,24 @@ function NazaraBuild:Initialize()
ACTION = nil ACTION = nil
-- Extern libraries -- Extern libraries
if (_OPTIONS["with-extlibs"]) then local extlibs = os.matchfiles("../extlibs/build/*.lua")
local extlibs = os.matchfiles("../extlibs/build/*.lua") for k,v in pairs(extlibs) do
for k,v in pairs(extlibs) do local f, err = loadfile(v)
local f, err = loadfile(v) if (f) then
if (f) then LIBRARY = {}
LIBRARY = {} self:SetupInfoTable(LIBRARY)
self:SetupInfoTable(LIBRARY)
f() f()
local succeed, err = self:RegisterExternLibrary(LIBRARY) local succeed, err = self:RegisterExternLibrary(LIBRARY)
if (not succeed) then if (not succeed) then
print("Unable to register extern library: " .. err) print("Unable to register extern library: " .. err)
end end
else else
print("Unable to load extern library file: " .. err) print("Unable to load extern library file: " .. err)
end end
end end
LIBRARY = nil LIBRARY = nil
end
-- Then the modules -- Then the modules
local modules = os.matchfiles("scripts/modules/*.lua") local modules = os.matchfiles("scripts/modules/*.lua")