diff --git a/Red_Panda_CPP.pro b/Red_Panda_CPP.pro index f42e348e..710d308d 100644 --- a/Red_Panda_CPP.pro +++ b/Red_Panda_CPP.pro @@ -40,11 +40,13 @@ linux: { win32: { !isEmpty(PREFIX) { target.path = $${PREFIX} - QMAKE_SUBSTITUTES += windows/installer-scripts/config.nsh.in + QMAKE_SUBSTITUTES += windows/installer-scripts/config.nsh.in + QMAKE_SUBSTITUTES += windows/installer-scripts/config32.nsh.in resources.path = $${PREFIX} resources.files += windows/templates resources.files += windows/installer-scripts/config.nsh + resources.files += windows/installer-scripts/config32.nsh resources.files += README.md resources.files += NEWS.md resources.files += LICENSE diff --git a/packages/msys/build-i686.sh b/packages/msys/build-i686.sh index 5906fc55..5b3356ea 100644 --- a/packages/msys/build-i686.sh +++ b/packages/msys/build-i686.sh @@ -28,12 +28,13 @@ pushd . cd "${PACKAGE_DIR}" cp "${SOURCE_DIR}/windows/installer-scripts/lang.nsh" . -cp "${SOURCE_DIR}/windows/installer-scripts/redpanda-nocompiler.nsi" . +cp "${SOURCE_DIR}/windows/installer-scripts/redpanda-i686-nocompiler.nsi" . -"${NSIS}" redpanda-nocompiler.nsi +"${NSIS}" redpanda-i686-nocompiler.nsi rm -f lang.nsh +rm -f config32.nsh rm -f config.nsh -rm -f redpanda-nocompiler.nsi +rm -f redpanda-i686-nocompiler.nsi SETUP_NAME=`ls *.Setup.exe` PORTABLE_NAME=`echo $SETUP_NAME | sed 's/Setup.exe/Portable.7z/'` @@ -43,7 +44,7 @@ popd echo "Making no-compiler Portable Package..." 7z a -mmt8 -mx9 "${PORTABLE_NAME}" "${PACKAGE_DIR}" -# we need reinstall config.nsh +# we need reinstall config32.nsh pushd . cd "${BUILD_DIR}" make install @@ -60,6 +61,7 @@ cp "${SOURCE_DIR}/windows/installer-scripts/redpanda-i686.nsi" . "${NSIS}" redpanda-i686.nsi rm -f lang.nsh +rm -f config32.nsh rm -f config.nsh rm -f redpanda-i686.nsi diff --git a/packages/msys/build-x64.sh b/packages/msys/build-x64.sh index 6025f7b9..8979b809 100644 --- a/packages/msys/build-x64.sh +++ b/packages/msys/build-x64.sh @@ -33,6 +33,7 @@ cp "${SOURCE_DIR}/windows/installer-scripts/redpanda-nocompiler.nsi" . "${NSIS}" redpanda-nocompiler.nsi rm -f lang.nsh rm -f config.nsh +rm -f config32.nsh rm -f redpanda-nocompiler.nsi SETUP_NAME=`ls *.Setup.exe` @@ -61,6 +62,7 @@ cp "${SOURCE_DIR}/windows/installer-scripts/redpanda-x64.nsi" . "${NSIS}" redpanda-x64.nsi rm -f lang.nsh rm -f config.nsh +rm -f config32.nsh rm -f redpanda-x64.nsi SETUP_NAME=`ls *.Setup.exe`