length included

src/CMakeLists.txt

@@ -18,6 +18,7 @@ set (SRC
 
 	FPSSystem.cpp
 	JSONParser.cpp
+	ScriptSystem.cpp
 )
 
 set (HEADERS
@@ -45,6 +46,7 @@ set (HEADERS
 
 	FPSSystem.h
 	JSONParser.h
+	ScriptSystem.h
 )
 
 set (CORE_SRC
@@ -286,7 +288,9 @@ set (CROWN_HEADERS
 	${OS_HEADERS}
 )
 
-link_libraries(rt z)
+include_directories(${CROWN_THIRD}/luajit/include/luajit-2.0)
+link_directories(${CROWN_THIRD}/luajit/lib)
+link_libraries(rt z luajit-5.1)
 add_library(crown SHARED ${CROWN_SOURCES} ${CROWN_HEADERS})
 
 if (CROWN_BUILD_OPENGL)

src/ScriptResource.cpp

@@ -17,8 +17,10 @@ void* ScriptResource::load(Allocator& allocator, ResourceArchive& archive, Resou
 	if (stream != NULL)
 	{
 		ScriptResource* resource = (ScriptResource*)allocator.allocate(sizeof(ScriptResource));
-	
-		size_t size = stream->size() - stream->position();
+
+		stream->read(&resource->m_length, sizeof(uint32_t));
+		
+		size_t size = resource->m_length;
 
 		resource->m_data = (uint8_t*)allocator.allocate(sizeof(uint8_t) * size);
 

src/ScriptResource.h

@@ -45,10 +45,13 @@ public:
 
 public:
 
+	const uint32_t		length() const { return m_length; }
 	const uint8_t*		data() const { return m_data; }
 
-private:
+	void				set_length(uint32_t len) { m_length = len; }
 
+private:
+	uint32_t 			m_length;
 	uint8_t*			m_data;
 };