diff --git a/.github/workflows/cd_main.yml b/.github/workflows/cd_main.yml index a4b0b84..68d379c 100644 --- a/.github/workflows/cd_main.yml +++ b/.github/workflows/cd_main.yml @@ -35,10 +35,16 @@ jobs: shell: bash run: cmake -S . -B build -DCMAKE_INSTALL_PREFIX=install ${{matrix.platform.flags}} ${{matrix.config.flags}} - - name: Build + - name: Build Windows + if: runner.os == 'Windows' shell: bash run: cmake --build build --config Release + - name: Build (not Windows) + if: runner.os != 'Windows' + shell: bash + run: cmake --build build --config Release -j + - name: Pack shell: bash run: cd build && cpack -G ZIP diff --git a/.github/workflows/cd_pr.yml b/.github/workflows/cd_pr.yml index ea676b8..f5c4aff 100644 --- a/.github/workflows/cd_pr.yml +++ b/.github/workflows/cd_pr.yml @@ -30,14 +30,30 @@ jobs: shell: bash run: cmake -S . -B build -DCMAKE_INSTALL_PREFIX=install ${{matrix.platform.flags}} ${{matrix.config.flags}} - - name: Build + - name: Build Windows + if: runner.os == 'Windows' shell: bash run: cmake --build build --config Release + - name: Build (not Windows) + if: runner.os != 'Windows' + shell: bash + run: cmake --build build --config Release -j + - name: Pack shell: bash run: cd build && cpack -G ZIP + - name: Unpack Codesign Repack x64 + if: (runner.os == 'macOS') && (runner.arch == 'x64') + shell: bash + run: setup_scripts/macos_bundle_signature.sh cc3dsfs_macos_x86_64 + + - name: Unpack Codesign Repack Arm64 + if: (runner.os == 'macOS') && (runner.arch == 'ARM64') + shell: bash + run: setup_scripts/macos_bundle_signature.sh cc3dsfs_macos_arm64 + - name: Archive resulting artifact uses: actions/upload-artifact@v3 with: diff --git a/README.md b/README.md index 3c5692a..3710e48 100755 --- a/README.md +++ b/README.md @@ -141,5 +141,4 @@ On Windows, the profiles can be found in the ".config/cc3dsfs" folder inside the ``` frequency = 96000 periods = 2 -period_size = 64 ``` diff --git a/include/Menus/ResolutionMenu.hpp b/include/Menus/ResolutionMenu.hpp index daccfff..2ae77f6 100755 --- a/include/Menus/ResolutionMenu.hpp +++ b/include/Menus/ResolutionMenu.hpp @@ -16,7 +16,7 @@ public: ResolutionMenu(bool font_load_success, sf::Font &text_font); ~ResolutionMenu(); void prepare(float scaling_factor, int view_size_x, int view_size_y, int fullscreen_mode_width, int fullscreen_mode_height); - void insert_data(std::vector* possible_resolutions); + void insert_data(std::vector* possible_resolutions, const sf::VideoMode &desktop_resolution); int selected_index = RESOLUTION_MENU_NO_ACTION; void reset_output_option(); protected: @@ -27,5 +27,6 @@ protected: private: std::vector* possible_resolutions; sf::VideoMode get_resolution(int index); + sf::VideoMode desktop_resolution; }; #endif diff --git a/source/Menus/ResolutionMenu.cpp b/source/Menus/ResolutionMenu.cpp index e364fc6..6704aad 100755 --- a/source/Menus/ResolutionMenu.cpp +++ b/source/Menus/ResolutionMenu.cpp @@ -23,8 +23,9 @@ void ResolutionMenu::class_setup() { this->show_title = true; } -void ResolutionMenu::insert_data(std::vector* possible_resolutions) { +void ResolutionMenu::insert_data(std::vector* possible_resolutions, const sf::VideoMode &desktop_resolution) { this->possible_resolutions = possible_resolutions; + this->desktop_resolution = desktop_resolution; this->prepare_options(); } @@ -50,8 +51,7 @@ sf::VideoMode ResolutionMenu::get_resolution(int index) { std::string ResolutionMenu::get_string_option(int index, int action) { sf::VideoMode mode = this->get_resolution(index); if((mode.width == 0) && (mode.height == 0)) { - mode = sf::VideoMode::getDesktopMode(); - return "System Preference (" + std::to_string(mode.width) + " x " + std::to_string(mode.height)+")"; + return "System Preference (" + std::to_string(this->desktop_resolution.width) + " x " + std::to_string(this->desktop_resolution.height) + ")"; } return std::to_string(mode.width) + " x " + std::to_string(mode.height); } diff --git a/source/WindowScreen_Menu.cpp b/source/WindowScreen_Menu.cpp index 3850f69..85cc2a5 100755 --- a/source/WindowScreen_Menu.cpp +++ b/source/WindowScreen_Menu.cpp @@ -793,7 +793,7 @@ void WindowScreen::setup_resolution_menu(bool reset_data) { this->curr_menu = RESOLUTION_MENU_TYPE; if(reset_data) this->resolution_menu->reset_data(); - this->resolution_menu->insert_data(&this->possible_resolutions); + this->resolution_menu->insert_data(&this->possible_resolutions, sf::VideoMode::getDesktopMode()); this->last_menu_change_time = std::chrono::high_resolution_clock::now(); } } diff --git a/source/utils.cpp b/source/utils.cpp index 81e0319..62a820a 100755 --- a/source/utils.cpp +++ b/source/utils.cpp @@ -13,7 +13,7 @@ #define str(a) #a #define APP_VERSION_MAJOR 1 -#define APP_VERSION_MINOR 0 +#define APP_VERSION_MINOR 1 #define APP_VERSION_REVISION 0 #ifdef RASPI #define APP_VERSION_LETTER R