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

Build: Output plugins binaries to plugins/lib instead of plugin/NAME/lib

This commit is contained in:
Lynix 2016-10-17 14:14:17 +02:00
parent f858356bc2
commit a05f9222ee
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -4,6 +4,9 @@ build/config.lua
# Nazara libraries # Nazara libraries
lib/* lib/*
# Nazara plugin libraries
plugins/lib/*
# Nazara package # Nazara package
package/* package/*

14
build/scripts/common.lua
View File

@ -312,7 +312,7 @@ function NazaraBuild:Execute()
if (toolTable.Kind == "library") then if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86") targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86")
elseif (toolTable.Kind == "plugin") then elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/" .. makeLibDir .. "/x86") targetdir("../plugins/lib/" .. makeLibDir .. "/x86")
end end
configuration({"codeblocks or codelite or gmake", "x64"}) configuration({"codeblocks or codelite or gmake", "x64"})
@ -321,7 +321,7 @@ function NazaraBuild:Execute()
if (toolTable.Kind == "library") then if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x64") targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x64")
elseif (toolTable.Kind == "plugin") then elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/" .. makeLibDir .. "/x64") targetdir("../plugins/lib/" .. makeLibDir .. "/x64")
end end
configuration({"vs*", "x32"}) configuration({"vs*", "x32"})
@ -330,7 +330,7 @@ function NazaraBuild:Execute()
if (toolTable.Kind == "library") then if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/msvc/x86") targetdir(toolTable.TargetDirectory .. "/msvc/x86")
elseif (toolTable.Kind == "plugin") then elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/msvc/x86") targetdir("../plugins/lib/msvc/x86")
end end
configuration({"vs*", "x64"}) configuration({"vs*", "x64"})
@ -339,7 +339,7 @@ function NazaraBuild:Execute()
if (toolTable.Kind == "library") then if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/msvc/x64") targetdir(toolTable.TargetDirectory .. "/msvc/x64")
elseif (toolTable.Kind == "plugin") then elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/msvc/x64") targetdir("../plugins/lib/msvc/x64")
end end
configuration({"xcode3 or xcode4", "x32"}) configuration({"xcode3 or xcode4", "x32"})
@ -348,7 +348,7 @@ function NazaraBuild:Execute()
if (toolTable.Kind == "library") then if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/xcode/x86") targetdir(toolTable.TargetDirectory .. "/xcode/x86")
elseif (toolTable.Kind == "plugin") then elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/xcode/x86") targetdir("../plugins/lib/xcode/x86")
end end
configuration({"xcode3 or xcode4", "x64"}) configuration({"xcode3 or xcode4", "x64"})
@ -357,7 +357,7 @@ function NazaraBuild:Execute()
if (toolTable.Kind == "library") then if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/xcode/x64") targetdir(toolTable.TargetDirectory .. "/xcode/x64")
elseif (toolTable.Kind == "plugin") then elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/xcode/x64") targetdir("../plugins/lib/xcode/x64")
end end
configuration("*Static") configuration("*Static")
@ -403,7 +403,7 @@ function NazaraBuild:Execute()
for k, exampleTable in ipairs(self.OrderedExamples) do for k, exampleTable in ipairs(self.OrderedExamples) do
local destPath = "../examples/bin" local destPath = "../examples/bin"
project("Demo" .. exampleTable.Name) project("Demo" .. exampleTable.Name)
location(_ACTION .. "/examples") location(_ACTION .. "/examples")