Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(56) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2025-06-02 14:29:43
|
Author: manx Date: Mon Jun 2 16:29:36 2025 New Revision: 23304 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23304 Log: [New] build: CI: GitHub: CPA: Add Haiku builders, disabled for now due to <https://github.com/cross-platform-actions/action/issues/103> and <https://github.com/cross-platform-actions/action/issues/104>. Added: trunk/OpenMPT/.github/workflows/Haiku-Autotools.yml trunk/OpenMPT/.github/workflows/Haiku-Makefile.yml Added: trunk/OpenMPT/.github/workflows/Haiku-Autotools.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/.github/workflows/Haiku-Autotools.yml Mon Jun 2 16:29:36 2025 (r23304) @@ -0,0 +1,74 @@ +name: Haiku Autotools + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + strategy: + fail-fast: false + matrix: + include: + - { version: 'r1beta5' } + + concurrency: + group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools + cancel-in-progress: true + + runs-on: ubuntu-24.04 + + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Startup VM + uses: cross-platform-actions/action@v0.28.0 + with: + architecture: x86_64 + memory: 4G + operating_system: haiku + version: ${{matrix.version}} + shell: bash + sync_files: runner-to-vm + shutdown_vm: false + run: true + - name: Install dependencies + uses: cross-platform-actions/action@v0.28.0 + with: + architecture: x86_64 + memory: 4G + operating_system: haiku + version: ${{matrix.version}} + shell: bash + sync_files: false + shutdown_vm: false + run: | + pkgman refresh + pkgman full-sync -y + pkgman install -y subversion git perl gawk make pkgconfig mpg123_devel libogg_devel libvorbis_devel flac_devel libsndfile_devel portaudio_devel libsdl2_devel autoconf autoconf_archive libtool libtool_libltdl doxygen help2man + - name: Build + uses: cross-platform-actions/action@v0.28.0 + with: + architecture: x86_64 + memory: 4G + operating_system: haiku + version: ${{matrix.version}} + shell: bash + sync_files: false + shutdown_vm: false + run: | + export MAKEFLAGS="-j4"; ./build/autotools/autoconfiscate.sh + - name: Shutdown VM + uses: cross-platform-actions/action@v0.28.0 + with: + architecture: x86_64 + memory: 4G + operating_system: haiku + version: ${{matrix.version}} + shell: bash + sync_files: false + shutdown_vm: true + run: true Added: trunk/OpenMPT/.github/workflows/Haiku-Makefile.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/.github/workflows/Haiku-Makefile.yml Mon Jun 2 16:29:36 2025 (r23304) @@ -0,0 +1,91 @@ +name: Haiku Makefile + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + strategy: + fail-fast: false + matrix: + include: + - { version: 'r1beta5', deps: sys } + - { version: 'r1beta5', deps: local } + - { version: 'r1beta5', deps: small } + + concurrency: + group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} + cancel-in-progress: true + + runs-on: ubuntu-24.04 + + # disable due to <https://github.com/cross-platform-actions/action/issues/103> and <https://github.com/cross-platform-actions/action/issues/104> + if: false + + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Startup VM + uses: cross-platform-actions/action@v0.28.0 + with: + architecture: x86_64 + memory: 4G + operating_system: haiku + version: ${{matrix.version}} + shell: bash + sync_files: runner-to-vm + shutdown_vm: false + run: true + - name: Install dependencies + uses: cross-platform-actions/action@v0.28.0 + with: + architecture: x86_64 + memory: 4G + operating_system: haiku + version: ${{matrix.version}} + shell: bash + sync_files: false + shutdown_vm: false + run: | + pkgman refresh + pkgman full-sync -y + pkgman install -y subversion git perl gawk make pkgconfig mpg123_devel libogg_devel libvorbis_devel flac_devel libsndfile_devel portaudio_devel libsdl2_devel autoconf autoconf_archive libtool libtool_libltdl doxygen help2man + - name: Build + uses: cross-platform-actions/action@v0.28.0 + with: + architecture: x86_64 + memory: 4G + operating_system: haiku + version: ${{matrix.version}} + shell: bash + sync_files: false + shutdown_vm: false + run: | + make -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} + - name: Test + uses: cross-platform-actions/action@v0.28.0 + with: + architecture: x86_64 + memory: 4G + operating_system: haiku + version: ${{matrix.version}} + shell: bash + sync_files: false + shutdown_vm: false + run: | + make -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check + - name: Shutdown VM + uses: cross-platform-actions/action@v0.28.0 + with: + architecture: x86_64 + memory: 4G + operating_system: haiku + version: ${{matrix.version}} + shell: bash + sync_files: false + shutdown_vm: true + run: true |
|
From: <sv...@op...> - 2025-06-02 14:25:14
|
Author: manx Date: Mon Jun 2 16:25:00 2025 New Revision: 23303 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23303 Log: Merged revision(s) 23302 from trunk/OpenMPT: [Mod] build: Makefile: Haiku: Do not expect PulseAudio by default. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/build/make/config-defaults.mk Modified: branches/OpenMPT-1.32/build/make/config-defaults.mk ============================================================================== --- branches/OpenMPT-1.32/build/make/config-defaults.mk Mon Jun 2 16:24:35 2025 (r23302) +++ branches/OpenMPT-1.32/build/make/config-defaults.mk Mon Jun 2 16:25:00 2025 (r23303) @@ -55,6 +55,7 @@ else ifeq ($(HOST_FLAVOUR),HAIKU) +NO_PULSEAUDIO?=1 # In Haiku x86 32bit (but not 64bit), # modern compilers need a -x86 suffix. UNAME_P:=$(shell uname -p) |
|
From: <sv...@op...> - 2025-06-02 14:24:41
|
Author: manx Date: Mon Jun 2 16:24:35 2025 New Revision: 23302 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23302 Log: [Mod] build: Makefile: Haiku: Do not expect PulseAudio by default. Modified: trunk/OpenMPT/build/make/config-defaults.mk Modified: trunk/OpenMPT/build/make/config-defaults.mk ============================================================================== --- trunk/OpenMPT/build/make/config-defaults.mk Mon Jun 2 16:16:54 2025 (r23301) +++ trunk/OpenMPT/build/make/config-defaults.mk Mon Jun 2 16:24:35 2025 (r23302) @@ -55,6 +55,7 @@ else ifeq ($(HOST_FLAVOUR),HAIKU) +NO_PULSEAUDIO?=1 # In Haiku x86 32bit (but not 64bit), # modern compilers need a -x86 suffix. UNAME_P:=$(shell uname -p) |
|
From: <sv...@op...> - 2025-06-02 14:17:05
|
Author: manx Date: Mon Jun 2 16:16:54 2025 New Revision: 23301 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23301 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Mon Jun 2 16:16:50 2025 (r23300) +++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Mon Jun 2 16:16:54 2025 (r23301) @@ -10,6 +10,8 @@ * [**Bug**] `openmpt::string::get("source_has_mixed_revisions")` and `openmpt_get_string("source_has_mixed_revisions")` always returned an empty string. + * [**Bug**] Work-around broken user locale support on Haiku by always assuming + UTF8. * miniz: v3.0.2 (2023-01-15). * pugixml: Update to v1.15 (2025-01-10). |
|
From: <sv...@op...> - 2025-06-02 14:17:02
|
Author: manx Date: Mon Jun 2 16:16:50 2025 New Revision: 23300 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23300 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Mon Jun 2 16:16:45 2025 (r23299) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Mon Jun 2 16:16:50 2025 (r23300) @@ -10,6 +10,8 @@ * [**Bug**] `openmpt::string::get("source_has_mixed_revisions")` and `openmpt_get_string("source_has_mixed_revisions")` always returned an empty string. + * [**Bug**] Work-around broken user locale support on Haiku by always assuming + UTF8. * miniz: v3.0.2 (2023-01-15). * pugixml: Update to v1.15 (2025-01-10). |
|
From: <sv...@op...> - 2025-06-02 14:16:56
|
Author: manx Date: Mon Jun 2 16:16:45 2025 New Revision: 23299 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23299 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.32/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.32/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.32/doc/libopenmpt/changelog.md Mon Jun 2 16:15:17 2025 (r23298) +++ branches/OpenMPT-1.32/doc/libopenmpt/changelog.md Mon Jun 2 16:16:45 2025 (r23299) @@ -7,6 +7,9 @@ ### libopenmpt 0.8.1-pre + * [**Bug**] Work-around broken user locale support on Haiku by always assuming + UTF8. + * miniz: v3.0.2 (2023-01-15). ### libopenmpt 0.8.0 (2025-05-31) |
|
From: <sv...@op...> - 2025-06-02 14:15:30
|
Author: manx Date: Mon Jun 2 16:15:17 2025 New Revision: 23298 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23298 Log: Merged revision(s) 23294-23295 from trunk/OpenMPT: [Ref] mpt/string_transcode/transcode.hpp: Add MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 for platforms with broken user locale support that always use UTF8 anyway. ........ [Fix] mpt/base/detect_quirks.hpp: Set MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE and MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 for Haiku. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/src/mpt/base/detect_quirks.hpp branches/OpenMPT-1.30/src/mpt/string_transcode/transcode.hpp Modified: branches/OpenMPT-1.30/src/mpt/base/detect_quirks.hpp ============================================================================== --- branches/OpenMPT-1.30/src/mpt/base/detect_quirks.hpp Mon Jun 2 16:14:54 2025 (r23297) +++ branches/OpenMPT-1.30/src/mpt/base/detect_quirks.hpp Mon Jun 2 16:15:17 2025 (r23298) @@ -137,6 +137,10 @@ #if MPT_OS_CYGWIN #define MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE +// #define MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 +#elif MPT_OS_HAIKU +#define MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE +#define MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 #endif Modified: branches/OpenMPT-1.30/src/mpt/string_transcode/transcode.hpp ============================================================================== --- branches/OpenMPT-1.30/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:14:54 2025 (r23297) +++ branches/OpenMPT-1.30/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:15:17 2025 (r23298) @@ -995,6 +995,9 @@ switch (encoding) { case logical_encoding::locale: #if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) +#if defined(MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8) + return encode_utf<Tdststring>(src); +#else try { return encode_locale<Tdststring>(std::locale(""), src); } catch (mpt::out_of_memory e) { @@ -1017,6 +1020,7 @@ // nothing } return encode_ascii<Tdststring>(src); +#endif #else return encode_locale<Tdststring>(std::locale(""), src); #endif @@ -1154,6 +1158,9 @@ switch (encoding) { case logical_encoding::locale: #if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) +#if defined(MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8) + return decode_utf8(src); +#else try { return decode_locale(std::locale(""), src); } catch (mpt::out_of_memory e) { @@ -1176,6 +1183,7 @@ // nothing } return decode_ascii(src); +#endif #else return decode_locale(std::locale(""), src); #endif |
|
From: <sv...@op...> - 2025-06-02 14:15:07
|
Author: manx Date: Mon Jun 2 16:14:54 2025 New Revision: 23297 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23297 Log: Merged revision(s) 23294-23295 from trunk/OpenMPT: [Ref] mpt/string_transcode/transcode.hpp: Add MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 for platforms with broken user locale support that always use UTF8 anyway. ........ [Fix] mpt/base/detect_quirks.hpp: Set MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE and MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 for Haiku. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/src/mpt/base/detect_quirks.hpp branches/OpenMPT-1.31/src/mpt/string_transcode/transcode.hpp Modified: branches/OpenMPT-1.31/src/mpt/base/detect_quirks.hpp ============================================================================== --- branches/OpenMPT-1.31/src/mpt/base/detect_quirks.hpp Mon Jun 2 16:14:31 2025 (r23296) +++ branches/OpenMPT-1.31/src/mpt/base/detect_quirks.hpp Mon Jun 2 16:14:54 2025 (r23297) @@ -243,6 +243,10 @@ #if MPT_OS_CYGWIN #define MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE +// #define MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 +#elif MPT_OS_HAIKU +#define MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE +#define MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 #endif Modified: branches/OpenMPT-1.31/src/mpt/string_transcode/transcode.hpp ============================================================================== --- branches/OpenMPT-1.31/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:14:31 2025 (r23296) +++ branches/OpenMPT-1.31/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:14:54 2025 (r23297) @@ -1666,6 +1666,9 @@ switch (encoding) { case logical_encoding::locale: #if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) +#if defined(MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8) + return encode_utf<Tdststring>(src); +#else try { return encode_locale<Tdststring>(std::locale(""), src); } catch (mpt::out_of_memory e) { @@ -1688,6 +1691,7 @@ // nothing } return encode_ascii<Tdststring>(src); +#endif #else return encode_locale<Tdststring>(std::locale(""), src); #endif @@ -1887,6 +1891,9 @@ switch (encoding) { case logical_encoding::locale: #if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) +#if defined(MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8) + return decode_utf8(src); +#else try { return decode_locale(std::locale(""), src); } catch (mpt::out_of_memory e) { @@ -1909,6 +1916,7 @@ // nothing } return decode_ascii(src); +#endif #else return decode_locale(std::locale(""), src); #endif |
|
From: <sv...@op...> - 2025-06-02 14:14:38
|
Author: manx Date: Mon Jun 2 16:14:31 2025 New Revision: 23296 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23296 Log: Merged revision(s) 23294-23295 from trunk/OpenMPT: [Ref] mpt/string_transcode/transcode.hpp: Add MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 for platforms with broken user locale support that always use UTF8 anyway. ........ [Fix] mpt/base/detect_quirks.hpp: Set MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE and MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 for Haiku. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/src/mpt/base/detect_quirks.hpp branches/OpenMPT-1.32/src/mpt/string_transcode/transcode.hpp Modified: branches/OpenMPT-1.32/src/mpt/base/detect_quirks.hpp ============================================================================== --- branches/OpenMPT-1.32/src/mpt/base/detect_quirks.hpp Mon Jun 2 16:14:05 2025 (r23295) +++ branches/OpenMPT-1.32/src/mpt/base/detect_quirks.hpp Mon Jun 2 16:14:31 2025 (r23296) @@ -264,6 +264,10 @@ #if MPT_OS_CYGWIN #define MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE +// #define MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 +#elif MPT_OS_HAIKU +#define MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE +#define MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 #endif Modified: branches/OpenMPT-1.32/src/mpt/string_transcode/transcode.hpp ============================================================================== --- branches/OpenMPT-1.32/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:14:05 2025 (r23295) +++ branches/OpenMPT-1.32/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:14:31 2025 (r23296) @@ -1696,6 +1696,9 @@ switch (encoding) { case logical_encoding::locale: #if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) +#if defined(MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8) + return encode_utf<Tdststring>(src); +#else try { return encode_locale<Tdststring>(std::locale(""), src); } catch (mpt::out_of_memory e) { @@ -1718,6 +1721,7 @@ // nothing } return encode_ascii<Tdststring>(src); +#endif #else return encode_locale<Tdststring>(std::locale(""), src); #endif @@ -1917,6 +1921,9 @@ switch (encoding) { case logical_encoding::locale: #if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) +#if defined(MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8) + return decode_utf8(src); +#else try { return decode_locale(std::locale(""), src); } catch (mpt::out_of_memory e) { @@ -1939,6 +1946,7 @@ // nothing } return decode_ascii(src); +#endif #else return decode_locale(std::locale(""), src); #endif |
|
From: <sv...@op...> - 2025-06-02 14:14:18
|
Author: manx Date: Mon Jun 2 16:14:05 2025 New Revision: 23295 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23295 Log: [Fix] mpt/base/detect_quirks.hpp: Set MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE and MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 for Haiku. Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Mon Jun 2 16:13:13 2025 (r23294) +++ trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Mon Jun 2 16:14:05 2025 (r23295) @@ -265,6 +265,9 @@ #if MPT_OS_CYGWIN #define MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE // #define MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 +#elif MPT_OS_HAIKU +#define MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE +#define MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 #endif |
|
From: <sv...@op...> - 2025-06-02 14:13:24
|
Author: manx Date: Mon Jun 2 16:13:13 2025 New Revision: 23294 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23294 Log: [Ref] mpt/string_transcode/transcode.hpp: Add MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 for platforms with broken user locale support that always use UTF8 anyway. Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp trunk/OpenMPT/src/mpt/string_transcode/transcode.hpp Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Mon Jun 2 16:10:14 2025 (r23293) +++ trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Mon Jun 2 16:13:13 2025 (r23294) @@ -264,6 +264,7 @@ #if MPT_OS_CYGWIN #define MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE +// #define MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8 #endif Modified: trunk/OpenMPT/src/mpt/string_transcode/transcode.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:10:14 2025 (r23293) +++ trunk/OpenMPT/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:13:13 2025 (r23294) @@ -1696,6 +1696,9 @@ switch (encoding) { case logical_encoding::locale: #if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) +#if defined(MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8) + return encode_utf<Tdststring>(src); +#else try { return encode_locale<Tdststring>(std::locale(""), src); } catch (mpt::out_of_memory e) { @@ -1718,6 +1721,7 @@ // nothing } return encode_ascii<Tdststring>(src); +#endif #else return encode_locale<Tdststring>(std::locale(""), src); #endif @@ -1917,6 +1921,9 @@ switch (encoding) { case logical_encoding::locale: #if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) +#if defined(MPT_LIBCXX_QUIRK_ASSUME_USER_LOCALE_UTF8) + return decode_utf8(src); +#else try { return decode_locale(std::locale(""), src); } catch (mpt::out_of_memory e) { @@ -1939,6 +1946,7 @@ // nothing } return decode_ascii(src); +#endif #else return decode_locale(std::locale(""), src); #endif |
|
From: <sv...@op...> - 2025-06-02 14:10:33
|
Author: manx Date: Mon Jun 2 16:10:14 2025 New Revision: 23293 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23293 Log: Merged revision(s) 23290 from trunk/OpenMPT: [Fix] mpt/string_transcode/transcode.hpp: Fix typo om broken active locale workaround. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/src/mpt/string_transcode/transcode.hpp Modified: branches/OpenMPT-1.30/src/mpt/string_transcode/transcode.hpp ============================================================================== --- branches/OpenMPT-1.30/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:09:52 2025 (r23292) +++ branches/OpenMPT-1.30/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:10:14 2025 (r23293) @@ -1181,7 +1181,7 @@ #endif break; case logical_encoding::active_locale: -#if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) +#if defined(MPT_LIBCXX_QUIRK_BROKEN_ACTIVE_LOCALE) try { return decode_locale(std::locale(), src); } catch (mpt::out_of_memory e) { |
|
From: <sv...@op...> - 2025-06-02 14:10:06
|
Author: manx Date: Mon Jun 2 16:09:52 2025 New Revision: 23292 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23292 Log: Merged revision(s) 23290 from trunk/OpenMPT: [Fix] mpt/string_transcode/transcode.hpp: Fix typo om broken active locale workaround. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/src/mpt/string_transcode/transcode.hpp Modified: branches/OpenMPT-1.31/src/mpt/string_transcode/transcode.hpp ============================================================================== --- branches/OpenMPT-1.31/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:09:35 2025 (r23291) +++ branches/OpenMPT-1.31/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:09:52 2025 (r23292) @@ -1914,7 +1914,7 @@ #endif break; case logical_encoding::active_locale: -#if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) +#if defined(MPT_LIBCXX_QUIRK_BROKEN_ACTIVE_LOCALE) try { return decode_locale(std::locale(), src); } catch (mpt::out_of_memory e) { |
|
From: <sv...@op...> - 2025-06-02 14:09:42
|
Author: manx Date: Mon Jun 2 16:09:35 2025 New Revision: 23291 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23291 Log: Merged revision(s) 23290 from trunk/OpenMPT: [Fix] mpt/string_transcode/transcode.hpp: Fix typo om broken active locale workaround. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/src/mpt/string_transcode/transcode.hpp Modified: branches/OpenMPT-1.32/src/mpt/string_transcode/transcode.hpp ============================================================================== --- branches/OpenMPT-1.32/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:08:46 2025 (r23290) +++ branches/OpenMPT-1.32/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:09:35 2025 (r23291) @@ -1944,7 +1944,7 @@ #endif break; case logical_encoding::active_locale: -#if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) +#if defined(MPT_LIBCXX_QUIRK_BROKEN_ACTIVE_LOCALE) try { return decode_locale(std::locale(), src); } catch (mpt::out_of_memory e) { |
|
From: <sv...@op...> - 2025-06-02 14:08:53
|
Author: manx Date: Mon Jun 2 16:08:46 2025 New Revision: 23290 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23290 Log: [Fix] mpt/string_transcode/transcode.hpp: Fix typo om broken active locale workaround. Modified: trunk/OpenMPT/src/mpt/string_transcode/transcode.hpp Modified: trunk/OpenMPT/src/mpt/string_transcode/transcode.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/string_transcode/transcode.hpp Mon Jun 2 13:55:39 2025 (r23289) +++ trunk/OpenMPT/src/mpt/string_transcode/transcode.hpp Mon Jun 2 16:08:46 2025 (r23290) @@ -1944,7 +1944,7 @@ #endif break; case logical_encoding::active_locale: -#if defined(MPT_LIBCXX_QUIRK_BROKEN_USER_LOCALE) +#if defined(MPT_LIBCXX_QUIRK_BROKEN_ACTIVE_LOCALE) try { return decode_locale(std::locale(), src); } catch (mpt::out_of_memory e) { |
|
From: <sv...@op...> - 2025-06-02 11:55:46
|
Author: manx Date: Mon Jun 2 13:55:39 2025 New Revision: 23289 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23289 Log: [Imp] build: CI: GitHub: macOS: Add XCode 16.4. Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml Mon Jun 2 12:11:19 2025 (r23288) +++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml Mon Jun 2 13:55:39 2025 (r23289) @@ -12,6 +12,7 @@ fail-fast: false matrix: include: + - { host: macos-15, compiler: '16.4' } - { host: macos-15, compiler: '16.3' } - { host: macos-15, compiler: '16.2' } - { host: macos-15, compiler: '16.1' } Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Mon Jun 2 12:11:19 2025 (r23288) +++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Mon Jun 2 13:55:39 2025 (r23289) @@ -13,6 +13,28 @@ fail-fast: false matrix: include: + - { host: macos-15, compiler: '16.4', arch: '' , target: '' , deps: sys , check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: arm64 , target: '' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: x86_64, target: '' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: arm64 , target: '' , deps: small, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: x86_64, target: '' , deps: small, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: arm64 , target: '15.2' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: x86_64, target: '15.2' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: arm64 , target: '15.1' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: x86_64, target: '15.1' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: arm64 , target: '15' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: x86_64, target: '15' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: arm64 , target: '14' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: x86_64, target: '14' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: arm64 , target: '13' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: x86_64, target: '13' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: arm64 , target: '12' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: x86_64, target: '12' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: arm64 , target: '11' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: x86_64, target: '11' , deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false } + - { host: macos-15, compiler: '16.4', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false } - { host: macos-15, compiler: '16.3', arch: '' , target: '' , deps: sys , check: true , ancient: false } - { host: macos-15, compiler: '16.3', arch: arm64 , target: '' , deps: local, check: true , ancient: false } - { host: macos-15, compiler: '16.3', arch: x86_64, target: '' , deps: local, check: true , ancient: false } |
|
From: <sv...@op...> - 2025-06-02 10:11:36
|
Author: manx Date: Mon Jun 2 12:11:19 2025 New Revision: 23288 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23288 Log: Merged revision(s) 23287 from trunk/OpenMPT: [Fix] Installer: It is not enough to only not install binaries that require newer Windows versions, we also need to not install file associations for such non-existing binaries. Move version logic out of individual Inno Setup tasks and into GetDefaultArch(). ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/installer/install-multi-arch.iss Modified: branches/OpenMPT-1.32/installer/install-multi-arch.iss ============================================================================== --- branches/OpenMPT-1.32/installer/install-multi-arch.iss Mon Jun 2 12:10:38 2025 (r23287) +++ branches/OpenMPT-1.32/installer/install-multi-arch.iss Mon Jun 2 12:11:19 2025 (r23288) @@ -149,17 +149,13 @@ Name: {autodesktop}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('x86') Name: {autodesktop}\OpenMPT; Filename: {app}\bin\amd64\OpenMPT.exe; Check: CheckDefaultArch('amd64') -Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm'); MinVersion: 6.2 -Name: {autodesktop}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm'); OnlyBelowVersion: 6.2 -Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64'); MinVersion: 10.0.19044 -Name: {autodesktop}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm64'); OnlyBelowVersion: 10.0.19044 +Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm'); +Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64'); Name: {group}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('x86') Name: {group}\OpenMPT; Filename: {app}\bin\amd64\OpenMPT.exe; Check: CheckDefaultArch('amd64') -Name: {group}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm'); MinVersion: 6.2 -Name: {group}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm'); OnlyBelowVersion: 6.2 -Name: {group}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64'); MinVersion: 10.0.19044 -Name: {group}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm64'); OnlyBelowVersion: 10.0.19044 +Name: {group}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm'); +Name: {group}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64'); Name: {group}\OpenMPT (x86); Filename: {app}\bin\x86\OpenMPT.exe; Components: archx86 Name: {group}\OpenMPT (amd64); Filename: {app}\bin\amd64\OpenMPT.exe; Components: archamd64 @@ -183,10 +179,8 @@ Filename: {app}\bin\x86\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('x86') Filename: {app}\bin\amd64\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('amd64') -Filename: {app}\bin\arm\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm'); MinVersion: 6.2 -Filename: {app}\bin\x86\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm'); OnlyBelowVersion: 6.2 -Filename: {app}\bin\arm64\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm64'); MinVersion: 10.0.19044 -Filename: {app}\bin\x86\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm64'); OnlyBelowVersion: 10.0.19044 +Filename: {app}\bin\arm\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm'); +Filename: {app}\bin\arm64\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm64'); @@ -275,11 +269,25 @@ end; paArm32: begin - Result := 'arm'; + if (GetWindowsVersion >= $06020000) then + begin + Result := 'arm'; + end + else + begin + Result := 'x86'; + end; end; paARM64: begin - Result := 'arm64'; + if (GetWindowsVersion >= $0A004A64) then + begin + Result := 'arm64'; + end + else + begin + Result := 'x86'; + end; end; end; end; |
|
From: <sv...@op...> - 2025-06-02 10:10:56
|
Author: manx Date: Mon Jun 2 12:10:38 2025 New Revision: 23287 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23287 Log: [Fix] Installer: It is not enough to only not install binaries that require newer Windows versions, we also need to not install file associations for such non-existing binaries. Move version logic out of individual Inno Setup tasks and into GetDefaultArch(). Modified: trunk/OpenMPT/installer/install-multi-arch.iss Modified: trunk/OpenMPT/installer/install-multi-arch.iss ============================================================================== --- trunk/OpenMPT/installer/install-multi-arch.iss Sun Jun 1 23:10:11 2025 (r23286) +++ trunk/OpenMPT/installer/install-multi-arch.iss Mon Jun 2 12:10:38 2025 (r23287) @@ -149,17 +149,13 @@ Name: {autodesktop}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('x86') Name: {autodesktop}\OpenMPT; Filename: {app}\bin\amd64\OpenMPT.exe; Check: CheckDefaultArch('amd64') -Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm'); MinVersion: 6.2 -Name: {autodesktop}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm'); OnlyBelowVersion: 6.2 -Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64'); MinVersion: 10.0.19044 -Name: {autodesktop}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm64'); OnlyBelowVersion: 10.0.19044 +Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm'); +Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64'); Name: {group}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('x86') Name: {group}\OpenMPT; Filename: {app}\bin\amd64\OpenMPT.exe; Check: CheckDefaultArch('amd64') -Name: {group}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm'); MinVersion: 6.2 -Name: {group}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm'); OnlyBelowVersion: 6.2 -Name: {group}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64'); MinVersion: 10.0.19044 -Name: {group}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm64'); OnlyBelowVersion: 10.0.19044 +Name: {group}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm'); +Name: {group}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64'); Name: {group}\OpenMPT (x86); Filename: {app}\bin\x86\OpenMPT.exe; Components: archx86 Name: {group}\OpenMPT (amd64); Filename: {app}\bin\amd64\OpenMPT.exe; Components: archamd64 @@ -183,10 +179,8 @@ Filename: {app}\bin\x86\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('x86') Filename: {app}\bin\amd64\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('amd64') -Filename: {app}\bin\arm\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm'); MinVersion: 6.2 -Filename: {app}\bin\x86\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm'); OnlyBelowVersion: 6.2 -Filename: {app}\bin\arm64\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm64'); MinVersion: 10.0.19044 -Filename: {app}\bin\x86\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm64'); OnlyBelowVersion: 10.0.19044 +Filename: {app}\bin\arm\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm'); +Filename: {app}\bin\arm64\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm64'); @@ -275,11 +269,25 @@ end; paArm32: begin - Result := 'arm'; + if (GetWindowsVersion >= $06020000) then + begin + Result := 'arm'; + end + else + begin + Result := 'x86'; + end; end; paARM64: begin - Result := 'arm64'; + if (GetWindowsVersion >= $0A004A64) then + begin + Result := 'arm64'; + end + else + begin + Result := 'x86'; + end; end; end; end; |
|
From: <sv...@op...> - 2025-06-01 21:10:24
|
Author: sagamusix Date: Sun Jun 1 23:10:11 2025 New Revision: 23286 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23286 Log: Merged revision(s) 23285 from trunk/OpenMPT: [Imp] Invert a few more icons in dark themes that are hard to read otherwise. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/mptrack/MainFrm.cpp Modified: branches/OpenMPT-1.32/mptrack/MainFrm.cpp ============================================================================== --- branches/OpenMPT-1.32/mptrack/MainFrm.cpp Sun Jun 1 23:09:45 2025 (r23285) +++ branches/OpenMPT-1.32/mptrack/MainFrm.cpp Sun Jun 1 23:10:11 2025 (r23286) @@ -363,8 +363,8 @@ CDC *dc = GetDC(); const double scaling = HighDPISupport::GetDpiForWindow(m_hWnd) / 96.0; static constexpr int miscIconsInvert[] = {IMAGE_PATTERNS, IMAGE_OPLINSTRACTIVE, IMAGE_OPLINSTRMUTE}; - static constexpr int patternIconsInvert[] = {TIMAGE_PREVIEW, TIMAGE_MACROEDITOR, TIMAGE_PATTERN_OVERFLOWPASTE, TIMAGE_PATTERN_PLUGINS, TIMAGE_SAMPLE_UNSIGN}; - static constexpr int envelopeIconsInvert[] = {IIMAGE_CHECKED, IIMAGE_VOLSWITCH, IIMAGE_PANSWITCH, IIMAGE_PITCHSWITCH, IIMAGE_FILTERSWITCH, IIMAGE_NOPITCHSWITCH, IIMAGE_NOFILTERSWITCH}; + static constexpr int patternIconsInvert[] = {TIMAGE_PREVIEW, TIMAGE_MACROEDITOR, TIMAGE_PATTERN_OVERFLOWPASTE, TIMAGE_PATTERN_PLUGINS, TIMAGE_SAMPLE_AMPLIFY, TIMAGE_SAMPLE_UNSIGN}; + static constexpr int envelopeIconsInvert[] = {IIMAGE_VOLENV, IIMAGE_PANENV, IIMAGE_CHECKED, IIMAGE_VOLSWITCH, IIMAGE_PANSWITCH, IIMAGE_PITCHSWITCH, IIMAGE_FILTERSWITCH, IIMAGE_NOPITCHSWITCH, IIMAGE_NOFILTERSWITCH, IIMAGE_GRID}; m_MiscIcons.Create(IDB_IMAGELIST, 16, 16, IMGLIST_NUMIMAGES, 1, dc, scaling, false, miscIconsInvert); m_MiscIconsDisabled.Create(IDB_IMAGELIST, 16, 16, IMGLIST_NUMIMAGES, 1, dc, scaling, true, miscIconsInvert); m_PatternIcons.Create(IDB_PATTERNS, 16, 16, PATTERNIMG_NUMIMAGES, 1, dc, scaling, false, patternIconsInvert); |
|
From: <sv...@op...> - 2025-06-01 21:09:59
|
Author: sagamusix Date: Sun Jun 1 23:09:45 2025 New Revision: 23285 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23285 Log: [Imp] Invert a few more icons in dark themes that are hard to read otherwise. Modified: trunk/OpenMPT/mptrack/MainFrm.cpp Modified: trunk/OpenMPT/mptrack/MainFrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/MainFrm.cpp Sun Jun 1 19:01:21 2025 (r23284) +++ trunk/OpenMPT/mptrack/MainFrm.cpp Sun Jun 1 23:09:45 2025 (r23285) @@ -363,8 +363,8 @@ CDC *dc = GetDC(); const double scaling = HighDPISupport::GetDpiForWindow(m_hWnd) / 96.0; static constexpr int miscIconsInvert[] = {IMAGE_PATTERNS, IMAGE_OPLINSTRACTIVE, IMAGE_OPLINSTRMUTE}; - static constexpr int patternIconsInvert[] = {TIMAGE_PREVIEW, TIMAGE_MACROEDITOR, TIMAGE_PATTERN_OVERFLOWPASTE, TIMAGE_PATTERN_PLUGINS, TIMAGE_SAMPLE_UNSIGN}; - static constexpr int envelopeIconsInvert[] = {IIMAGE_CHECKED, IIMAGE_VOLSWITCH, IIMAGE_PANSWITCH, IIMAGE_PITCHSWITCH, IIMAGE_FILTERSWITCH, IIMAGE_NOPITCHSWITCH, IIMAGE_NOFILTERSWITCH}; + static constexpr int patternIconsInvert[] = {TIMAGE_PREVIEW, TIMAGE_MACROEDITOR, TIMAGE_PATTERN_OVERFLOWPASTE, TIMAGE_PATTERN_PLUGINS, TIMAGE_SAMPLE_AMPLIFY, TIMAGE_SAMPLE_UNSIGN}; + static constexpr int envelopeIconsInvert[] = {IIMAGE_VOLENV, IIMAGE_PANENV, IIMAGE_CHECKED, IIMAGE_VOLSWITCH, IIMAGE_PANSWITCH, IIMAGE_PITCHSWITCH, IIMAGE_FILTERSWITCH, IIMAGE_NOPITCHSWITCH, IIMAGE_NOFILTERSWITCH, IIMAGE_GRID}; m_MiscIcons.Create(IDB_IMAGELIST, 16, 16, IMGLIST_NUMIMAGES, 1, dc, scaling, false, miscIconsInvert); m_MiscIconsDisabled.Create(IDB_IMAGELIST, 16, 16, IMGLIST_NUMIMAGES, 1, dc, scaling, true, miscIconsInvert); m_PatternIcons.Create(IDB_PATTERNS, 16, 16, PATTERNIMG_NUMIMAGES, 1, dc, scaling, false, patternIconsInvert); |
|
From: <sv...@op...> - 2025-06-01 17:01:35
|
Author: manx Date: Sun Jun 1 19:01:21 2025 New Revision: 23284 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23284 Log: Merged revision(s) 23278-23281 from trunk/OpenMPT: [Fix] Installer: Install 32bit ARM binaries on 32bit ARM systems. ........ [Fix] Installer: Only install icons when the corresponding binary gets installed. ........ [Fix] Installer: Fallback to 32bit x86 for default icon and after-setup-launching if the platform-native binary does not get installed due to too old Windows version. ........ [Fix] Installer: Inno Setup defaults to only install on x68compatible systems, however we also want to allow all other architectures that we support. Probably irrelevant in practice for now because the first stage installer itself is a x86 binary. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/installer/install-multi-arch.iss Modified: branches/OpenMPT-1.32/installer/install-multi-arch.iss ============================================================================== --- branches/OpenMPT-1.32/installer/install-multi-arch.iss Sun Jun 1 14:23:45 2025 (r23283) +++ branches/OpenMPT-1.32/installer/install-multi-arch.iss Sun Jun 1 19:01:21 2025 (r23284) @@ -27,6 +27,7 @@ AppPublisherURL=https://openmpt.org/ AppSupportURL=https://forum.openmpt.org/ AppUpdatesURL=https://openmpt.org/ +ArchitecturesAllowed=x86compatible x64compatible arm32compatible arm64 ArchitecturesInstallIn64BitMode=x64os arm64 ChangesAssociations=yes Compression=lzma2/ultra64 @@ -148,18 +149,22 @@ Name: {autodesktop}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('x86') Name: {autodesktop}\OpenMPT; Filename: {app}\bin\amd64\OpenMPT.exe; Check: CheckDefaultArch('amd64') -Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm') -Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64') +Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm'); MinVersion: 6.2 +Name: {autodesktop}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm'); OnlyBelowVersion: 6.2 +Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64'); MinVersion: 10.0.19044 +Name: {autodesktop}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm64'); OnlyBelowVersion: 10.0.19044 Name: {group}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('x86') Name: {group}\OpenMPT; Filename: {app}\bin\amd64\OpenMPT.exe; Check: CheckDefaultArch('amd64') -Name: {group}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm') -Name: {group}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64') +Name: {group}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm'); MinVersion: 6.2 +Name: {group}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm'); OnlyBelowVersion: 6.2 +Name: {group}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64'); MinVersion: 10.0.19044 +Name: {group}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm64'); OnlyBelowVersion: 10.0.19044 Name: {group}\OpenMPT (x86); Filename: {app}\bin\x86\OpenMPT.exe; Components: archx86 Name: {group}\OpenMPT (amd64); Filename: {app}\bin\amd64\OpenMPT.exe; Components: archamd64 -Name: {group}\OpenMPT (arm); Filename: {app}\bin\arm\OpenMPT.exe; Components: archarm -Name: {group}\OpenMPT (arm64); Filename: {app}\bin\arm64\OpenMPT.exe; Components: archarm64 +Name: {group}\OpenMPT (arm); Filename: {app}\bin\arm\OpenMPT.exe; Components: archarm; MinVersion: 6.2 +Name: {group}\OpenMPT (arm64); Filename: {app}\bin\arm64\OpenMPT.exe; Components: archarm64; MinVersion: 10.0.19044 Name: {group}\Manual; Filename: {app}\OpenMPT Manual.chm Name: {group}\Support and Community Forum; Filename: {app}\OpenMPT Support and Community Forum.url @@ -178,8 +183,10 @@ Filename: {app}\bin\x86\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('x86') Filename: {app}\bin\amd64\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('amd64') -Filename: {app}\bin\arm\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm') -Filename: {app}\bin\arm64\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm64') +Filename: {app}\bin\arm\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm'); MinVersion: 6.2 +Filename: {app}\bin\x86\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm'); OnlyBelowVersion: 6.2 +Filename: {app}\bin\arm64\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm64'); MinVersion: 10.0.19044 +Filename: {app}\bin\x86\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm64'); OnlyBelowVersion: 10.0.19044 @@ -239,6 +246,10 @@ begin WizardSelectComponents('archx86,archamd64,!archarm,!archarm64'); end; + paArm32: + begin + WizardSelectComponents('archx86,!archamd64,archarm,!archarm64'); + end; paARM64: begin WizardSelectComponents('archx86,archamd64,archarm,archarm64'); @@ -262,6 +273,10 @@ begin Result := 'amd64'; end; + paArm32: + begin + Result := 'arm'; + end; paARM64: begin Result := 'arm64'; |
|
From: <sv...@op...> - 2025-06-01 12:23:52
|
Author: sagamusix Date: Sun Jun 1 14:23:45 2025 New Revision: 23283 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23283 Log: Merged revision(s) 23282 from trunk/OpenMPT: [Imp] Add help button to Setup dialog title bar. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/mptrack/MainFrm.cpp branches/OpenMPT-1.32/mptrack/Mainfrm.h Modified: branches/OpenMPT-1.32/mptrack/MainFrm.cpp ============================================================================== --- branches/OpenMPT-1.32/mptrack/MainFrm.cpp Sun Jun 1 14:23:11 2025 (r23282) +++ branches/OpenMPT-1.32/mptrack/MainFrm.cpp Sun Jun 1 14:23:45 2025 (r23283) @@ -2053,8 +2053,32 @@ return CPropertySheet::PreTranslateMessage(pMsg); } + + BOOL OnInitDialog() override + { + ModifyStyleEx(0, WS_EX_CONTEXTHELP); + return CPropertySheet::OnInitDialog(); + } + + afx_msg void OnSysCommand(UINT id, LPARAM param) + { + if(id == SC_CONTEXTHELP) + { + CMainFrame::GetMainFrame()->OnHelp(); + return; + } + CPropertySheet::OnSysCommand(id, param); + } + + DECLARE_MESSAGE_MAP() }; +BEGIN_MESSAGE_MAP(CPropertySheetMPT, CPropertySheet) + //{{AFX_MSG_MAP(CPropertySheetMPT) + ON_WM_SYSCOMMAND() + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + void CMainFrame::OnViewOptions() { @@ -2106,7 +2130,9 @@ #if defined(MPT_ENABLE_UPDATE) m_UpdateOptionsDialog = &pages->updatedlg; #endif // MPT_ENABLE_UPDATE + dlg.DoModal(); + m_SoundCardOptionsDialog = nullptr; #if defined(MPT_ENABLE_UPDATE) m_UpdateOptionsDialog = nullptr; Modified: branches/OpenMPT-1.32/mptrack/Mainfrm.h ============================================================================== --- branches/OpenMPT-1.32/mptrack/Mainfrm.h Sun Jun 1 14:23:11 2025 (r23282) +++ branches/OpenMPT-1.32/mptrack/Mainfrm.h Sun Jun 1 14:23:45 2025 (r23283) @@ -409,6 +409,7 @@ afx_msg void OnAddDlsBank(); afx_msg void OnImportMidiLib(); afx_msg void OnViewOptions(); + afx_msg void OnHelp(); protected: afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); afx_msg void OnRButtonDown(UINT, CPoint); @@ -452,7 +453,6 @@ afx_msg LRESULT OnUpdateCheckSuccess(WPARAM wparam, LPARAM lparam); afx_msg LRESULT OnToolbarUpdateIndicatorClick(WPARAM wparam, LPARAM lparam); #endif // MPT_ENABLE_UPDATE - afx_msg void OnHelp(); afx_msg BOOL OnDeviceChange(UINT nEventType, DWORD_PTR dwData); afx_msg void OnDropFiles(HDROP hDropInfo); afx_msg BOOL OnQueryEndSession(); |
|
From: <sv...@op...> - 2025-06-01 12:23:23
|
Author: sagamusix Date: Sun Jun 1 14:23:11 2025 New Revision: 23282 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23282 Log: [Imp] Add help button to Setup dialog title bar. Modified: trunk/OpenMPT/mptrack/MainFrm.cpp trunk/OpenMPT/mptrack/Mainfrm.h Modified: trunk/OpenMPT/mptrack/MainFrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/MainFrm.cpp Sun Jun 1 13:07:45 2025 (r23281) +++ trunk/OpenMPT/mptrack/MainFrm.cpp Sun Jun 1 14:23:11 2025 (r23282) @@ -2053,8 +2053,32 @@ return CPropertySheet::PreTranslateMessage(pMsg); } + + BOOL OnInitDialog() override + { + ModifyStyleEx(0, WS_EX_CONTEXTHELP); + return CPropertySheet::OnInitDialog(); + } + + afx_msg void OnSysCommand(UINT id, LPARAM param) + { + if(id == SC_CONTEXTHELP) + { + CMainFrame::GetMainFrame()->OnHelp(); + return; + } + CPropertySheet::OnSysCommand(id, param); + } + + DECLARE_MESSAGE_MAP() }; +BEGIN_MESSAGE_MAP(CPropertySheetMPT, CPropertySheet) + //{{AFX_MSG_MAP(CPropertySheetMPT) + ON_WM_SYSCOMMAND() + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + void CMainFrame::OnViewOptions() { @@ -2106,7 +2130,9 @@ #if defined(MPT_ENABLE_UPDATE) m_UpdateOptionsDialog = &pages->updatedlg; #endif // MPT_ENABLE_UPDATE + dlg.DoModal(); + m_SoundCardOptionsDialog = nullptr; #if defined(MPT_ENABLE_UPDATE) m_UpdateOptionsDialog = nullptr; Modified: trunk/OpenMPT/mptrack/Mainfrm.h ============================================================================== --- trunk/OpenMPT/mptrack/Mainfrm.h Sun Jun 1 13:07:45 2025 (r23281) +++ trunk/OpenMPT/mptrack/Mainfrm.h Sun Jun 1 14:23:11 2025 (r23282) @@ -409,6 +409,7 @@ afx_msg void OnAddDlsBank(); afx_msg void OnImportMidiLib(); afx_msg void OnViewOptions(); + afx_msg void OnHelp(); protected: afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); afx_msg void OnRButtonDown(UINT, CPoint); @@ -452,7 +453,6 @@ afx_msg LRESULT OnUpdateCheckSuccess(WPARAM wparam, LPARAM lparam); afx_msg LRESULT OnToolbarUpdateIndicatorClick(WPARAM wparam, LPARAM lparam); #endif // MPT_ENABLE_UPDATE - afx_msg void OnHelp(); afx_msg BOOL OnDeviceChange(UINT nEventType, DWORD_PTR dwData); afx_msg void OnDropFiles(HDROP hDropInfo); afx_msg BOOL OnQueryEndSession(); |
|
From: <sv...@op...> - 2025-06-01 11:07:52
|
Author: manx Date: Sun Jun 1 13:07:45 2025 New Revision: 23281 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23281 Log: [Fix] Installer: Inno Setup defaults to only install on x68compatible systems, however we also want to allow all other architectures that we support. Probably irrelevant in practice for now because the first stage installer itself is a x86 binary. Modified: trunk/OpenMPT/installer/install-multi-arch.iss Modified: trunk/OpenMPT/installer/install-multi-arch.iss ============================================================================== --- trunk/OpenMPT/installer/install-multi-arch.iss Sun Jun 1 13:04:08 2025 (r23280) +++ trunk/OpenMPT/installer/install-multi-arch.iss Sun Jun 1 13:07:45 2025 (r23281) @@ -27,6 +27,7 @@ AppPublisherURL=https://openmpt.org/ AppSupportURL=https://forum.openmpt.org/ AppUpdatesURL=https://openmpt.org/ +ArchitecturesAllowed=x86compatible x64compatible arm32compatible arm64 ArchitecturesInstallIn64BitMode=x64os arm64 ChangesAssociations=yes Compression=lzma2/ultra64 |
|
From: <sv...@op...> - 2025-06-01 11:04:20
|
Author: manx Date: Sun Jun 1 13:04:08 2025 New Revision: 23280 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23280 Log: [Fix] Installer: Fallback to 32bit x86 for default icon and after-setup-launching if the platform-native binary does not get installed due to too old Windows version. Modified: trunk/OpenMPT/installer/install-multi-arch.iss Modified: trunk/OpenMPT/installer/install-multi-arch.iss ============================================================================== --- trunk/OpenMPT/installer/install-multi-arch.iss Sun Jun 1 13:00:15 2025 (r23279) +++ trunk/OpenMPT/installer/install-multi-arch.iss Sun Jun 1 13:04:08 2025 (r23280) @@ -148,13 +148,17 @@ Name: {autodesktop}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('x86') Name: {autodesktop}\OpenMPT; Filename: {app}\bin\amd64\OpenMPT.exe; Check: CheckDefaultArch('amd64') -Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm') -Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64') +Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm'); MinVersion: 6.2 +Name: {autodesktop}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm'); OnlyBelowVersion: 6.2 +Name: {autodesktop}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64'); MinVersion: 10.0.19044 +Name: {autodesktop}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm64'); OnlyBelowVersion: 10.0.19044 Name: {group}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('x86') Name: {group}\OpenMPT; Filename: {app}\bin\amd64\OpenMPT.exe; Check: CheckDefaultArch('amd64') -Name: {group}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm') -Name: {group}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64') +Name: {group}\OpenMPT; Filename: {app}\bin\arm\OpenMPT.exe; Check: CheckDefaultArch('arm'); MinVersion: 6.2 +Name: {group}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm'); OnlyBelowVersion: 6.2 +Name: {group}\OpenMPT; Filename: {app}\bin\arm64\OpenMPT.exe; Check: CheckDefaultArch('arm64'); MinVersion: 10.0.19044 +Name: {group}\OpenMPT; Filename: {app}\bin\x86\OpenMPT.exe; Check: CheckDefaultArch('arm64'); OnlyBelowVersion: 10.0.19044 Name: {group}\OpenMPT (x86); Filename: {app}\bin\x86\OpenMPT.exe; Components: archx86 Name: {group}\OpenMPT (amd64); Filename: {app}\bin\amd64\OpenMPT.exe; Components: archamd64 @@ -178,8 +182,10 @@ Filename: {app}\bin\x86\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('x86') Filename: {app}\bin\amd64\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('amd64') -Filename: {app}\bin\arm\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm') -Filename: {app}\bin\arm64\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm64') +Filename: {app}\bin\arm\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm'); MinVersion: 6.2 +Filename: {app}\bin\x86\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm'); OnlyBelowVersion: 6.2 +Filename: {app}\bin\arm64\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm64'); MinVersion: 10.0.19044 +Filename: {app}\bin\x86\OpenMPT.exe; Parameters: """{code:RandomExampleFile}"""; Description: {cm:LaunchProgram,OpenMPT}; Flags: runasoriginaluser nowait postinstall skipifsilent; Check: CheckDefaultArch('arm64'); OnlyBelowVersion: 10.0.19044 |
3 messages has been excluded from this view by a project administrator.
