From fd59e7a2ef4bc0de3d89ac27694121c5d71b888c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 10 Jun 2025 17:06:34 +0200 Subject: [PATCH] Don't copy the d3dcompiler dll to distributions --- Windows/zipup.cmd | 5 +---- libretro/Makefile.common | 2 +- ppsspp.iss | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Windows/zipup.cmd b/Windows/zipup.cmd index 011770fdcc..b4ffc96617 100644 --- a/Windows/zipup.cmd +++ b/Windows/zipup.cmd @@ -13,12 +13,9 @@ del %name% echo Adding files to %name% REM Not distributing the 10 version because it's not compatible with older Windows. -copy dx9sdk\8.1\Redist\D3D\x64\d3dcompiler_47.dll . -copy dx9sdk\8.1\Redist\D3D\x86\d3dcompiler_47.dll .\d3dcompiler_47.x86.dll @echo on -zip --recurse-paths %name% assets PPSSPPWindows.exe PPSSPPWindows64.exe d3dcompiler_47.dll d3dcompiler_47.x86.dll README.md +zip --recurse-paths %name% assets PPSSPPWindows.exe PPSSPPWindows64.exe README.md @echo off -del d3dcompiler_47.dll d3dcompiler_v47.x86.dll echo Done: %name% goto DONE diff --git a/libretro/Makefile.common b/libretro/Makefile.common index dc7a0ddf64..380e943851 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -998,7 +998,7 @@ SOURCES_CXX += \ $(COMMONDIR)/GPU/D3D11/D3D11Loader.cpp \ $(COMMONDIR)/GPU/D3D11/thin3d_d3d11.cpp -INCFLAGS += -I$(CORE_DIR)/dx9sdk/Include -I$(CORE_DIR)/dx9sdk/Include/DX11 +INCFLAGS += -I$(CORE_DIR)/dx9sdk/Include/DX11 endif diff --git a/ppsspp.iss b/ppsspp.iss index 717157ccb4..ca028eedfb 100644 --- a/ppsspp.iss +++ b/ppsspp.iss @@ -102,8 +102,6 @@ Source: "assets\debugger\*"; DestDir: "{app}\assets\debugger"; Flags: recursesub Source: "assets\lang\*.ini"; DestDir: "{app}\assets\lang" Source: "assets\flash0\font\*.*"; DestDir: "{app}\assets\flash0\font" Source: "assets\vfpu\*.*"; DestDir: "{app}\assets\vfpu" -Source: "dx9sdk\8.1\Redist\D3D\x64\d3dcompiler_47.dll"; DestDir: "{app}" -Source: "dx9sdk\8.1\Redist\D3D\x86\d3dcompiler_47.dll"; DestName: "d3dcompiler_47.x86.dll"; DestDir: "{app}" [Run] Filename: {app}\PPSSPPWindows.exe; Description: {cm:LaunchProgram,{#ApplicationName}}; Flags: nowait postinstall skipifsilent; Check: not IsWin64