epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install x64 release into correct Program Files on Windows.

Browse Source
This commit is contained in:
Paul Chote
2019-10-27 22:05:08 +00:00
committed by abcdefg30
parent d2991247a3
commit 3ee697a54d
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packaging/windows/OpenRA.nsi
View File

@@ -14,7 +14,6 @@
; You should have received a copy of the GNU General Public License ; You should have received a copy of the GNU General Public License
; along with OpenRA. If not, see <http://www.gnu.org/licenses/>. ; along with OpenRA. If not, see <http://www.gnu.org/licenses/>.
!include "MUI2.nsh" !include "MUI2.nsh"
!include "FileFunc.nsh" !include "FileFunc.nsh"
!include "WordFunc.nsh" !include "WordFunc.nsh"
@@ -24,8 +23,20 @@ OutFile "OpenRA.Setup.exe"
ManifestDPIAware true ManifestDPIAware true
InstallDir "$PROGRAMFILES\OpenRA${SUFFIX}" Function .onInit
InstallDirRegKey HKLM "Software\OpenRA${SUFFIX}" "InstallDir" !ifndef USE_PROGRAMFILES32
SetRegView 64
!endif
ReadRegStr $INSTDIR HKLM "Software\OpenRA${SUFFIX}" "InstallDir"
StrCmp $INSTDIR "" unset done
unset:
!ifndef USE_PROGRAMFILES32
StrCpy $INSTDIR "$PROGRAMFILES64\OpenRA${SUFFIX}"
!else
StrCpy $INSTDIR "$PROGRAMFILES32\OpenRA${SUFFIX}"
!endif
done:
FunctionEnd
SetCompressor lzma SetCompressor lzma
RequestExecutionLevel admin RequestExecutionLevel admin

6
packaging/windows/buildpackage.sh
View File

@@ -40,8 +40,10 @@ function build_platform()
echo "Building core files ($1)" echo "Building core files ($1)"
if [ "$1" = "x86" ]; then if [ "$1" = "x86" ]; then
IS_WIN32="WIN32=true" IS_WIN32="WIN32=true"
USE_PROGRAMFILES32="-DUSE_PROGRAMFILES32=true"
else else
IS_WIN32="WIN32=false" IS_WIN32="WIN32=false"
USE_PROGRAMFILES32=""
fi fi
pushd "${SRCDIR}" > /dev/null || exit 1 pushd "${SRCDIR}" > /dev/null || exit 1
@@ -69,7 +71,7 @@ function build_platform()
markdown "${SRCDIR}/CONTRIBUTING.md" > "${BUILTDIR}/CONTRIBUTING.html" markdown "${SRCDIR}/CONTRIBUTING.md" > "${BUILTDIR}/CONTRIBUTING.html"
echo "Building Windows setup.exe ($1)" echo "Building Windows setup.exe ($1)"
makensis -V2 -DSRCDIR="${BUILTDIR}" -DDEPSDIR="${SRCDIR}/thirdparty/download/windows" -DTAG="${TAG}" -DSUFFIX="${SUFFIX}" OpenRA.nsi makensis -V2 -DSRCDIR="${BUILTDIR}" -DDEPSDIR="${SRCDIR}/thirdparty/download/windows" -DTAG="${TAG}" -DSUFFIX="${SUFFIX}" ${USE_PROGRAMFILES32} OpenRA.nsi
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
mv OpenRA.Setup.exe "${OUTPUTDIR}/OpenRA-$TAG-$1.exe" mv OpenRA.Setup.exe "${OUTPUTDIR}/OpenRA-$TAG-$1.exe"
else else
@@ -80,4 +82,4 @@ function build_platform()
} }
build_platform "x86" build_platform "x86"
build_platform "x64" build_platform "x64"