Skip to content

Commit 5e6c85b

Browse files
committed
Adding ARM64 innosetup config
1 parent 7efff5a commit 5e6c85b

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

CMakeLists.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,16 +446,24 @@ CONFIGURE_FILE(cmake/sagittarius-package.in
446446
${PROJECT_BINARY_DIR}/sagittarius-package)
447447
IF (MSVC OR MINGW)
448448
# make 32 bit and 64 bit different application
449-
IF (SIZEOF_VOIDP EQUAL 4)
449+
IF (${SAGITTARIUS_PROCESSOR} MATCHES "^i.86" OR
450+
${SAGITTARIUS_PROCESSOR} STREQUAL "x86")
450451
SET(SAGITTARIUS_INSTALLER_MODE "")
451452
SET(SAGITTARIUS_INSTALLER_ARCH "ArchitecturesAllowed=x86 x64")
452453
SET(SAGITTARIUS_APP_ID "{8413617A-84F7-45B0-8CA1-5B9C46DA2217}")
453454
SET(SAGITTARIUS_ARCH "")
454-
ELSE()
455+
ELSEIF(${SAGITTARIUS_PROCESSOR} STREQUAL "x86_64")
455456
SET(SAGITTARIUS_INSTALLER_MODE "ArchitecturesInstallIn64BitMode=x64")
456457
SET(SAGITTARIUS_INSTALLER_ARCH "ArchitecturesAllowed=x64")
457458
SET(SAGITTARIUS_APP_ID "{FEBF8AAA-EB3A-43EF-B289-A7BF3B74260A}")
458459
SET(SAGITTARIUS_ARCH "_x64")
460+
ELSEIF(${SAGITTARIUS_PROCESSOR} STREQUAL "arm64")
461+
SET(SAGITTARIUS_INSTALLER_MODE "ArchitecturesInstallIn64BitMode=arm64")
462+
SET(SAGITTARIUS_INSTALLER_ARCH "ArchitecturesAllowed=arm64")
463+
SET(SAGITTARIUS_APP_ID "{5326A47F-6393-4264-9AC6-E677446E50EF}")
464+
SET(SAGITTARIUS_ARCH "_arm64")
465+
ELSE()
466+
MESSAGE(FATAL_ERROR "Unknoen processor ${SAGITTARIUS_PROCESSOR}")
459467
ENDIF()
460468
CONFIGURE_FILE(win/innosetup.iss.in
461469
${PROJECT_BINARY_DIR}/win/innosetup.iss)

dist.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ goto:eof
121121

122122
rem entry point
123123
:entry
124-
if not exist "%SASH%" goto err
124+
if not exist %SASH% goto err
125125
if "%1"=="" goto usage
126126
for %%x in (%*) do call :%%x
127127
goto end

0 commit comments

Comments
 (0)