Skip to content

Commit 8097747

Browse files
committed
Preparations for release 1.7.5
1 parent 55d3e3c commit 8097747

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
cmake_minimum_required(VERSION 3.16)
2020

2121
project ( dmidiplayer
22-
VERSION 1.7.4
22+
VERSION 1.7.5
2323
LANGUAGES CXX
2424
DESCRIPTION "Drumstick MIDI File Player Multiplatform Program"
2525
HOMEPAGE_URL "https://sourceforge.net/p/dmidiplayer/"
@@ -39,6 +39,12 @@ option(BUILD_DOCS "Process Markdown sources of man pages and help files" ON)
3939
option(EMBED_TRANSLATIONS "Embed translations instead of installing" OFF)
4040
option(USE_QT5 "Choose to build with Qt5 instead of Qt6" OFF)
4141

42+
# CMAKE_SYSTEM_PROCESSOR is broken on Windows with MSVC
43+
# cmake bug https://gitlab.kitware.com/cmake/cmake/-/issues/15170 still open in 2024/12
44+
if(MSVC)
45+
string(TOLOWER ${MSVC_CXX_ARCHITECTURE_ID} CMAKE_SYSTEM_PROCESSOR)
46+
endif()
47+
4248
include(SCMRevision)
4349

4450
if (USE_QT5)
@@ -53,7 +59,7 @@ else()
5359
find_package ( Qt6 6.2 COMPONENTS Gui Widgets PrintSupport LinguistTools Core5Compat REQUIRED )
5460
endif()
5561

56-
find_package ( Drumstick 2.9 COMPONENTS File RT Widgets REQUIRED )
62+
find_package ( Drumstick 2.10 COMPONENTS File RT Widgets REQUIRED )
5763
find_package ( uchardet 0.0.8 COMPONENTS libuchardet REQUIRED )
5864

5965
SET(SOURCES

ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2024-12-21
2+
* Preparations for release 1.7.5
3+
building with msvc 2022 on Windows
4+
using Drumstick 2.10
5+
6+
2024-12-14
7+
* BackendManager fixed
8+
19
2024-08-31
210
* Release 1.7.4
311

dmidiplayer_msvc.nsi.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,13 +390,13 @@ SectionEnd
390390
# Installer functions
391391
Function .onInit
392392
!insertmacro MUI_LANGDLL_DISPLAY
393-
${If} ${CPU} == "ARM64"
393+
${If} ${CPU} == "arm64"
394394
${IfNot} ${IsNativeARM64}
395395
MessageBox MB_OK|MB_ICONSTOP "Sorry, this setup package is for arm64 systems only."
396396
Quit
397397
${EndIf}
398398
StrCpy $INSTDIR "$PROGRAMFILES64\${PROGNAME}"
399-
${ElseIf} ${CPU} == "AMD64"
399+
${ElseIf} ${CPU} == "x64"
400400
${If} ${IsNativeAMD64}
401401
StrCpy $INSTDIR "$PROGRAMFILES64\${PROGNAME}"
402402
${Else}

0 commit comments

Comments
 (0)