diff --git a/examples/raytrace/bin/native/Release/view b/examples/raytrace/bin/native/Release/view deleted file mode 100755 index bd3a59f..0000000 Binary files a/examples/raytrace/bin/native/Release/view and /dev/null differ diff --git a/examples/raytrace/obj-loader.cc b/examples/raytrace/obj-loader.cc index bbda161..d55fb45 100644 --- a/examples/raytrace/obj-loader.cc +++ b/examples/raytrace/obj-loader.cc @@ -28,7 +28,6 @@ #endif #endif -#define STB_IMAGE_IMPLEMENTATION #include "stb_image.h" #ifdef __clang__ diff --git a/examples/raytrace/premake5.lua b/examples/raytrace/premake5.lua index e16dc89..2344919 100644 --- a/examples/raytrace/premake5.lua +++ b/examples/raytrace/premake5.lua @@ -13,6 +13,7 @@ sources = { "render.cc", "render-config.cc", "obj-loader.cc", + "gltf-loader.cc", "matrix.cc", "../common/trackball.cc", "../common/imgui/imgui.cpp", diff --git a/examples/raytrace/viwewer.make b/examples/raytrace/viwewer.make index e341427..35720e7 100644 --- a/examples/raytrace/viwewer.make +++ b/examples/raytrace/viwewer.make @@ -180,6 +180,7 @@ OBJECTS := \ $(OBJDIR)/imgui_draw.o \ $(OBJDIR)/imgui_impl_btgui.o \ $(OBJDIR)/trackball.o \ + $(OBJDIR)/gltf-loader.o \ $(OBJDIR)/main.o \ $(OBJDIR)/matrix.o \ $(OBJDIR)/obj-loader.o \ @@ -292,6 +293,14 @@ else $(SILENT) mkdir $(subst /,\\,$(OBJDIR)) endif $(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 @echo $(notdir $<) ifeq (posix,$(SHELLTYPE))