Setup CI for raytrace example

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
This commit is contained in:
Arthur Brainville (Ybalrid) 2018-02-18 21:08:33 +01:00
parent c9ec1ea7b6
commit 1340e62848
No known key found for this signature in database
GPG Key ID: BC05C4812A06BCF3
9 changed files with 34 additions and 3 deletions

4
.gitignore vendored
View File

@ -9,6 +9,10 @@ install_manifest.txt
compile_commands.json compile_commands.json
CTestTestfile.cmake CTestTestfile.cmake
#Files created by the CI scripts (downloading and installing premake)
premake5
premake5.tar.gz
# Prerequisites # Prerequisites
*.d *.d

10
.travis-before-install.sh Executable file
View File

@ -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

View File

@ -33,7 +33,7 @@ matrix:
env: COMPILER_VERSION=3.7 BUILD_TYPE=Debug CFLAGS="-O0" CXXFLAGS="-O0" env: COMPILER_VERSION=3.7 BUILD_TYPE=Debug CFLAGS="-O0" CXXFLAGS="-O0"
before_install: before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi - ./.travis-before-install.sh
script: script:
@ -42,3 +42,6 @@ script:
- ${CC} -v - ${CC} -v
- ${CXX} ${EXTRA_CXXFLAGS} -std=c++11 -Wall -g -o loader_example loader_example.cc - ${CXX} ${EXTRA_CXXFLAGS} -std=c++11 -Wall -g -o loader_example loader_example.cc
- ./loader_example ./models/Cube/Cube.gltf - ./loader_example ./models/Cube/Cube.gltf
- cd examples/raytrace
- ../../premake5 gmake
- make

View File

@ -13,3 +13,6 @@ configuration: Release
build: build:
parallel: true parallel: true
project: TinyGLTFSolution.sln project: TinyGLTFSolution.sln
after_build:
- examples.bat

3
examples.bat Normal file
View File

@ -0,0 +1,3 @@
cd examples\raytrace
..\..\tools\windows\premake5.exe vs2015
msbuild NanoSGSolution.sln /property:Configuration=Release

Binary file not shown.

View File

@ -19,7 +19,7 @@ Size=256,206
Collapsed=0 Collapsed=0
[Transform] [Transform]
Pos=579,636 Pos=608,278
Size=235,167 Size=235,167
Collapsed=0 Collapsed=0

View File

@ -60,7 +60,6 @@ solution "NanoSGSolution"
end end
if os.is("Windows") then if os.is("Windows") then
flags { "FatalCompileWarnings" }
warnings "Extra" -- /W4 warnings "Extra" -- /W4
defines { "NOMINMAX" } defines { "NOMINMAX" }

View File

@ -186,6 +186,7 @@ OBJECTS := \
$(OBJDIR)/obj-loader.o \ $(OBJDIR)/obj-loader.o \
$(OBJDIR)/render-config.o \ $(OBJDIR)/render-config.o \
$(OBJDIR)/render.o \ $(OBJDIR)/render.o \
$(OBJDIR)/stbi-impl.o \
RESOURCES := \ RESOURCES := \
@ -341,6 +342,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)/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) -include $(OBJECTS:%.o=%.d)
ifneq (,$(PCH)) ifneq (,$(PCH))