Added extern libraries (Made STB one of them)
Former-commit-id: 0ca555e9f035600924c7c23fff06bc3810051fdf
This commit is contained in:
parent
b7468d3b8f
commit
143707bc2e
|
|
@ -60,3 +60,5 @@ configuration "codeblocks or codelite or gmake or xcode3*"
|
||||||
|
|
||||||
configuration { "linux or bsd or macosx", "gmake" }
|
configuration { "linux or bsd or macosx", "gmake" }
|
||||||
buildoptions "-fvisibility=hidden"
|
buildoptions "-fvisibility=hidden"
|
||||||
|
|
||||||
|
configuration {} -- Fin du filtre
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
-- Configuration générale
|
||||||
|
configurations
|
||||||
|
{
|
||||||
|
"Debug",
|
||||||
|
"Release"
|
||||||
|
}
|
||||||
|
|
||||||
|
location("../extlibs/build/" .. _ACTION)
|
||||||
|
includedirs "../extlibs/include"
|
||||||
|
|
||||||
|
if (_OPTIONS["x64"]) then
|
||||||
|
targetdir "../extlibs/lib/x64"
|
||||||
|
else
|
||||||
|
targetdir "../extlibs/lib/x86"
|
||||||
|
end
|
||||||
|
|
||||||
|
configuration "Debug"
|
||||||
|
flags "Symbols"
|
||||||
|
targetsuffix "-d"
|
||||||
|
|
||||||
|
configuration "Release"
|
||||||
|
flags { "EnableSSE", "EnableSSE2", "Optimize", "OptimizeSpeed", "NoFramePointer", "NoRTTI" }
|
||||||
|
|
||||||
|
-- Activation du SSE côté GCC
|
||||||
|
configuration { "Release*", "codeblocks or codelite or gmake or xcode3*" }
|
||||||
|
buildoptions "-mfpmath=sse"
|
||||||
|
|
@ -4,10 +4,10 @@ end
|
||||||
|
|
||||||
files
|
files
|
||||||
{
|
{
|
||||||
"../include/Nazara/Audio/**.hpp",
|
"../include/Nazara/Audio/**.hpp",
|
||||||
"../include/Nazara/Audio/**.inl",
|
"../include/Nazara/Audio/**.inl",
|
||||||
"../src/Nazara/Audio/**.hpp",
|
"../src/Nazara/Audio/**.hpp",
|
||||||
"../src/Nazara/Audio/**.cpp"
|
"../src/Nazara/Audio/**.cpp"
|
||||||
}
|
}
|
||||||
|
|
||||||
if (os.is("windows")) then
|
if (os.is("windows")) then
|
||||||
|
|
|
||||||
|
|
@ -5,10 +5,8 @@ end
|
||||||
files
|
files
|
||||||
{
|
{
|
||||||
"../include/Nazara/Lua/**.hpp",
|
"../include/Nazara/Lua/**.hpp",
|
||||||
"../include/Nazara/Lua/**.h",
|
|
||||||
"../include/Nazara/Lua/**.inl",
|
"../include/Nazara/Lua/**.inl",
|
||||||
"../src/Nazara/Lua/**.hpp",
|
"../src/Nazara/Lua/**.hpp",
|
||||||
"../src/Nazara/Lua/**.c",
|
|
||||||
"../src/Nazara/Lua/**.cpp"
|
"../src/Nazara/Lua/**.cpp"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -33,3 +31,9 @@ else
|
||||||
configuration "ReleaseDLL"
|
configuration "ReleaseDLL"
|
||||||
links "NazaraCore"
|
links "NazaraCore"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
configuration "Debug*"
|
||||||
|
links "lua-s-d"
|
||||||
|
|
||||||
|
configuration "Release*"
|
||||||
|
links "lua-s"
|
||||||
|
|
|
||||||
|
|
@ -2,14 +2,11 @@ if (not _OPTIONS["united"]) then
|
||||||
project "NazaraUtility"
|
project "NazaraUtility"
|
||||||
end
|
end
|
||||||
|
|
||||||
defines "STBI_NO_STDIO"
|
|
||||||
|
|
||||||
files
|
files
|
||||||
{
|
{
|
||||||
"../include/Nazara/Utility/**.hpp",
|
"../include/Nazara/Utility/**.hpp",
|
||||||
"../include/Nazara/Utility/**.inl",
|
"../include/Nazara/Utility/**.inl",
|
||||||
"../src/Nazara/Utility/**.hpp",
|
"../src/Nazara/Utility/**.hpp",
|
||||||
"../src/Nazara/Utility/**.c",
|
|
||||||
"../src/Nazara/Utility/**.cpp"
|
"../src/Nazara/Utility/**.cpp"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -35,3 +32,9 @@ else
|
||||||
configuration "ReleaseDLL"
|
configuration "ReleaseDLL"
|
||||||
links "NazaraCore"
|
links "NazaraCore"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
configuration "Debug*"
|
||||||
|
links "stb_image-s-d"
|
||||||
|
|
||||||
|
configuration "Release*"
|
||||||
|
links "stb_image-s"
|
||||||
|
|
|
||||||
|
|
@ -3,16 +3,13 @@
|
||||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||||
|
|
||||||
#include <Nazara/Utility/Loaders/STB.hpp>
|
#include <Nazara/Utility/Loaders/STB.hpp>
|
||||||
|
#include <stb_image/stb_image.h>
|
||||||
#include <Nazara/Core/Endianness.hpp>
|
#include <Nazara/Core/Endianness.hpp>
|
||||||
#include <Nazara/Core/Error.hpp>
|
#include <Nazara/Core/Error.hpp>
|
||||||
#include <Nazara/Core/File.hpp>
|
#include <Nazara/Core/File.hpp>
|
||||||
#include <Nazara/Core/InputStream.hpp>
|
#include <Nazara/Core/InputStream.hpp>
|
||||||
#include <Nazara/Core/MemoryStream.hpp>
|
#include <Nazara/Core/MemoryStream.hpp>
|
||||||
#include <Nazara/Utility/Image.hpp>
|
#include <Nazara/Utility/Image.hpp>
|
||||||
|
|
||||||
#define STBI_HEADER_FILE_ONLY
|
|
||||||
#include <Nazara/Utility/Loaders/STB/stb_image.cpp>
|
|
||||||
|
|
||||||
#include <Nazara/Utility/Debug.hpp>
|
#include <Nazara/Utility/Debug.hpp>
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue