Merge branch 'master' of github.com:bkaradzic/bgfx

examples/01-cubes/cubes.cpp

@@ -80,7 +80,8 @@ static const bgfx::Memory* load(const char* _filePath)
 	{
 		uint32_t size = (uint32_t)fsize(file);
 		const bgfx::Memory* mem = bgfx::alloc(size+1);
-		fread(mem->data, 1, size, file);
+		size_t ignore = fread(mem->data, 1, size, file);
+		BX_UNUSED(ignore);
 		fclose(file);
 		mem->data[mem->size-1] = '\0';
 		return mem;

examples/02-metaballs/metaballs.cpp

@@ -65,7 +65,8 @@ static const bgfx::Memory* load(const char* _filePath)
 	{
 		uint32_t size = (uint32_t)fsize(file);
 		const bgfx::Memory* mem = bgfx::alloc(size+1);
-		fread(mem->data, 1, size, file);
+		size_t ignore = fread(mem->data, 1, size, file);
+		BX_UNUSED(ignore);
 		fclose(file);
 		mem->data[mem->size-1] = '\0';
 		return mem;

examples/03-raymarch/raymarch.cpp

@@ -55,7 +55,8 @@ static const bgfx::Memory* load(const char* _filePath)
 	{
 		uint32_t size = (uint32_t)fsize(file);
 		const bgfx::Memory* mem = bgfx::alloc(size+1);
-		fread(mem->data, 1, size, file);
+		size_t ignore = fread(mem->data, 1, size, file);
+		BX_UNUSED(ignore);
 		fclose(file);
 		mem->data[mem->size-1] = '\0';
 		return mem;

examples/04-mesh/mesh.cpp

@@ -44,7 +44,8 @@ static const bgfx::Memory* load(const char* _filePath)
 	{
 		uint32_t size = (uint32_t)fsize(file);
 		const bgfx::Memory* mem = bgfx::alloc(size+1);
-		fread(mem->data, 1, size, file);
+		size_t ignore = fread(mem->data, 1, size, file);
+		BX_UNUSED(ignore);
 		fclose(file);
 		mem->data[mem->size-1] = '\0';
 		return mem;

premake/example-04-mesh.lua

@@ -6,6 +6,7 @@ project "example-04-mesh"
 
 	defines {
 		"OPENCTM_STATIC",
+		"OPENCTM_NO_CPP",
 	}
 
 	includedirs {

premake/openctm.lua

@@ -6,6 +6,7 @@ project "openctm"
 
 	defines {
 		"OPENCTM_STATIC",
+		"OPENCTM_NO_CPP",
 	}
 
 	includedirs {