timw4mail
/
Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another try at fixing travis build

This commit is contained in:
Tim Warren 2015-06-01 09:34:26 -04:00
parent 55d0d6fae5
commit c70ac21da4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -8,7 +8,7 @@ before_install:
# Upgrade gcc # Upgrade gcc
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get -qq update - sudo apt-get -qq update
- sudo apt-get -qq install g++-4.8 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 98
# Install dependencies # Install dependencies
- sudo apt-get -qq install libwxgtk3.0-dev libwxgtk3.0-0 libssh2-1-dev - sudo apt-get -qq install libwxgtk3.0-dev libwxgtk3.0-0 libssh2-1-dev

4
Makefile
View File

@ -45,12 +45,12 @@ endif
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
CXXFLAGS += -static CXXFLAGS += -static
CXX += -std=gnu++11 -Wno-unknown-pragmas -Wno-missing-field-initializers -I/include -DWIN32 CXX += -std=gnu++11 -Wno-unknown-pragmas -Wno-missing-field-initializers -DWIN32
LDLIBS += -L/lib -lwsock32 LDLIBS += -L/lib -lwsock32
endif endif
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
CXX += -std=c++11 CXX += -std=c++11 -Wno-unknown-pragmas -Wno-missing-field-initializers
endif endif
CXX += -Iinclude -I. -I/usr/local/include CXX += -Iinclude -I. -I/usr/local/include