Merge branch 'master' into physics3d-material

include/Nazara/Core/Flags.hpp

@@ -67,7 +67,7 @@ namespace Nz
 
 			static constexpr BitField GetFlagValue(E enumValue);
 
-			static constexpr BitField ValueMask = ((BitField(1) << (MaxValue + 1)) - 1);
+			static constexpr BitField ValueMask = BitField((UInt64(1) << (MaxValue + 1)) - 1);
 
 		private:
 			BitField m_value;

include/Nazara/Lua/Enums.hpp

@@ -7,6 +7,8 @@
 #ifndef NAZARA_ENUMS_LUA_HPP
 #define NAZARA_ENUMS_LUA_HPP
 
+#include <Nazara/Core/Flags.hpp>
+
 namespace Nz
 {
 	enum LuaBindMode
@@ -26,6 +28,21 @@ namespace Nz
 		LuaComparison_Max = LuaComparison_LessOrEqual
 	};
 
+	enum LuaLib
+	{
+		LuaLib_Coroutine,
+		LuaLib_Debug,
+		LuaLib_Math,
+		LuaLib_Io,
+		LuaLib_Package,
+		LuaLib_Os,
+		LuaLib_String,
+		LuaLib_Table,
+		LuaLib_Utf8,
+
+		LuaLib_Max = LuaLib_Utf8
+	};
+
 	enum LuaOperation
 	{
 		LuaOperation_Addition,
@@ -61,6 +78,16 @@ namespace Nz
 
 		LuaType_Max = LuaType_Userdata
 	};
+
+	template<>
+	struct EnumAsFlags<LuaLib>
+	{
+		static constexpr LuaLib max = LuaLib_Max;
+	};
+
+	using LuaLibFlags = Flags<LuaLib>;
+
+	constexpr LuaLibFlags LuaLib_All = LuaLibFlags(LuaLibFlags::ValueMask);
 }
 
 #endif // NAZARA_ENUMS_LUA_HPP

include/Nazara/Lua/LuaInstance.hpp

@@ -9,6 +9,7 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Clock.hpp>
+#include <Nazara/Lua/Enums.hpp>
 #include <Nazara/Lua/LuaState.hpp>
 #include <cstddef>
 
@@ -29,6 +30,8 @@ namespace Nz
 			inline std::size_t GetMemoryUsage() const;
 			inline UInt32 GetTimeLimit() const;
 
+			void LoadLibraries(LuaLibFlags libFlags = LuaLib_All);
+
 			inline void SetMemoryLimit(std::size_t memoryLimit);
 			inline void SetTimeLimit(UInt32 limit);
 

include/Nazara/Prerequisites.hpp

@@ -22,8 +22,8 @@
 	SOFTWARE.
 */
 
-#ifndef NAZARA_PREREQUESITES_HPP
-#define NAZARA_PREREQUESITES_HPP
+#ifndef NAZARA_PREREQUISITES_HPP
+#define NAZARA_PREREQUISITES_HPP
 
 // Try to identify the compiler
 #if defined(__BORLANDC__)
@@ -179,4 +179,4 @@ namespace Nz
 	typedef uint64_t UInt64;
 }
 
-#endif // NAZARA_PREREQUESITES_HPP
+#endif // NAZARA_PREREQUISITES_HPP