Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Travis fix

Browse Source
This commit is contained in:
Nekotekina
2017-04-12 12:24:35 +03:00
parent 3ce7947dd3
commit af8d7b9e4e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -94,7 +94,7 @@ addons:
after_success: after_success:
- if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "$TRAVIS_OS_NAME" = linux ]; then coveralls --extension .c --extension .cpp --extension .h; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "$TRAVIS_OS_NAME" = linux ]; then coveralls --extension .c --extension .cpp --extension .h; fi
- if [ "$TRAVIS_BRANCH" = "master" ]; then zip -r9 rpcs3.zip bin; curl ${UPLOAD_URL}${TRAVIS_COMMIT:0:7}-${TRAVIS_BUILD_NUMBER}-${CC} --upload-file rpcs3.zip; fi - if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then zip -r9 rpcs3.zip bin; curl ${UPLOAD_URL}${TRAVIS_COMMIT:0:7}-${TRAVIS_BUILD_NUMBER}-${CC} --upload-file rpcs3.zip; fi
deploy: deploy:
provider: releases provider: releases
rpcs3/CMakeLists.txt
+1
View File
@@ -72,6 +72,7 @@ if(NOT WIN32)
add_definitions(-DGLX_GLXEXT_PROTOTYPES) add_definitions(-DGLX_GLXEXT_PROTOTYPES)
endif() endif()
set(wxWidgets_USE_STATIC ON)
find_package(wxWidgets COMPONENTS core base net aui gl xml REQUIRED) find_package(wxWidgets COMPONENTS core base net aui gl xml REQUIRED)
if(NOT MSVC) if(NOT MSVC)
if(APPLE) if(APPLE)