medfall

commit 6370d0a572928bbfd3b8cae8a570dfc4915bbbe6
parent b4c50e6c966d0860d5c5d82c8bb269039972d326
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sun Apr 30 13:54:26 +0300

tinyobjloader fixes

Diffstat:
libs/tinyobjloader.mk
 | 
4
+---
libs/tinyobjloader/tinyobjloader.h
 | 
2
+-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/libs/tinyobjloader.mk b/libs/tinyobjloader.mk
@@ -1,8 +1,6 @@
 libtinyobjloader.a: libs/tinyobjloader/tinyobjloader.o
 
-libs/tinyobjloader/tinyobjloader.o: CXXFLAGS = -O2
-
 clean: clean-tinyobjloader
 
 clean-tinyobjloader:
-	rm -f libs/squish/tinyobjloader.o
+	rm -f libs/tinyobjloader/*.o
diff --git a/libs/tinyobjloader/tinyobjloader.h b/libs/tinyobjloader/tinyobjloader.h
@@ -112,7 +112,7 @@ extern void tinyobj_materials_free(tinyobj_material_t *materials,
 #include <string.h>
 
 
-#define TINYOBJ_MAX_FACES_PER_F_LINE (16)
+#define TINYOBJ_MAX_FACES_PER_F_LINE (32)
 
 #define IS_SPACE(x) (((x) == ' ') || ((x) == '\t'))
 #define IS_DIGIT(x) ((unsigned int)((x) - '0') < (unsigned int)(10))