Added extern libraries (Made STB one of them)

Former-commit-id: 0ca555e9f035600924c7c23fff06bc3810051fdf
This commit is contained in:
Lynix 2013-04-12 15:12:11 +02:00
parent b7468d3b8f
commit 143707bc2e
10 changed files with 51 additions and 4692 deletions

View File

@ -60,3 +60,5 @@ configuration "codeblocks or codelite or gmake or xcode3*"
configuration { "linux or bsd or macosx", "gmake" }
buildoptions "-fvisibility=hidden"
configuration {} -- Fin du filtre

View File

@ -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"

View File

@ -4,10 +4,10 @@ end
files
{
"../include/Nazara/Audio/**.hpp",
"../include/Nazara/Audio/**.inl",
"../src/Nazara/Audio/**.hpp",
"../src/Nazara/Audio/**.cpp"
"../include/Nazara/Audio/**.hpp",
"../include/Nazara/Audio/**.inl",
"../src/Nazara/Audio/**.hpp",
"../src/Nazara/Audio/**.cpp"
}
if (os.is("windows")) then
@ -33,4 +33,4 @@ else
configuration "ReleaseDLL"
links "NazaraCore"
end
end

View File

@ -17,4 +17,4 @@ if (os.is("windows")) then
excludes { "../src/Nazara/Core/Posix/**.hpp", "../src/Nazara/Core/Posix/**.cpp" }
else
excludes { "../src/Nazara/Core/Win32/**.hpp", "../src/Nazara/Core/Win32/**.cpp" }
end
end

View File

@ -38,4 +38,4 @@ else
links "NazaraCore"
links "NazaraUtility"
links "NazaraRenderer"
end
end

View File

@ -5,10 +5,8 @@ end
files
{
"../include/Nazara/Lua/**.hpp",
"../include/Nazara/Lua/**.h",
"../include/Nazara/Lua/**.inl",
"../src/Nazara/Lua/**.hpp",
"../src/Nazara/Lua/**.c",
"../src/Nazara/Lua/**.cpp"
}
@ -32,4 +30,10 @@ else
configuration "ReleaseDLL"
links "NazaraCore"
end
end
configuration "Debug*"
links "lua-s-d"
configuration "Release*"
links "lua-s"

View File

@ -30,4 +30,4 @@ else
configuration "ReleaseDLL"
links "NazaraCore"
end
end

View File

@ -2,14 +2,11 @@ if (not _OPTIONS["united"]) then
project "NazaraUtility"
end
defines "STBI_NO_STDIO"
files
{
"../include/Nazara/Utility/**.hpp",
"../include/Nazara/Utility/**.inl",
"../src/Nazara/Utility/**.hpp",
"../src/Nazara/Utility/**.c",
"../src/Nazara/Utility/**.cpp"
}
@ -34,4 +31,10 @@ else
configuration "ReleaseDLL"
links "NazaraCore"
end
end
configuration "Debug*"
links "stb_image-s-d"
configuration "Release*"
links "stb_image-s"

View File

@ -3,16 +3,13 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Utility/Loaders/STB.hpp>
#include <stb_image/stb_image.h>
#include <Nazara/Core/Endianness.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/File.hpp>
#include <Nazara/Core/InputStream.hpp>
#include <Nazara/Core/MemoryStream.hpp>
#include <Nazara/Utility/Image.hpp>
#define STBI_HEADER_FILE_ONLY
#include <Nazara/Utility/Loaders/STB/stb_image.cpp>
#include <Nazara/Utility/Debug.hpp>
namespace

File diff suppressed because it is too large Load Diff