aboutsummaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/win32_inno/Makefile28
-rwxr-xr-xpackages/win32_inno/pd-inno.iss.in12
2 files changed, 26 insertions, 14 deletions
diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile
index 0b9c180a..95e501e9 100755
--- a/packages/win32_inno/Makefile
+++ b/packages/win32_inno/Makefile
@@ -66,23 +66,25 @@ prebuilt_install:
bin_src = /usr/local/bin
system32 = /c/WINDOWS/system32
# ultimately, the DLLs should be installed in %SystemRoot%\system32 by InnoSetup
-#dlldir = $(DESTDIR)$(prefix)/
-dlldir = $(bindir)
+dlldir = $(DESTDIR)$(prefix)/
+#dlldir = $(bindir)
lib_install:
# these get installed into %SystemRoot%\system32 by the installer
install -d $(dlldir)
- install -p $(bin_src)/libogg-0.dll $(dlldir)/libogg-0.dll
- install -p $(bin_src)/libsndfile-1.dll $(dlldir)/libsndfile-1.dll
- install -p $(bin_src)/libvorbis-0.dll $(dlldir)/libvorbis-0.dll
- install -p $(bin_src)/libvorbisenc-2.dll $(dlldir)/libvorbisenc-2.dll
- install -p $(bin_src)/libvorbisfile-3.dll $(dlldir)/libvorbisfile-3.dll
- install -p $(bin_src)/pthreadGC2.dll $(dlldir)/pthreadGC2.dll
- install -p $(bin_src)/tcl84.dll $(dlldir)/tcl84.dll
- install -p $(bin_src)/tclpip84.dll $(dlldir)/tclpip84.dll
- install -p $(bin_src)/tk84.dll $(dlldir)/tk84.dll
+ install -p $(bin_src)/libogg-0.dll $(dlldir)
+ install -p $(bin_src)/libsndfile-1.dll $(dlldir)
+ install -p $(bin_src)/libvorbis-0.dll $(dlldir)
+ install -p $(bin_src)/libvorbisenc-2.dll $(dlldir)
+ install -p $(bin_src)/libvorbisfile-3.dll $(dlldir)
+ install -p $(bin_src)/pthreadGC2.dll $(dlldir)
+# these stay with pd.exe
+ install -p $(bin_src)/tcl84.dll $(bindir)
+ install -p $(bin_src)/tclpip84.dll $(bindir)
+ install -p $(bin_src)/tk84.dll $(bindir)
# if these are there, install them
- -install -p $(system32)/msvcp71.dll $(dlldir)/msvcp71.dll
- -install -p $(system32)/pthreadVC.dll $(dlldir)/pthreadVC.dll
+ -install -p $(system32)/msvcp71.dll $(dlldir)
+ -install -p $(system32)/msvcr71.dll $(dlldir)
+ -install -p $(system32)/pthreadVC.dll $(dlldir)
# these go into the Pd package's lib dir
install -d $(libdir)/tcl8.4
cp -r /usr/local/lib/tcl8.4/* $(libdir)/tcl8.4
diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in
index 903c359a..7174fdc5 100755
--- a/packages/win32_inno/pd-inno.iss.in
+++ b/packages/win32_inno/pd-inno.iss.in
@@ -128,7 +128,17 @@ Source: build\lib\*.*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs
#ifexist "build\gripd"
Source: build\gripd\*.*; DestDir: {app}\gripd; Flags: ignoreversion
#endif
-
+;
+; DLLs
+;
+Source: build\lib*.dll; DestDir: {sys}; Flags: restartreplace confirmoverwrite sharedfile
+Source: build\pthread*.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