GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-11 13:48:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Build the tinygltf loader code

Browse Source 
Also remove the implementation of STB-Image from obj-loader.cc

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
This commit is contained in:
Arthur Brainville (Ybalrid) 2018-02-18 19:55:02 +01:00
parent 90ff6f7ce9
commit 75af411fda
No known key found for this signature in database
GPG Key ID: BC05C4812A06BCF3
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
examples/raytrace/bin/native/Release/view
View File

Binary file not shown.

1
examples/raytrace/obj-loader.cc
View File

@ -28,7 +28,6 @@
#endif #endif
#endif #endif
#define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h" #include "stb_image.h"
#ifdef __clang__ #ifdef __clang__

1
examples/raytrace/premake5.lua
View File

@ -13,6 +13,7 @@ sources = {
"render.cc", "render.cc",
"render-config.cc", "render-config.cc",
"obj-loader.cc", "obj-loader.cc",
"gltf-loader.cc",
"matrix.cc", "matrix.cc",
"../common/trackball.cc", "../common/trackball.cc",
"../common/imgui/imgui.cpp", "../common/imgui/imgui.cpp",

9
examples/raytrace/viwewer.make
View File

@ -180,6 +180,7 @@ OBJECTS := \
$(OBJDIR)/imgui_draw.o \ $(OBJDIR)/imgui_draw.o \
$(OBJDIR)/imgui_impl_btgui.o \ $(OBJDIR)/imgui_impl_btgui.o \
$(OBJDIR)/trackball.o \ $(OBJDIR)/trackball.o \
$(OBJDIR)/gltf-loader.o \
$(OBJDIR)/main.o \ $(OBJDIR)/main.o \
$(OBJDIR)/matrix.o \ $(OBJDIR)/matrix.o \
$(OBJDIR)/obj-loader.o \ $(OBJDIR)/obj-loader.o \
@ -292,6 +293,14 @@ else
$(SILENT) mkdir $(subst /,\\,$(OBJDIR)) $(SILENT) mkdir $(subst /,\\,$(OBJDIR))
endif endif
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
$(OBJDIR)/gltf-loader.o: gltf-loader.cc
@echo $(notdir $<)
ifeq (posix,$(SHELLTYPE))
$(SILENT) mkdir -p $(OBJDIR)
else
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
endif
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
$(OBJDIR)/main.o: main.cc $(OBJDIR)/main.o: main.cc
@echo $(notdir $<) @echo $(notdir $<)
ifeq (posix,$(SHELLTYPE)) ifeq (posix,$(SHELLTYPE))