diff --git a/.gitignore b/.gitignore index 11c9714..360bcb4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,10 @@ install_manifest.txt compile_commands.json CTestTestfile.cmake +#Files created by the CI scripts (downloading and installing premake) +premake5 +premake5.tar.gz + # Prerequisites *.d diff --git a/.travis-before-install.sh b/.travis-before-install.sh new file mode 100755 index 0000000..ea6615a --- /dev/null +++ b/.travis-before-install.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ "$TRAVIS_OS_NAME" == "osx" ]] +then + brew upgrade + curl -o premake5.tar.gz https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-macosx.tar.gz +else + wget https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-linux.tar.gz -O premake5.tar.gz +fi +tar xzf premake5.tar.gz diff --git a/.travis.yml b/.travis.yml index 08acd20..6e731e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ matrix: env: COMPILER_VERSION=3.7 BUILD_TYPE=Debug CFLAGS="-O0" CXXFLAGS="-O0" before_install: -- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi + - ./.travis-before-install.sh script: @@ -42,3 +42,6 @@ script: - ${CC} -v - ${CXX} ${EXTRA_CXXFLAGS} -std=c++11 -Wall -g -o loader_example loader_example.cc - ./loader_example ./models/Cube/Cube.gltf + - cd examples/raytrace + - ../../premake5 gmake + - make diff --git a/appveyor.yml b/appveyor.yml index 8a027f8..545253e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,3 +13,6 @@ configuration: Release build: parallel: true project: TinyGLTFSolution.sln + +after_build: + - examples.bat diff --git a/examples.bat b/examples.bat new file mode 100644 index 0000000..11e35e7 --- /dev/null +++ b/examples.bat @@ -0,0 +1,3 @@ + cd examples\raytrace + ..\..\tools\windows\premake5.exe vs2015 + msbuild NanoSGSolution.sln /property:Configuration=Release diff --git a/examples/raytrace/bin/native/Release/view b/examples/raytrace/bin/native/Release/view new file mode 100755 index 0000000..f9e8a0f Binary files /dev/null and b/examples/raytrace/bin/native/Release/view differ diff --git a/examples/raytrace/imgui.ini b/examples/raytrace/imgui.ini index d72fd2f..b77e47f 100644 --- a/examples/raytrace/imgui.ini +++ b/examples/raytrace/imgui.ini @@ -19,7 +19,7 @@ Size=256,206 Collapsed=0 [Transform] -Pos=579,636 +Pos=608,278 Size=235,167 Collapsed=0 diff --git a/examples/raytrace/premake5.lua b/examples/raytrace/premake5.lua index 0562343..d035674 100644 --- a/examples/raytrace/premake5.lua +++ b/examples/raytrace/premake5.lua @@ -60,7 +60,6 @@ solution "NanoSGSolution" end if os.is("Windows") then - flags { "FatalCompileWarnings" } warnings "Extra" -- /W4 defines { "NOMINMAX" } diff --git a/examples/raytrace/viwewer.make b/examples/raytrace/viwewer.make index 35720e7..3d35b1b 100644 --- a/examples/raytrace/viwewer.make +++ b/examples/raytrace/viwewer.make @@ -186,6 +186,7 @@ OBJECTS := \ $(OBJDIR)/obj-loader.o \ $(OBJDIR)/render-config.o \ $(OBJDIR)/render.o \ + $(OBJDIR)/stbi-impl.o \ RESOURCES := \ @@ -341,6 +342,14 @@ else $(SILENT) mkdir $(subst /,\\,$(OBJDIR)) endif $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" +$(OBJDIR)/stbi-impl.o: stbi-impl.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 "$<" -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH))