[PD-cvs] packages/win32_inno Makefile, 1.24, 1.25 pd-inno.iss.in, 1.10, 1.11
Hans-Christoph Steiner
eighthave at users.sourceforge.net
Thu May 17 01:02:50 CEST 2007
Update of /cvsroot/pure-data/packages/win32_inno
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7880
Modified Files:
Makefile pd-inno.iss.in
Log Message:
switched DLLs to install into system32 to reduce chances of DLL Hell
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/packages/win32_inno/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Makefile 14 Dec 2006 17:04:08 -0000 1.24
--- Makefile 16 May 2007 23:02:48 -0000 1.25
***************
*** 67,87 ****
system32 = /c/WINDOWS/system32
# ultimately, the DLLs should be installed in %SystemRoot%\system32 by InnoSetup
! #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
# if these are there, install them
! -install -p $(system32)/msvcp71.dll $(dlldir)/msvcp71.dll
! -install -p $(system32)/pthreadVC.dll $(dlldir)/pthreadVC.dll
# these go into the Pd package's lib dir
install -d $(libdir)/tcl8.4
--- 67,89 ----
system32 = /c/WINDOWS/system32
# ultimately, the DLLs should be installed in %SystemRoot%\system32 by InnoSetup
! 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)
! 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)
! -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
Index: pd-inno.iss.in
===================================================================
RCS file: /cvsroot/pure-data/packages/win32_inno/pd-inno.iss.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pd-inno.iss.in 15 May 2007 22:12:34 -0000 1.10
--- pd-inno.iss.in 16 May 2007 23:02:48 -0000 1.11
***************
*** 129,133 ****
Source: build\gripd\*.*; DestDir: {app}\gripd; Flags: ignoreversion
#endif
!
;; build stuff is not included now
;Source: build\portaudio\*.*; DestDir: {app}\portaudio; Flags: ignoreversion recursesubdirs
--- 129,143 ----
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
More information about the Pd-cvs
mailing list