diff options
| author | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2022-05-21 19:54:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-21 19:54:55 +0200 |
| commit | 94b33c924e0524452738e077aea03ba7e8b6302f (patch) | |
| tree | ad2750a5ed078ca15a3d2bc07b241db064ec26f4 /res | |
| parent | 6c7485d01786fe92da4c2760d23e4ee26ce872a3 (diff) | |
Modernize CMake build system (#1434)
These changes modernize the CMake build system to (hopefully) match newer best practices
* Library linking is simpler and more automatic because of using imported targets
* Multi-configuration builds should be supported (Ninja Multi-Config, Visual Studio, etc. generators)
* Clean up build options using cmake_dependent_option
* Let CMake do its job in more cases, like finding the math/dl libraries and detecting and enabling LTO support
* Remove platform-specific kludges like the Fedora/flatpak LTO workaround and a bunch of Windows stuff
* Simplify Windows static builds
* Consistent formatting
Diffstat (limited to 'res')
| -rw-r--r-- | res/melon.plist.in | 4 | ||||
| -rw-r--r-- | res/melon.rc.in | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/res/melon.plist.in b/res/melon.plist.in index 1057c47..20d385a 100644 --- a/res/melon.plist.in +++ b/res/melon.plist.in @@ -13,9 +13,9 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleVersion</key> - <string>${MELONDS_VERSION}</string> + <string>${melonDS_VERSION}</string> <key>CFBundleShortVersionString</key> - <string>${MELONDS_VERSION}</string> + <string>${melonDS_VERSION}</string> <key>NSHumanReadableCopyright</key> <string>Licensed under GPLv3</string> <key>NSHighResolutionCapable</key> diff --git a/res/melon.rc.in b/res/melon.rc.in index 3851813..27c7cbd 100644 --- a/res/melon.rc.in +++ b/res/melon.rc.in @@ -6,8 +6,8 @@ //include version information in .exe, modify these values to match your needs 1 VERSIONINFO -FILEVERSION ${MELONDS_VERSION_MAJOR},${MELONDS_VERSION_MINOR},${MELONDS_VERSION_PATCH},0 -PRODUCTVERSION ${MELONDS_VERSION_MAJOR},${MELONDS_VERSION_MINOR},${MELONDS_VERSION_PATCH},0 +FILEVERSION ${melonDS_VERSION_MAJOR},${melonDS_VERSION_MINOR},${melonDS_VERSION_PATCH},0 +PRODUCTVERSION ${melonDS_VERSION_MAJOR},${melonDS_VERSION_MINOR},${melonDS_VERSION_PATCH},0 FILETYPE VFT_APP { BLOCK "StringFileInfo" @@ -15,14 +15,14 @@ FILETYPE VFT_APP BLOCK "040904E4" { VALUE "CompanyName", "Melon Factory of Kuribo64" - VALUE "FileVersion", "${MELONDS_VERSION}" + VALUE "FileVersion", "${melonDS_VERSION}" VALUE "FileDescription", "melonDS emulator" VALUE "InternalName", "SDnolem" VALUE "LegalCopyright", "2016-2022 melonDS team" VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "zafkflzdasd.exe" VALUE "ProductName", "melonDS" - VALUE "ProductVersion", "${MELONDS_VERSION}" + VALUE "ProductVersion", "${melonDS_VERSION}" } } BLOCK "VarFileInfo" |