Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Travis yml #29

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
language: cpp
sudo: required
dist: trusty
addons:
apt:
packages:
- build-essential
- pkg-config
- cmake
- ca-certificates
- g++
- gcc-multilib
- g++-gcc-multilib
- mesa-common-dev
- libedit-dev
- libtinfo-dev
compiler:
- gcc
- clang
git:
depth: 10
before_install:
- echo "before_install"
- df -h
- date
- pwd
- uname -a -m
- gcc --version
- g++ --version
- clang --version
- which clang
- which g++
- git --version
- git tag
- apt-cache show clang build-essential gcc
- lsb_release -a
install:
- echo "install start"
before_script:
- echo "before_script"
script:
- make voglperf64
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ Building voglperf on SteamOS
* `sudo apt-get update`
* `sudo apt-get install git ca-certificates cmake g++ gcc-multilib g++-multilib`
* `sudo apt-get install mesa-common-dev libedit-dev libtinfo-dev libtinfo-dev:i386`
* `sudo apt-get install libedit-dev libedit-dev:i386 libncurses5-dev
libncurses5-dev:i386 libgcc-dev libgcc-dev:i386 lib32gcc-dev libgcc-dev libstdc++-dev libstdc++-dev:i386`

- Get the volgperf source:
* `git clone https://github.com/ValveSoftware/voglperf.git`
Expand Down
24 changes: 20 additions & 4 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,28 @@ build_options_finalize()
#
project(voglperfrun)

# Add libedit library.
include_directories(${CMAKE_SOURCE_DIR}/libedit-3.1/include)
find_library(tinfo_LIBRARY NAMES tinfo curses)

#require tinfo and curses
find_library(curses_LIBRARY NAMES curses )
if(NOT curses_LIBRARY)
message(FATAL_ERROR "Could not find libcurses")
endif()

find_library(tinfo_LIBRARY NAMES tinfo )
if(NOT tinfo_LIBRARY)
message(FATAL_ERROR "Could not find libtinfo")
endif()

find_library(edit_LIBRARY NAMES edit )
if(NOT edit_LIBRARY)
message(FATAL_ERROR "Could not find libedit")
endif()

#
set(LIBEDIT_LIBS
"${CMAKE_SOURCE_DIR}/libedit-3.1/lib/${LIBDIR}/libedit.a"
${edit_LIBRARY}
${tinfo_LIBRARY}
${curses_LIBRARY}
)

set(SRC_LIST
Expand Down
3 changes: 0 additions & 3 deletions src/libedit-3.1/README

This file was deleted.

224 changes: 0 additions & 224 deletions src/libedit-3.1/include/editline/readline.h

This file was deleted.

Loading