diff options
| -rwxr-xr-x | .travis-build.sh | 3 | ||||
| -rwxr-xr-x | .travis-deps.sh | 3 | ||||
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | appveyor.yml | 10 | ||||
| -rw-r--r-- | src/citra_qt/configure_dialog.cpp | 8 | ||||
| -rw-r--r-- | src/citra_qt/configure_dialog.h | 3 | ||||
| -rw-r--r-- | src/citra_qt/configure_system.cpp | 6 | ||||
| -rw-r--r-- | src/citra_qt/configure_system.h | 2 | ||||
| -rw-r--r-- | src/citra_qt/main.cpp | 2 |
9 files changed, 23 insertions, 15 deletions
diff --git a/.travis-build.sh b/.travis-build.sh index 8440b4f5c..80361ddaf 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -23,11 +23,12 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then elif [ "$TRAVIS_OS_NAME" = "osx" ]; then set -o pipefail + export MACOSX_DEPLOYMENT_TARGET=10.9 export Qt5_DIR=$(brew --prefix)/opt/qt5 mkdir build && cd build cmake .. -GXcode - xcodebuild -configuration Release | xcpretty -c + xcodebuild -configuration Release ctest -VV -C Release fi diff --git a/.travis-deps.sh b/.travis-deps.sh index aad9074bf..b0833f74a 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -20,7 +20,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then ) elif [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update > /dev/null # silence the very verbose output - brew unlink cmake + brew unlink cmake || true brew install cmake qt5 sdl2 dylibbundler - gem install xcpretty fi diff --git a/.travis.yml b/.travis.yml index 8be395770..a693e70aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ matrix: dist: trusty - os: osx sudo: false + osx_image: xcode7.3 env: global: diff --git a/appveyor.yml b/appveyor.yml index 28c902bee..0ffb680ff 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,7 +42,16 @@ on_success: $GITREV = $(git show -s --format='%h') # Where are these spaces coming from? Regardless, let's remove them $BUILD_NAME = "citra-${GITDATE}-${GITREV}-windows-amd64.7z" -replace " ","" + $BUILD_NAME_PDB = "citra-${GITDATE}-${GITREV}-windows-amd64-debugsymbols.7z" -replace " ","" $BUILD_NAME_NOQT = "citra-noqt-${GITDATE}-${GITREV}-windows-amd64.7z" -replace " ","" + + # Remove unnecessary files + rm .\build\bin\release\*tests* + + # Put the pdb files in a separate archive and remove them from the main download + 7z a $BUILD_NAME_PDB .\build\bin\release\*.pdb + rm .\build\bin\release\*.pdb + # Zip up the build folder and documentation 7z a $BUILD_NAME .\build\bin\release\* .\license.txt .\README.md # Do a second archive with only the binaries (excludes dlls) and documentation @@ -57,5 +66,6 @@ on_success: "open sftp://citra-builds:${env:BUILD_PASSWORD}@builds.citra-emu.org -hostkey=*" ` "put $BUILD_NAME /citra/nightly/windows-amd64/" ` "put $BUILD_NAME_NOQT /citra/nightly/windows-noqt-amd64/" ` + "put $BUILD_NAME_PDB /citra/nightly/windows-amd64-debugsymbols/" ` "exit" } diff --git a/src/citra_qt/configure_dialog.cpp b/src/citra_qt/configure_dialog.cpp index 7da8ad067..016f201ef 100644 --- a/src/citra_qt/configure_dialog.cpp +++ b/src/citra_qt/configure_dialog.cpp @@ -9,10 +9,9 @@ #include "core/settings.h" -ConfigureDialog::ConfigureDialog(QWidget *parent, bool running) : +ConfigureDialog::ConfigureDialog(QWidget *parent) : QDialog(parent), - ui(new Ui::ConfigureDialog), - emulation_running(running) + ui(new Ui::ConfigureDialog) { ui->setupUi(this); this->setConfiguration(); @@ -22,9 +21,6 @@ ConfigureDialog::~ConfigureDialog() { } void ConfigureDialog::setConfiguration() { - // System tab needs set manually - // depending on whether emulation is running - ui->systemTab->setConfiguration(emulation_running); } void ConfigureDialog::applyConfiguration() { diff --git a/src/citra_qt/configure_dialog.h b/src/citra_qt/configure_dialog.h index 305b33bdf..e232699cd 100644 --- a/src/citra_qt/configure_dialog.h +++ b/src/citra_qt/configure_dialog.h @@ -16,7 +16,7 @@ class ConfigureDialog : public QDialog Q_OBJECT public: - explicit ConfigureDialog(QWidget *parent, bool emulation_running); + explicit ConfigureDialog(QWidget *parent); ~ConfigureDialog(); void applyConfiguration(); @@ -26,5 +26,4 @@ private: private: std::unique_ptr<Ui::ConfigureDialog> ui; - bool emulation_running; }; diff --git a/src/citra_qt/configure_system.cpp b/src/citra_qt/configure_system.cpp index 4f0d4dbfe..55d964242 100644 --- a/src/citra_qt/configure_system.cpp +++ b/src/citra_qt/configure_system.cpp @@ -8,6 +8,7 @@ #include "core/hle/service/fs/archive.h" #include "core/hle/service/cfg/cfg.h" +#include "core/system.h" static const std::array<int, 12> days_in_month = {{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 @@ -17,6 +18,7 @@ ConfigureSystem::ConfigureSystem(QWidget *parent) : QWidget(parent), ui(new Ui::ConfigureSystem) { ui->setupUi(this); + this->setConfiguration(); connect(ui->combo_birthmonth, SIGNAL(currentIndexChanged(int)), SLOT(updateBirthdayComboBox(int))); } @@ -24,8 +26,8 @@ ConfigureSystem::ConfigureSystem(QWidget *parent) : ConfigureSystem::~ConfigureSystem() { } -void ConfigureSystem::setConfiguration(bool emulation_running) { - enabled = !emulation_running; +void ConfigureSystem::setConfiguration() { + enabled = !System::IsPoweredOn(); if (!enabled) { ReadSystemSettings(); diff --git a/src/citra_qt/configure_system.h b/src/citra_qt/configure_system.h index 1f5577070..f02d2d949 100644 --- a/src/citra_qt/configure_system.h +++ b/src/citra_qt/configure_system.h @@ -20,7 +20,7 @@ public: ~ConfigureSystem(); void applyConfiguration(); - void setConfiguration(bool emulation_running); + void setConfiguration(); public slots: void updateBirthdayComboBox(int birthmonth_index); diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 9fd4482f6..cf467532f 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -510,7 +510,7 @@ void GMainWindow::ToggleWindowMode() { } void GMainWindow::OnConfigure() { - ConfigureDialog configureDialog(this, emulation_running); + ConfigureDialog configureDialog(this); auto result = configureDialog.exec(); if (result == QDialog::Accepted) { |