From dd619411faf3b7a6e0c80175f2254d08b0304281 Mon Sep 17 00:00:00 2001
From: Albert Graef <aggraef@gmail.com>
Date: Mon, 14 Sep 2020 01:50:44 +0200
Subject: [PATCH] mingw32: Don't install any binaries into system32.

Our 32 bit Windows installer currently installs some binaries (dll and
exe files) in the Windows system32 directory. This is unnecessary (all
required dlls are already in the program bin directory where pd.exe will
readily find them), and actually a nuisance, since we currently don't
remove some of the dlls in system32 again when uninstalling, causing a
lot of inconvenient prompts from the installer when upgrading or
reinstalling.

If the user wants to run cyclist, pdreceive, or pdsend from whatever
command line he uses, he can easily add the program bin directory to
PATH himself. That's much better than having our installer pollute the
system32 directory.

The mingw64 build already does it that way, here we simply apply the
same fixes to the mingw32 build.
---
 packages/win32_inno/pd-inno-light.iss.in | 24 ++++++++++++------------
 packages/win32_inno/pd-inno.iss.in       | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/packages/win32_inno/pd-inno-light.iss.in b/packages/win32_inno/pd-inno-light.iss.in
index 526af9332..7d6319ded 100644
--- a/packages/win32_inno/pd-inno-light.iss.in
+++ b/packages/win32_inno/pd-inno-light.iss.in
@@ -706,12 +706,12 @@ Source: pd.ico; DestDir: {app}\lib
 ;-----------------------------------------------------------------------------
 ; put pdsend and pdreceive in the System dir so that they are in the path
 ;
-Source: build\bin\pdsend.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
-Source: build\bin\pdreceive.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
+;Source: build\bin\pdsend.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
+;Source: build\bin\pdreceive.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
 ; add Cyclone's cyclist.exe if it is present
-#ifexist "build\bin\cyclist.exe"
-Source: build\bin\cyclist.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
-#endif
+;#ifexist "build\bin\cyclist.exe"
+;Source: build\bin\cyclist.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
+;#endif
 ;
 ;
 ;-----------------------------------------------------------------------------
@@ -756,13 +756,13 @@ Source: build\lib\*.*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs
 ;
 ; DLLs
 ;
-Source: build\bin\lib*.dll; DestDir: {sys}; Flags: restartreplace confirmoverwrite sharedfile
-#ifexist "build\msvcp71.dll"
-Source: build\msvcp71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile
-#endif
-#ifexist "build\msvcr71.dll"
-Source: build\msvcr71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile
-#endif
+;Source: build\bin\lib*.dll; DestDir: {sys}; Flags: restartreplace confirmoverwrite sharedfile
+;#ifexist "build\msvcp71.dll"
+;Source: build\msvcp71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile
+;#endif
+;#ifexist "build\msvcr71.dll"
+;Source: build\msvcr71.dll; DestDir: {sys}; Flags: restartreplace ;uninsneveruninstall sharedfile
+;#endif
 ;; build stuff is not included now
 ;Source: build\portaudio\*.*; DestDir: {app}\portaudio; Flags: ignoreversion recursesubdirs
 ;Source: build\src\*.*; DestDir: {app}\src; Flags: ignoreversion recursesubdirs
diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in
index 615b1daa3..e7a1733e0 100755
--- a/packages/win32_inno/pd-inno.iss.in
+++ b/packages/win32_inno/pd-inno.iss.in
@@ -706,12 +706,12 @@ Source: pd.ico; DestDir: {app}\lib
 ;-----------------------------------------------------------------------------
 ; put pdsend and pdreceive in the System dir so that they are in the path
 ;
-Source: build\bin\pdsend.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
-Source: build\bin\pdreceive.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
+;Source: build\bin\pdsend.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
+;Source: build\bin\pdreceive.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
 ; add Cyclone's cyclist.exe if it is present
-#ifexist "build\bin\cyclist.exe"
-Source: build\bin\cyclist.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
-#endif
+;#ifexist "build\bin\cyclist.exe"
+;Source: build\bin\cyclist.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
+;#endif
 ;
 ;
 ;-----------------------------------------------------------------------------
@@ -756,13 +756,13 @@ Source: build\lib\*.*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs
 ;
 ; DLLs
 ;
-Source: build\bin\lib*.dll; DestDir: {sys}; Flags: restartreplace confirmoverwrite sharedfile
-#ifexist "build\msvcp71.dll"
-Source: build\msvcp71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile
-#endif
-#ifexist "build\msvcr71.dll"
-Source: build\msvcr71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile
-#endif
+;Source: build\bin\lib*.dll; DestDir: {sys}; Flags: restartreplace confirmoverwrite sharedfile
+;#ifexist "build\msvcp71.dll"
+;Source: build\msvcp71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile
+;#endif
+;#ifexist "build\msvcr71.dll"
+;Source: build\msvcr71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile
+;#endif
 ;; build stuff is not included now
 ;Source: build\portaudio\*.*; DestDir: {app}\portaudio; Flags: ignoreversion recursesubdirs
 ;Source: build\src\*.*; DestDir: {app}\src; Flags: ignoreversion recursesubdirs
-- 
GitLab