Skip to content
This repository has been archived by the owner on Apr 28, 2022. It is now read-only.

Commit

Permalink
Merge pull request #26 from hunter-packages/pr.linux
Browse files Browse the repository at this point in the history
Fix Linux
  • Loading branch information
ruslo authored Sep 12, 2017
2 parents 6944ad4 + c75cfba commit 429e2c3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
12 changes: 9 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

# Original: https://github.com/forexample/hunter-simple/blob/master/.travis.yml

# Workaround for https://github.com/travis-ci/travis-ci/issues/8363
language:
- cpp
- minimal

# Container-based infrastructure (Linux)
# * https://docs.travis-ci.com/user/migrating-from-legacy/#How-can-I-use-container-based-infrastructure%3F
Expand All @@ -24,6 +25,9 @@ addons:
- libegl1-mesa-dev
- libosmesa6-dev

# glapi
- libgl1-mesa-dev

# xorg-macros: https://github.com/BlueDragonX/xf86-input-mtrack/issues/27#issuecomment-186871891
- xutils-dev
- xserver-xorg-dev-lts-trusty
Expand All @@ -33,6 +37,8 @@ addons:
- libstdc++6:i386
- zlib1g:i386

- python3-pip

# Default GCC 4.8 is buggy:
# * https://github.com/elucideye/drishti/issues/273#issuecomment-301297286
#- g++-5
Expand All @@ -46,8 +52,8 @@ matrix:
include:
# Linux {

# - os: linux
# env: CONFIG=Release TOOLCHAIN=gcc INSTALL=--strip MESA=ON TEST=--test
- os: linux
env: CONFIG=Release TOOLCHAIN=gcc INSTALL=--strip MESA=ON TEST=--test

# }

Expand Down
1 change: 1 addition & 0 deletions ogles_gpgpu/common/gl/pbo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include <iostream>
#include <sstream>
#include <cstring> // memcpy

#include <stdlib.h>

Expand Down

0 comments on commit 429e2c3

Please sign in to comment.