medfall

commit 154b57f3b763db030347498436c5cefb0179ade8
parent f7899e648e5a74e8ec00f8795586338a663a436c
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Thu, 30 May 2019 19:20:30 +0300

Build cgltf as a lib

Diffstat:
M
gltf.cc
 | 
1
-
A
libs/cgltf.lua
 | 
1
+
R
libs/cgltf/cgltf.cpp -> libs/cgltf/cgltf.cc
 | 
0

M
make.lua
 | 
3
++-

4 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gltf.cc b/gltf.cc
@@ -9,7 +9,6 @@
 
 #include "platform_time.h"
 
-#define CGLTF_IMPLEMENTATION
 #include "libs/cgltf/cgltf.h"
 
 typedef quat Quaternion;
diff --git a/libs/cgltf.lua b/libs/cgltf.lua
@@ -0,0 +1 @@
+lib( "cgltf", { "libs/cgltf/cgltf" } )
diff --git a/libs/cgltf/cgltf.cpp b/libs/cgltf/cgltf.cc
diff --git a/make.lua b/make.lua
@@ -33,6 +33,7 @@ if OS == "windows" then
 	rc( "elevate_for_update_manifest" )
 end
 
+require( "libs/cgltf" )
 require( "libs/imgui" )
 require( "libs/glfw" )
 require( "libs/lz4" )
@@ -51,7 +52,7 @@ require( "libs/squish" )
 
 -- bin( "bsp", { "main", "bsp", "bsp_renderer", game_objs }, { game_libs } )
 -- bin( "sm", { "main", "shadow_map", game_objs }, { game_libs } )
-bin( "gltf", { "main", "gltf", game_objs }, { game_libs } )
+bin( "gltf", { "main", "gltf", game_objs }, { "cgltf", game_libs } )
 bin( "fullscreen", { "main", "fullscreen", game_objs }, { game_libs } )
 
 msvc_bin_ldflags( "bsp", "opengl32.lib gdi32.lib" )