Skip to content

Commit

Permalink
Temporary disabled samples & unity plugin build on linux; added .trav…
Browse files Browse the repository at this point in the history
…is.yml script
  • Loading branch information
TheMostDiligent committed Dec 20, 2017
1 parent 143ba33 commit 4ad5783
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
30 changes: 30 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
sudo: required

language: cpp

compiler:
#- clang
- gcc

os:
- linux

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-7.2
- g++-7.2
- cmake


script:
# Link gcc-6 and g++-6 to their standard commands
- sudo ln -s /usr/bin/gcc-7.2 /usr/local/bin/gcc
- sudo ln -s /usr/bin/g++-7.2 /usr/local/bin/g++
# Export CC and CXX to tell cmake which compiler to use
- export CC=/usr/bin/gcc-6
- export CXX=/usr/bin/g++-6
# Check versions of gcc, g++ and cmake
- gcc -v && g++ -v && cmake --version
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ project(DiligentEngine)

add_subdirectory(DiligentCore)
add_subdirectory(DiligentTools)
if(NOT PLATFORM_LINUX) # !!!! TEMPORARY !!!!
add_subdirectory(DiligentSamples)
add_subdirectory(Projects)
add_subdirectory(unityplugin)
endif() # !!!! TEMPORARY !!!!

if(PLATFORM_WIN32)
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT Asteroids)
Expand Down

0 comments on commit 4ad5783

Please sign in to comment.