diff --git a/distribution/windows/install.nsi b/distribution/windows/install.nsi index 120d2b99f3..d43d8bde2b 100644 --- a/distribution/windows/install.nsi +++ b/distribution/windows/install.nsi @@ -14,14 +14,15 @@ !if "${PLATFORM}" == "Win32" !define OPENRCT2_EXE "openrct2.exe" !define OPENRCT2_DLL "openrct2.dll" - !define APPBITS 32 - !define APPARCH "win32" + !define APPBITS 32 + !define APPARCH "win32" InstallDir "$PROGRAMFILES32\OpenRCT2\" !else - !define OPENRCT2_EXE "openrct2_x64.exe" - !define APPBITS 64 - !define APPARCH "win64" + !define OPENRCT2_EXE "openrct2_x64.exe" + !define OPENRCT2_SEGMENT_INFO "openrct2_data" + !define APPBITS 64 + !define APPARCH "win64" InstallDir "$PROGRAMFILES64\OpenRCT2\" !endif @@ -159,6 +160,9 @@ Section "!OpenRCT2" Section1 !ifdef OPENRCT2_DLL File /oname=${OPENRCT2_DLL} ${BINARY_DIR}\${OPENRCT2_DLL} !endif +!ifdef OPENRCT2_SEGMENT_INFO + File /oname=${OPENRCT2_SEGMENT_INFO} ${BINARY_DIR}\${OPENRCT2_SEGMENT_INFO} +!endif ; Create the Registry Entries WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenRCT2" "Comments" "Visit ${APPURLLINK}" @@ -228,6 +232,9 @@ Section "Uninstall" Delete "$INSTDIR\${OPENRCT2_EXE}" !ifdef OPENRCT2_DLL Delete "$INSTDIR\${OPENRCT2_DLL}" +!endif +!ifdef OPENRCT2_SEGMENT_INFO + Delete "$INSTDIR\${OPENRCT2_SEGMENT_INFO}" !endif Delete "$INSTDIR\INSTALL.LOG" diff --git a/openrct2.proj b/openrct2.proj index 77abbbeb1a..ac3721f911 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -38,6 +38,7 @@ $(TargetDir)openrct2.dll $(TargetDir)openrct2.exe $(TargetPath) + $(TargetDir)openrct2_data $(TargetDir)data\g2.dat $(DistDir)windows\code-sign-key-openrct2.org.pfx @@ -75,6 +76,7 @@ + @@ -132,7 +134,8 @@ - + + @@ -156,6 +159,23 @@ + + + + + + +