From a9ebc52514c23ee2400d4ca74f0b9ed2c06be88f Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Mon, 28 Jul 2025 11:53:54 -0500 Subject: [PATCH] Create Windows installer #53 --- scripts/make_common.sh | 11 ----------- scripts/make_package.sh | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/scripts/make_common.sh b/scripts/make_common.sh index 7e038a5b..e8b864b9 100755 --- a/scripts/make_common.sh +++ b/scripts/make_common.sh @@ -98,15 +98,4 @@ if [ -f "${PROJECT_SOURCE_DIR}/post_build.sh" ]; then "${PROJECT_SOURCE_DIR}/post_build.sh" fi -if [ "${PROJECT_IS_MINGW}" == "1" ]; then - if [ -f "${PROJECT_DIST_DIR}/../${PROJECT_NAME}.iss" ]; then - pushd "${PROJECT_DIST_DIR}/../" - if [ "${PROJECT_IS_MINGW_UNIX}" != "1" ]; then - wine64 "c:/Program Files (x86)/Inno Setup 6/iscc.exe" "${PROJECT_NAME}.iss" || exit 1 - else - iscc "${APP}.iss" || exit 1 - fi - popd - fi -fi . "${PROJECT_SCRIPTS_DIR}/make_package.sh" "$1" "$2" "$3" "$4" "$5" diff --git a/scripts/make_package.sh b/scripts/make_package.sh index 8ede8dfd..ae706243 100755 --- a/scripts/make_package.sh +++ b/scripts/make_package.sh @@ -65,7 +65,7 @@ popd if [ "${PROJECT_IS_MINGW}" == "1" ] && [ -f "${PROJECT_DIST_DIR}/../${PROJECT_NAME}.iss" ]; then pushd "${PROJECT_DIST_DIR}/../" - if [ "${PROJECT_IS_MINGW_UNIX}" != "1" ]; then + if [ "${PROJECT_IS_MINGW_UNIX}" == "1" ]; then wine64 "c:/Program Files (x86)/Inno Setup 6/iscc.exe" "${PROJECT_NAME}.iss" || exit 1 else iscc "${PROJECT_NAME}.iss" || exit 1