archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Finalize AppImage build

Browse source
This commit is contained in:
Zion Nimchuk 2017-07-04 11:48:58 -07:00 • committed by Ani
parent d793f8ad78
commit 78fad1a372
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
.travis.yml
View file

@ -31,7 +31,7 @@ matrix:
compiler: gcc compiler: gcc
include: include:
- os: linux - os: linux
compiler: gcc compiler: clang
env: WITHOUT_LLVM="yes" env: WITHOUT_LLVM="yes"
@ -39,6 +39,9 @@ git:
submodules: false submodules: false
before_install: before_install:
- if [ "$CC" = "clang" ]; then
export CXX="clang++-4.0" CC="clang-4.0";
fi;
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ]; then - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ]; then
export CXX="g++-5" CC="gcc-5" CXXFLAGS="-Wno-format-security"; export CXX="g++-5" CC="gcc-5" CXXFLAGS="-Wno-format-security";
export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'; export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01';
@ -74,8 +77,8 @@ before_script:
fi; fi;
- make -j 3 - make -j 3
- # AppImage generation - # AppImage generation
- if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then - if [ "$TRAVIS_BRANCH" = "master" ] && [ "$CC" = "clang-4.0" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
export LD_LIBRARY_PATH=/opt/qt59/lib/:$LD_LIBRARY_PATH ; export LD_LIBRARY_PATH=${PWD}/3rdparty/libpng:/opt/qt59/lib/:$LD_LIBRARY_PATH ;
make DESTDIR=appdir install ; find appdir/ ; make DESTDIR=appdir install ; find appdir/ ;
find ../bin ; find ../bin ;
wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" ; wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" ;
@ -85,7 +88,10 @@ before_script:
./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage ; ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage ;
find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq ; find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq ;
zip -r9 rpcs3.zip ./RPCS3*.AppImage; zip -r9 rpcs3.zip ./RPCS3*.AppImage;
curl ${UPLOAD_URL}${TRAVIS_COMMIT:0:7}-${TRAVIS_BUILD_NUMBER}-${CC}_linux64 --upload-file rpcs3.zip; if [ -z "$WITHOUT_LLVM" ]; then
export LLVM="-LLVM";
fi;
curl ${UPLOAD_URL}${TRAVIS_COMMIT:0:7}-${TRAVIS_BUILD_NUMBER}${LLVM}_linux64 --upload-file rpcs3.zip;
fi; fi;
script: script:
@ -111,6 +117,7 @@ addons:
- libc6-dev - libc6-dev
- llvm-4.0 - llvm-4.0
- llvm-4.0-dev - llvm-4.0-dev
- clang-4.0
- libedit-dev - libedit-dev
- g++-5 - g++-5
- gcc-5 - gcc-5

5
rpcs3/CMakeLists.txt
View file

@ -94,6 +94,11 @@ if(NOT MSVC)
add_compile_options(-msse -msse2 -mcx16 -mssse3) add_compile_options(-msse -msse2 -mcx16 -mssse3)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# This fixes 'some' of the st11range issues. See issue #2516
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -image-base=0x10000")
endif()
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
else() else()