merge preview into master #1439
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… the bottom of screen (like A1000)
…mes work properly on them
This option allows you to set the window scaling for the GUI window. The default option is 1.0, which is the normal 100% scaling. The value is a float, so you can dynamically set it to whatever you need, depending on your monitor's resolution. For example, you can set it to: 1.250 = 125% 1.50 = 150% 2.0 = 200%
…al blanking bits (merged from WinUAE)
the --cdimage option does not change configuration, only inserts the CD. The help text did not clearly reflect that
…#1326) Some widgets were not greyed out when disabled
…1326) The MMU and CPU Data Cache options were not visibly disabled as they should
… floppybridge) From now on, external libraries such as the CAPSimg.so and libfloppybridge.so, will live in a separate directory named "plugins". This cleans up the main dir from such files. The new path is added to the GUI (Paths) and config files accordingly. The default value is <start_path>/plugins. The Makefile will now build floppybridge by default - CAPSimg is a submodule, so it needs to be checked out before it can be built. MacOS is a special case, since the libs there should be under the Resources folder. So, we're leaving that as-is for now.
* ci: Cmake builds would fail if started under a subdir * ci: add cmake files needed for bullseye * ci: updated macOS include directories * ci: fix compiler error under clang/macOS * ci: remove unused linker flag * ci: add cmake in macOS homebrew
Well, most of them anyway
This reverts commit e822fe8.
these are already installed in the runner environment anyway
* modify CMakeLists.txt to be able to build packages for MacOS and Linux * Moved pull request template to .github dir * Moved code of conduct file under .github directory * Removed gitmodules file * Moved install extra dirs to only if we're not building an Apple bundle * Added first version of a Deb package option to CPack * Fixed double directory creation during installation/packaging * Remove debian directory We won't be using this, going for CPack instead * Fixed package version * Clean up contents of packages * Fix dependencies and filename of .deb package * Bump version to 6.3.5 * Add desktop file for Deb package * Remove archive generator, the DEB one is good enough * Change pipeline to use CMake for Linux targets Let's generate some .deb files! This is most likely missing stuff, like the distro name... * Fix incorrect architecture names in cross-compiler * Fix 32-bit arm package architecture * ci: Allow 32-bit arm builds * ci: disable the bullseye builds for now Until we figure out a solution with Bullseye + CMake + SDL2_image/SDL2_ttf * ci: fix expected targets * ci: bring back bullseye builds * Remove path from desktop shortcut * Fixed typo in comment * Set the version in the Project, use that for CPack * Updated compiled and linker flags with no-pie properly - There were some differences between the Makefile flags and CMake. Now they are identical - Updated the Findmpg123.cmake file with the latest one from upstream * Include bullseye build targets again
…xpecting 4 not the 1 listed. (#1434)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.