Rewritted ResourceLoader and moved it to core

Added creation constructor to NzImage
Added member function functor
Added option to build Nazara as one library (instead of many)
Fixed some 2011 copyrights
Made use of "using def = T" C++11 feature instead of some illigible
typedefs
Removed unused premake file

build/scripts/common.lua

@@ -19,6 +19,13 @@ includedirs
 }
 
 libdirs "../lib"
+
+if (_OPTIONS["x64"]) then
+	libdirs "../extlibs/lib/x64"
+end
+
+libdirs "../extlibs/lib/x86"
+
 targetdir "../lib"
 
 configuration "Debug*"

build/scripts/common_examples.lua

@@ -10,10 +10,7 @@ configurations
 language "C++"
 location("../examples/build/" .. _ACTION)
 
-includedirs
-{
-	"../include"
-}
+includedirs "../include"
 
 debugdir "../examples/bin"
 libdirs "../lib"

build/scripts/module/core.lua

@@ -1,4 +1,6 @@
-project "NazaraCore"
+if (not _OPTIONS["one-library"]) then
+	project "NazaraCore"
+end
 
 files
 {
@@ -17,8 +19,10 @@ else
 	excludes { "../src/Nazara/Core/Win32/**.hpp", "../src/Nazara/Core/Win32/**.cpp" }
 end
 
-configuration "Debug*"
-	targetname "NazaraCored"
+if (not _OPTIONS["one-library"]) then
+	configuration "Debug*"
+		targetname "NazaraCored"
 
-configuration "Release*"
-	targetname "NazaraCore"
+	configuration "Release*"
+		targetname "NazaraCore"
+end

build/scripts/module/noise.lua

@@ -1,11 +1,13 @@
-project "NazaraNoise"
+if (not _OPTIONS["one-library"]) then
+	project "NazaraNoise"
+end
 
 files
 {
- "../include/Nazara/Noise/**.hpp",
- "../include/Nazara/Noise/**.inl",
- "../src/Nazara/Noise/**.hpp",
- "../src/Nazara/Noise/**.cpp"
+	"../include/Nazara/Noise/**.hpp",
+	"../include/Nazara/Noise/**.inl",
+	"../src/Nazara/Noise/**.hpp",
+	"../src/Nazara/Noise/**.cpp"
 }
 
 if (os.is("windows")) then
@@ -14,18 +16,22 @@ else
 	excludes { "../src/Nazara/Noise/Win32/*.hpp", "../src/Nazara/Noise/Win32/*.cpp" }
 end
 
-configuration "DebugStatic"
-	links "NazaraCored-s"
-	targetname "NazaraNoised"
+if (_OPTIONS["one-library"]) then
+	excludes "../src/Nazara/Noise/Debug/Leaks.cpp"
+else
+	configuration "DebugStatic"
+		links "NazaraCored-s"
+		targetname "NazaraNoised"
 
-configuration "ReleaseStatic"
-	links "NazaraCore-s"
-	targetname "NazaraNoise"
+	configuration "ReleaseStatic"
+		links "NazaraCore-s"
+		targetname "NazaraNoise"
 
-configuration "DebugDLL"
-	links "NazaraCored"
-	targetname "NazaraNoised"
+	configuration "DebugDLL"
+		links "NazaraCored"
+		targetname "NazaraNoised"
 
-configuration "ReleaseDLL"
-	links "NazaraCore"
-	targetname "NazaraNoise"
+	configuration "ReleaseDLL"
+		links "NazaraCore"
+		targetname "NazaraNoise"
+end

build/scripts/module/renderer.lua

@@ -1,4 +1,6 @@
-project "NazaraRenderer"
+if (not _OPTIONS["one-library"]) then
+	project "NazaraRenderer"
+end
 
 files
 {
@@ -17,22 +19,26 @@ else
 	excludes { "../src/Nazara/Renderer/Win32/*.hpp", "../src/Nazara/Renderer/Win32/*.cpp" }
 end
 
-configuration "DebugStatic"
-	links "NazaraCored-s"
-	links "NazaraUtilityd-s"
-	targetname "NazaraRendererd"
+if (_OPTIONS["one-library"]) then
+	excludes "../src/Nazara/Renderer/Debug/Leaks.cpp"
+else
+	configuration "DebugStatic"
+		links "NazaraCored-s"
+		links "NazaraUtilityd-s"
+		targetname "NazaraRendererd"
 
-configuration "ReleaseStatic"
-	links "NazaraCore-s"
-	links "NazaraUtility-s"
-	targetname "NazaraRenderer"
+	configuration "ReleaseStatic"
+		links "NazaraCore-s"
+		links "NazaraUtility-s"
+		targetname "NazaraRenderer"
 
-configuration "DebugDLL"
-	links "NazaraCored"
-	links "NazaraUtilityd"
-	targetname "NazaraRendererd"
+	configuration "DebugDLL"
+		links "NazaraCored"
+		links "NazaraUtilityd"
+		targetname "NazaraRendererd"
 
-configuration "ReleaseDLL"
-	links "NazaraCore"
-	links "NazaraUtility"
-	targetname "NazaraRenderer"
+	configuration "ReleaseDLL"
+		links "NazaraCore"
+		links "NazaraUtility"
+		targetname "NazaraRenderer"
+end

build/scripts/module/utility.lua

@@ -1,4 +1,6 @@
-project "NazaraUtility"
+if (not _OPTIONS["one-library"]) then
+	project "NazaraUtility"
+end
 
 defines "STBI_NO_STDIO"
 
@@ -18,18 +20,22 @@ else
 	excludes { "../src/Nazara/Utility/Win32/*.hpp", "../src/Nazara/Utility/Win32/*.cpp" }
 end
 
-configuration "DebugStatic"
-	links "NazaraCored-s"
-	targetname "NazaraUtilityd"
+if (_OPTIONS["one-library"]) then
+	excludes "../src/Nazara/Utility/Debug/Leaks.cpp"
+else
+	configuration "DebugStatic"
+		links "NazaraCored-s"
+		targetname "NazaraUtilityd"
 
-configuration "ReleaseStatic"
-	links "NazaraCore-s"
-	targetname "NazaraUtility"
+	configuration "ReleaseStatic"
+		links "NazaraCore-s"
+		targetname "NazaraUtility"
 
-configuration "DebugDLL"
-	links "NazaraCored"
-	targetname "NazaraUtilityd"
+	configuration "DebugDLL"
+		links "NazaraCored"
+		targetname "NazaraUtilityd"
 
-configuration "ReleaseDLL"
-	links "NazaraCore"
-	targetname "NazaraUtility"
+	configuration "ReleaseDLL"
+		links "NazaraCore"
+		targetname "NazaraUtility"
+end