diff --git a/.travis.yml b/.travis.yml index df60cd4a67..3140c48e22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,7 +94,7 @@ addons: after_success: - 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: provider: releases diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 030e1934f7..c1496d24c6 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -72,6 +72,7 @@ if(NOT WIN32) add_definitions(-DGLX_GLXEXT_PROTOTYPES) endif() +set(wxWidgets_USE_STATIC ON) find_package(wxWidgets COMPONENTS core base net aui gl xml REQUIRED) if(NOT MSVC) if(APPLE)