Move libraries to specific directories (depending on the compiler)
Former-commit-id: 7b9c7141036ae01ca1d269c0748200ec4d069312
This commit is contained in:
parent
836e4af221
commit
58f8ffac35
|
|
@ -1,11 +1,9 @@
|
||||||
# Nazara build
|
# Nazara build
|
||||||
examples/bin/*.exe
|
examples/bin/*.exe
|
||||||
lib/libNazara*.a
|
lib/**/libNazara*.a
|
||||||
lib/Nazara*.dll
|
lib/**/Nazara*.dll
|
||||||
lib/Nazara*.so
|
lib/**/Nazara*.so
|
||||||
SDK/lib/libNazaraSDK*.a
|
lib/**/libNazara*.lib
|
||||||
SDK/lib/NazaraSDK*.dll
|
|
||||||
SDK/lib/NazaraSDK*.so
|
|
||||||
|
|
||||||
# Feature page
|
# Feature page
|
||||||
build/scripts/features/index.html
|
build/scripts/features/index.html
|
||||||
|
|
|
||||||
|
|
@ -19,17 +19,40 @@ function NazaraBuild:Execute()
|
||||||
})
|
})
|
||||||
|
|
||||||
includedirs("../extlibs/include")
|
includedirs("../extlibs/include")
|
||||||
|
libdirs("../extlibs/lib/common")
|
||||||
location(_ACTION)
|
location(_ACTION)
|
||||||
kind("StaticLib")
|
kind("StaticLib")
|
||||||
|
|
||||||
configuration("x32")
|
configuration("x32")
|
||||||
libdirs("../extlibs/lib/x86")
|
libdirs("../extlibs/lib/common/x86")
|
||||||
targetdir("../extlibs/lib/x86")
|
|
||||||
|
|
||||||
configuration("x64")
|
configuration("x64")
|
||||||
libdirs("../extlibs/lib/x64")
|
libdirs("../extlibs/lib/common/x64")
|
||||||
targetdir("../extlibs/lib/x64")
|
|
||||||
|
configuration({"codeblocks or codelite or gmake", "x32"})
|
||||||
|
libdirs("../extlibs/lib/mingw/x86")
|
||||||
|
targetdir("../extlibs/lib/mingw/x86")
|
||||||
|
|
||||||
|
configuration({"codeblocks or codelite or gmake", "x64"})
|
||||||
|
libdirs("../extlibs/lib/mingw/x64")
|
||||||
|
targetdir("../extlibs/lib/mingw/x64")
|
||||||
|
|
||||||
|
configuration({"vs*", "x32"})
|
||||||
|
libdirs("../extlibs/lib/msvc/x86")
|
||||||
|
targetdir("../extlibs/lib/msvc/x86")
|
||||||
|
|
||||||
|
configuration({"vs*", "x64"})
|
||||||
|
libdirs("../extlibs/lib/msvc/x64")
|
||||||
|
targetdir("../extlibs/lib/msvc/x64")
|
||||||
|
|
||||||
|
configuration({"xcode3 or xcode4", "x32"})
|
||||||
|
libdirs("../extlibs/lib/xcode/x86")
|
||||||
|
targetdir("../extlibs/lib/xcode/x86")
|
||||||
|
|
||||||
|
configuration({"xcode3 or xcode4", "x64"})
|
||||||
|
libdirs("../extlibs/lib/xcode/x64")
|
||||||
|
targetdir("../extlibs/lib/xcode/x64")
|
||||||
|
|
||||||
configuration("Debug*")
|
configuration("Debug*")
|
||||||
flags("Symbols")
|
flags("Symbols")
|
||||||
|
|
||||||
|
|
@ -134,14 +157,38 @@ function NazaraBuild:Execute()
|
||||||
})
|
})
|
||||||
|
|
||||||
libdirs("../lib")
|
libdirs("../lib")
|
||||||
targetdir("../lib")
|
libdirs("../extlibs/lib/common")
|
||||||
|
|
||||||
configuration("x32")
|
configuration("x32")
|
||||||
libdirs("../extlibs/lib/x86")
|
libdirs("../extlibs/lib/common/x86")
|
||||||
|
|
||||||
configuration("x64")
|
configuration("x64")
|
||||||
defines("NAZARA_PLATFORM_x64")
|
defines("NAZARA_PLATFORM_x64")
|
||||||
libdirs("../extlibs/lib/x64")
|
libdirs("../extlibs/lib/common/x64")
|
||||||
|
|
||||||
|
configuration({"codeblocks or codelite or gmake", "x32"})
|
||||||
|
libdirs("../extlibs/lib/mingw/x86")
|
||||||
|
targetdir("../lib/mingw/x86")
|
||||||
|
|
||||||
|
configuration({"codeblocks or codelite or gmake", "x64"})
|
||||||
|
libdirs("../extlibs/lib/mingw/x64")
|
||||||
|
targetdir("../lib/mingw/x64")
|
||||||
|
|
||||||
|
configuration({"vs*", "x32"})
|
||||||
|
libdirs("../extlibs/lib/msvc/x86")
|
||||||
|
targetdir("../lib/msvc/x86")
|
||||||
|
|
||||||
|
configuration({"vs*", "x64"})
|
||||||
|
libdirs("../extlibs/lib/msvc/x64")
|
||||||
|
targetdir("../lib/msvc/x64")
|
||||||
|
|
||||||
|
configuration({"xcode3 or xcode4", "x32"})
|
||||||
|
libdirs("../extlibs/lib/xcode/x86")
|
||||||
|
targetdir("../lib/xcode/x86")
|
||||||
|
|
||||||
|
configuration({"xcode3 or xcode4", "x64"})
|
||||||
|
libdirs("../extlibs/lib/xcode/x64")
|
||||||
|
targetdir("../lib/xcode/x64")
|
||||||
|
|
||||||
configuration("*Static")
|
configuration("*Static")
|
||||||
kind("StaticLib")
|
kind("StaticLib")
|
||||||
|
|
@ -201,14 +248,38 @@ function NazaraBuild:Execute()
|
||||||
})
|
})
|
||||||
|
|
||||||
libdirs("../lib")
|
libdirs("../lib")
|
||||||
targetdir("../lib")
|
libdirs("../extlibs/lib/common")
|
||||||
|
|
||||||
configuration("x32")
|
configuration("x32")
|
||||||
libdirs("../extlibs/lib/x86")
|
libdirs("../extlibs/lib/common/x86")
|
||||||
|
|
||||||
configuration("x64")
|
configuration("x64")
|
||||||
defines("NAZARA_PLATFORM_x64")
|
defines("NAZARA_PLATFORM_x64")
|
||||||
libdirs("../extlibs/lib/x64")
|
libdirs("../extlibs/lib/common/x64")
|
||||||
|
|
||||||
|
configuration({"codeblocks or codelite or gmake", "x32"})
|
||||||
|
libdirs("../extlibs/lib/mingw/x86")
|
||||||
|
targetdir("../lib/mingw/x86")
|
||||||
|
|
||||||
|
configuration({"codeblocks or codelite or gmake", "x64"})
|
||||||
|
libdirs("../extlibs/lib/mingw/x64")
|
||||||
|
targetdir("../lib/mingw/x64")
|
||||||
|
|
||||||
|
configuration({"vs*", "x32"})
|
||||||
|
libdirs("../extlibs/lib/msvc/x86")
|
||||||
|
targetdir("../lib/msvc/x86")
|
||||||
|
|
||||||
|
configuration({"vs*", "x64"})
|
||||||
|
libdirs("../extlibs/lib/msvc/x64")
|
||||||
|
targetdir("../lib/msvc/x64")
|
||||||
|
|
||||||
|
configuration({"xcode3 or xcode4", "x32"})
|
||||||
|
libdirs("../extlibs/lib/xcode/x86")
|
||||||
|
targetdir("../lib/xcode/x86")
|
||||||
|
|
||||||
|
configuration({"xcode3 or xcode4", "x64"})
|
||||||
|
libdirs("../extlibs/lib/xcode/x64")
|
||||||
|
targetdir("../lib/xcode/x64")
|
||||||
|
|
||||||
configuration("*Static")
|
configuration("*Static")
|
||||||
kind("StaticLib")
|
kind("StaticLib")
|
||||||
|
|
@ -270,13 +341,13 @@ function NazaraBuild:Execute()
|
||||||
flags(exampleTable.Flags)
|
flags(exampleTable.Flags)
|
||||||
includedirs(exampleTable.Includes)
|
includedirs(exampleTable.Includes)
|
||||||
links(exampleTable.Libraries)
|
links(exampleTable.Libraries)
|
||||||
|
|
||||||
configuration("x32")
|
configuration("x32")
|
||||||
libdirs("../extlibs/lib/x86")
|
libdirs("../extlibs/lib/common/x86")
|
||||||
|
|
||||||
configuration("x64")
|
configuration("x64")
|
||||||
defines("NAZARA_PLATFORM_x64")
|
defines("NAZARA_PLATFORM_x64")
|
||||||
libdirs("../extlibs/lib/x64")
|
libdirs("../extlibs/lib/common/x64")
|
||||||
|
|
||||||
for k,v in pairs(exampleTable.ConfigurationLibraries) do
|
for k,v in pairs(exampleTable.ConfigurationLibraries) do
|
||||||
configuration(k)
|
configuration(k)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue