From 3e50086d19d4934cac501cfa4f9a2db57ae4e1a2 Mon Sep 17 00:00:00 2001 From: Sacha Date: Tue, 10 Jun 2014 02:51:23 +1000 Subject: [PATCH] Travis: update. Fix screenshots in Qt --- .travis.yml | 12 ++++++------ Blackberry/bb.toolchain.cmake | 4 ++-- UI/NativeApp.cpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2680363665..fe84f16322 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,21 +26,21 @@ before_install: # Travis uses CMake 2.8.7. We require 2.8.8. Grab latest - if [ "$CMAKE" == "TRUE" ]; then 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/v2.8/cmake-2.8.12.2-Linux-i386.sh && + chmod a+x cmake-2.8.12.2-Linux-i386.sh && + sudo ./cmake-2.8.12.2-Linux-i386.sh --skip-license --prefix=/usr; fi install: # Linux Setup - if [ "$PPSSPP_BUILD_TYPE" == "Linux" ]; then + sudo apt-get install libsdl1.2-dev -qq && if [[ "$CXX" == g++ ]]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && sudo apt-get update && sudo apt-get install g++-4.8 -qq && export CXX="g++-4.8" CC="gcc-4.8"; - fi - sudo apt-get install libsdl1.2-dev -qq; + fi; # Android NDK - elif [ "$PPSSPP_BUILD_TYPE" == "Android" ]; then NDK_VER=android-ndk-r9b && @@ -52,7 +52,7 @@ install: - elif [ "$PPSSPP_BUILD_TYPE" == "Blackberry" ]; then download_extract http://downloads.blackberry.com/upr/developers/update/bbndk/10_3_beta/ndktarget_10.3.0.440/ndktargetrepo_10.3.0.440/packages/bbndk.linux.libraries.10.3.0.440.tar.gz libs.tar.gz && download_extract http://downloads.blackberry.com/upr/developers/update/bbndk/10_3_beta/ndktarget_10.3.0.440/ndktargetrepo_10.3.0.440/packages/bbndk.linux.tools.10.3.0.2702.tar.gz tools.tar.gz && - export QNX_TARGET="$(pwd)/target_10_3_0_440/qnx6" QNX_HOST="$(pwd)/host_10_3_0_2702/linux/x86" CXX="arm-unknown-nto8.0.0eabi-g++-4.8.2" CC="arm-unknown-nto8.0.0eabi-gcc-4.8.2" && PATH="$QNX_HOST/usr/bin:$PATH"; + export QNX_TARGET="$(pwd)/target_10_3_0_440/qnx6" QNX_HOST="$(pwd)/host_10_3_0_2702/linux/x86" && PATH="$QNX_HOST/usr/bin:$PATH"; # Symbian NDK: Belle - elif [ "$PPSSPP_BUILD_TYPE" == "Symbian" ]; then sudo apt-get install lib32stdc++6 lib32bz2-1.0 -qq && diff --git a/Blackberry/bb.toolchain.cmake b/Blackberry/bb.toolchain.cmake index 381e3cf544..98cfe1f43b 100644 --- a/Blackberry/bb.toolchain.cmake +++ b/Blackberry/bb.toolchain.cmake @@ -17,8 +17,8 @@ set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) include (CMakeForceCompiler) -CMAKE_FORCE_C_COMPILER (nto${CMAKE_SYSTEM_PROCESSOR}-gcc nto${CMAKE_SYSTEM_PROCESSOR}-gcc) -CMAKE_FORCE_CXX_COMPILER (nto${CMAKE_SYSTEM_PROCESSOR}-g++ nto${CMAKE_SYSTEM_PROCESSOR}-g++) +CMAKE_FORCE_C_COMPILER (nto${CMAKE_SYSTEM_PROCESSOR}-gcc-4.8.2 nto${CMAKE_SYSTEM_PROCESSOR}-gcc-4.8.2) +CMAKE_FORCE_CXX_COMPILER (nto${CMAKE_SYSTEM_PROCESSOR}-g++-4.8.2 nto${CMAKE_SYSTEM_PROCESSOR}-g++-4.8.2) set (CMAKE_COMPILER_IS_GNUCXX True) execute_process( COMMAND nto${CMAKE_SYSTEM_PROCESSOR}-gcc --version OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 1df442068d..9fc650d648 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -33,7 +33,7 @@ #include #endif -#ifdef _WIN32 +#if defined(_WIN32) || (defined(USING_QT_UI) && !defined(MOBILE_DEVICE)) #include #include "ext/jpge/jpge.h" #endif @@ -540,7 +540,7 @@ void NativeShutdownGraphics() { void TakeScreenshot() { g_TakeScreenshot = false; -#ifdef _WIN32 +#if defined(_WIN32) || (defined(USING_QT_UI) && !defined(MOBILE_DEVICE)) mkDir(g_Config.memCardDirectory + "/PSP/SCREENSHOT"); // First, find a free filename.