diff --git a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/iggy_w64.dll b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/iggy_w64.dll deleted file mode 100644 index 43430508..00000000 Binary files a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/iggy_w64.dll and /dev/null differ diff --git a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/binkawin64.asi b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/binkawin64.asi deleted file mode 100644 index d363b31d..00000000 Binary files a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/binkawin64.asi and /dev/null differ diff --git a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dolby.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dolby.flt deleted file mode 100644 index 7e9eb605..00000000 Binary files a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dolby.flt and /dev/null differ diff --git a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64ds3d.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64ds3d.flt deleted file mode 100644 index c6a6a125..00000000 Binary files a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64ds3d.flt and /dev/null differ diff --git a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dsp.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dsp.flt deleted file mode 100644 index 28caa28e..00000000 Binary files a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64dsp.flt and /dev/null differ diff --git a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64eax.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64eax.flt deleted file mode 100644 index c91b6e16..00000000 Binary files a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64eax.flt and /dev/null differ diff --git a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64srs.flt b/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64srs.flt deleted file mode 100644 index 01baef15..00000000 Binary files a/Minecraft.Client/Common/Buildsteps/Contents/Windows64/redist64/mss64srs.flt and /dev/null differ diff --git a/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1 b/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1 index 87538eb9..d512ad32 100644 --- a/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1 +++ b/Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1 @@ -26,7 +26,7 @@ $folderCopies = @( @{ Source = "Windows64Media"; Dest = "Windows64Media" }, @{ Source = "Windows64Media\Sound"; Dest = "Windows64Media\Sound" }, #@{ Source = "PSVita\Tutorial"; Dest = "Windows64Media\Tutorial" }, # str1k3r - doesnt even work bru - @{ Source = Join-Path $PSScriptRoot "Contents\Windows64\redist64"; Dest = "Windows64\redist64" } + @{ Source = "Windows64\Miles\lib\redist64"; Dest = "Windows64\redist64" } ) foreach ($copy in $folderCopies) { @@ -46,8 +46,8 @@ foreach ($copy in $folderCopies) { $fileCopies = @( @{ Source = Join-Path $ProjectDir "Windows64\4JLibs\4J_Input\Windows64\vendor\SDL\lib\x64\SDL3.dll"; Dest = "SDL3.dll" }, - @{ Source = Join-Path $PSScriptRoot "Contents\Windows64\iggy_w64.dll"; Dest = "iggy_w64.dll" }, - @{ Source = Join-Path $PSScriptRoot "Contents\Windows64\mss64.dll"; Dest = "mss64.dll" } + @{ Source = Join-Path $PSScriptRoot "Contents\Windows64\mss64.dll"; Dest = "mss64.dll" }, + @{ Source = "Windows64\redist64\iggy_w64.dll"; Dest = "iggy_w64.dll" } ) foreach ($copy in $fileCopies) { diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj index 18f12ac8..46a1b866 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj +++ b/Minecraft.Client/Minecraft.Client.vcxproj @@ -938,7 +938,7 @@ true $(OutDir)$(ProjectName).pdb - d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies) + d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies) NotSet false @@ -1050,7 +1050,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU true $(OutDir)$(ProjectName).pdb - d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies) + d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies) NotSet false @@ -1747,7 +1747,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse $(OutDir)default.pdb true - d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies) + d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies) false @@ -1791,7 +1791,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse $(OutDir)default.pdb true - d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies) + d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies) xapilib.lib false false @@ -1830,7 +1830,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU true $(OutDir)$(ProjectName).pdb - d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies) + d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies) NotSet false @@ -1871,7 +1871,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUfalse $(OutDir)default.pdb true - d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies) + d3d11.lib;..\Minecraft.World\x64_$(Configuration)\Minecraft.World.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib;%(AdditionalDependencies) xapilib.lib false false