Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Optimise travis a bit more. Use Cmake 3.0. Also drop rPlatform from s…

…tdafx.
  • Loading branch information...
commit 51bb9dced4198fee60b783598e90533fac9baeb2 1 parent 8793d75
xsacha xsacha authored
9 .travis.yml
View
@@ -19,13 +19,12 @@ before_install:
- sudo apt-get install libwxgtk3.0-dev libopenal-dev freeglut3-dev libglew-dev
- sudo apt-get install aria2 -qq
- download_extract() { aria2c -x 16 $1 -o $2 && tar -xf $2; }
+ - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; export CXX="g++-4.8" CC="gcc-4.8"; else sudo apt-get install libstdc++-4.8-dev; fi
# Travis uses CMake 2.8.7. We require 2.8.8. Grab latest
- - sudo apt-get install -qq g++-4.8
- - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
- sudo apt-get install lib32stdc++6 -qq &&
- aria2c -x 16 http://www.cmake.org/files/v2.8/cmake-2.8.12.1-Linux-i386.sh &&
- chmod a+x cmake-2.8.12.1-Linux-i386.sh &&
- sudo ./cmake-2.8.12.1-Linux-i386.sh --skip-license --prefix=/usr;
+ aria2c -x 16 http://www.cmake.org/files/v3.0/cmake-3.0.0-Linux-i386.sh &&
+ chmod a+x cmake-3.0.0-Linux-i386.sh &&
+ sudo ./cmake-3.0.0-Linux-i386.sh --skip-license --prefix=/usr;
before_script:
- git submodule update --init asmjit ffmpeg
1  rpcs3/Emu/GS/GL/GLGSRender.h
View
@@ -1,6 +1,7 @@
#pragma once
#include "Emu/GS/GSRender.h"
#include "Emu/GS/RSXThread.h"
+#include "Utilities/rPlatform.h"
#include "GLBuffers.h"
#include "GLProgramBuffer.h"
2  rpcs3/Emu/Io/Keyboard.cpp
View
@@ -38,4 +38,4 @@ void KeyboardManager::Close()
m_keyboard_handler = nullptr;
m_inited = false;
-}
+}
2  rpcs3/Emu/Io/Mouse.cpp
View
@@ -38,4 +38,4 @@ void MouseManager::Close()
m_mouse_handler = nullptr;
m_inited = false;
-}
+}
1  rpcs3/Ini.cpp
View
@@ -2,7 +2,6 @@
#include "Ini.h"
#include "Utilities/StrFmt.h"
-#include "Utilities/rPlatform.h"
#include <algorithm>
#include <cctype>
3  rpcs3/Ini.h
View
@@ -1,7 +1,8 @@
#pragma once
#include <utility>
-#include "../Utilities/simpleini/SimpleIni.h"
+#include "Utilities/rPlatform.h"
+#include "Utilities/simpleini/SimpleIni.h"
//TODO: make thread safe/remove static singleton
CSimpleIniCaseA *getIniFile();
1  rpcs3/stdafx.h
View
@@ -69,7 +69,6 @@ typedef int64_t s64;
#include "Utilities/rXml.h"
#include "Utilities/rConcurrency.h"
#include "Utilities/rMsgBox.h"
-#include "Utilities/rPlatform.h"
#include "Utilities/Thread.h"
#include "Utilities/Array.h"
#include "Utilities/Timer.h"
Please sign in to comment.
Something went wrong with that request. Please try again.