mirrors/TS2-Starter-Pack
1
0
Fork 0
mirror of https://github.com/voicemxil/TS2-Starter-Pack.git synced 2025-01-22 17:12:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update DXVK to 2.4.1 and bump version

Browse source
This commit is contained in:
osab 2024-09-27 01:16:01 -04:00
parent d6398cefe4
commit da251f27bb
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
components/d3d9.dll
View file

Binary file not shown.

10
src/Standalone_Installer.nsi
View file

@ -18,11 +18,11 @@ RequestExecutionLevel admin
InstallDir "$PROGRAMFILES32\The Sims 2 Starter Pack\" InstallDir "$PROGRAMFILES32\The Sims 2 Starter Pack\"
SetCompressor /SOLID LZMA SetCompressor /SOLID LZMA
ManifestDPIAware True ManifestDPIAware True
VIProductVersion 15.0.0.0 VIProductVersion 15.0.2.0
VIAddVersionKey "CompanyName" "osab" VIAddVersionKey "CompanyName" "osab"
VIAddVersionKey "FileVersion" "15" VIAddVersionKey "FileVersion" "15.0.2"
VIAddVersionKey "ProductName" "The Sims 2 Starter Pack" VIAddVersionKey "ProductName" "The Sims 2 Starter Pack"
VIAddVersionKey "ProductVersion" "15" VIAddVersionKey "ProductVersion" "15.0.2"
# MUI SETUP # MUI SETUP
brandingText "osab Standalone Installer v15" brandingText "osab Standalone Installer v15"
@ -245,7 +245,7 @@ SectionGroup /e "Graphical Fixes\Tweaks"
MessageBox MB_YESNO "DXVK requires Vulkan support. If the message box said it successfully created a Vulkan instance, click Yes. Otherwise, click NO." IDYES true IDNO false MessageBox MB_YESNO "DXVK requires Vulkan support. If the message box said it successfully created a Vulkan instance, click Yes. Otherwise, click NO." IDYES true IDNO false
true: true:
SetOutPath "$INSTDIR\Fun with Pets\SP9\TSBin" SetOutPath "$INSTDIR\Fun with Pets\SP9\TSBin"
DetailPrint "Extracting DXVK 2.4..." DetailPrint "Extracting DXVK 2.4.1..."
File "..\components\d3d9.dll" File "..\components\d3d9.dll"
Pop $0 # return value = exit code, "OK" means OK Pop $0 # return value = exit code, "OK" means OK
DetailPrint "DXVK extract status: $0." DetailPrint "DXVK extract status: $0."
@ -371,7 +371,7 @@ SectionEnd
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${Section1} "Touches up your local copy of The Sims 2 Ultimate Collection and installs Sims2RPC v1.15." !insertmacro MUI_DESCRIPTION_TEXT ${Section1} "Touches up your local copy of The Sims 2 Ultimate Collection and installs Sims2RPC v1.15."
!insertmacro MUI_DESCRIPTION_TEXT ${Section3} "Installs Graphics Rules Maker." !insertmacro MUI_DESCRIPTION_TEXT ${Section3} "Installs Graphics Rules Maker."
!insertmacro MUI_DESCRIPTION_TEXT ${Section4} "Installs DXVK 2.4. (Not recommended for beginners.)" !insertmacro MUI_DESCRIPTION_TEXT ${Section4} "Installs DXVK 2.4.1. (Not recommended for beginners.)"
!insertmacro MUI_DESCRIPTION_TEXT ${Section5} "Installs SimNopke's Sim Shadow Fix to your downloads folder for Windows 8 or higher. *Don't Use With DXVK*." !insertmacro MUI_DESCRIPTION_TEXT ${Section5} "Installs SimNopke's Sim Shadow Fix to your downloads folder for Windows 8 or higher. *Don't Use With DXVK*."
!insertmacro MUI_DESCRIPTION_TEXT ${Section6} "Installs Lazy Duchess's Bright CAS Fix to your Downloads folder." !insertmacro MUI_DESCRIPTION_TEXT ${Section6} "Installs Lazy Duchess's Bright CAS Fix to your Downloads folder."
!insertmacro MUI_DESCRIPTION_TEXT ${Section11} "Installs Visual C++ Redist (x86) if not already installed." !insertmacro MUI_DESCRIPTION_TEXT ${Section11} "Installs Visual C++ Redist (x86) if not already installed."

16
src/Web_Installer.nsi
View file

@ -34,14 +34,14 @@ RequestExecutionLevel admin
InstallDir "$PROGRAMFILES32\The Sims 2 Starter Pack" InstallDir "$PROGRAMFILES32\The Sims 2 Starter Pack"
SetCompressor /SOLID LZMA SetCompressor /SOLID LZMA
ManifestDPIAware True ManifestDPIAware True
VIProductVersion 15.0.0.0 VIProductVersion 15.0.2.0
VIAddVersionKey "CompanyName" "osab" VIAddVersionKey "CompanyName" "osab"
VIAddVersionKey "FileVersion" "15.0.0" VIAddVersionKey "FileVersion" "15.0.2"
VIAddVersionKey "ProductName" "The Sims 2 Starter Pack" VIAddVersionKey "ProductName" "The Sims 2 Starter Pack"
VIAddVersionKey "ProductVersion" "15.0" VIAddVersionKey "ProductVersion" "15.0.2"
# MUI setup ---------------------------------------------------------------- # MUI setup ----------------------------------------------------------------
brandingText "osab Web Installer v15" brandingText "osab Web Installer v15.0.2"
!define MUI_ABORTWARNING !define MUI_ABORTWARNING
!define MUI_INSTFILESPAGE_COLORS "FFFFFF 000000" !define MUI_INSTFILESPAGE_COLORS "FFFFFF 000000"
!define MUI_HEADERIMAGE !define MUI_HEADERIMAGE
@ -82,7 +82,7 @@ Var DXVKVER
Function .OnInit Function .OnInit
Dialer::AttemptConnect Dialer::AttemptConnect
StrCpy $DXVKVER "2.4" StrCpy $DXVKVER "2.4.1"
FunctionEnd FunctionEnd
InstType "Full" IT_FULL InstType "Full" IT_FULL
@ -292,7 +292,6 @@ SectionGroup /e "Graphical Fixes/Tweaks"
Section "Graphics Rules Maker" Section4 Section "Graphics Rules Maker" Section4
SectionInstType ${IT_FULL} SectionInstType ${IT_FULL}
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
${If} ${IsWin8.1} ${If} ${IsWin8.1}
${OrIf} ${IsWin8} ${OrIf} ${IsWin8}
@ -324,7 +323,6 @@ SectionGroup /e "Graphical Fixes/Tweaks"
SectionEnd SectionEnd
Section /o "DXVK" Section6 Section /o "DXVK" Section6
SetOutPath $INSTDIR\temp SetOutPath $INSTDIR\temp
DetailPrint "Downloading Vulkan-Test to check for DXVK support..." DetailPrint "Downloading Vulkan-Test to check for DXVK support..."
@ -338,11 +336,11 @@ SectionGroup /e "Graphical Fixes/Tweaks"
true: true:
SetOutPath "$INSTDIR\Fun with Pets\SP9\TSBin\" SetOutPath "$INSTDIR\Fun with Pets\SP9\TSBin\"
DetailPrint "Downloading DXVK $DXVKVER..." DetailPrint "Downloading DXVK $DXVKVER..."
NScurl::http GET "https://raw.githubusercontent.com/voicemxil/TS2-Starter-Pack/v15/components/d3d9.dll" "$INSTDIR\Fun with Pets\SP9\TSBin\d3d9.dll" /RESUME /INSIST /END NScurl::http GET "https://raw.githubusercontent.com/voicemxil/TS2-Starter-Pack/v15.0.2/components/d3d9.dll" "$INSTDIR\Fun with Pets\SP9\TSBin\d3d9.dll" /RESUME /INSIST /END
Pop $0 # return value = exit code, "OK" means OK Pop $0 # return value = exit code, "OK" means OK
DetailPrint "DXVK download status: $0." DetailPrint "DXVK download status: $0."
NScurl::http GET "https://raw.githubusercontent.com/voicemxil/TS2-Starter-Pack/v15/components/dxvk.conf" "$INSTDIR\Fun with Pets\SP9\TSBin\dxvk.conf" /RESUME /INSIST /END NScurl::http GET "https://raw.githubusercontent.com/voicemxil/TS2-Starter-Pack/v15.0.2/components/dxvk.conf" "$INSTDIR\Fun with Pets\SP9\TSBin\dxvk.conf" /RESUME /INSIST /END
Pop $0 Pop $0
DetailPrint "DXVK.conf download status: $0." DetailPrint "DXVK.conf download status: $0."
goto next goto next