diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2012-10-24 18:24:23 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2012-10-24 18:24:23 +0000 |
| commit | 16eff6c6f90e5eff3b96e03284f11bb9af122024 (patch) | |
| tree | b794c786dad0dc0c7dbd478718c0a6bc4562830a | |
| parent | 000defc11e665c7c417fd6802e781060e13938bf (diff) | |
on MinGW, move media_install symlinking to the Inno Setup packaging: MinGW's ln is cp, so you can't ln a file that doesn't exist
svn path=/trunk/; revision=16488
| -rw-r--r-- | doc/Makefile | 5 | ||||
| -rwxr-xr-x | packages/win32_inno/pd-inno.iss.in | 13 |
2 files changed, 18 insertions, 0 deletions
diff --git a/doc/Makefile b/doc/Makefile index f802ba88..149f24f6 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -105,6 +105,10 @@ media_install: $(pddocdir) install -d $(DESTDIR)$(pddocdir)/$(MEDIA_NAME) install -p $(doc_src)/media/*.* \ $(DESTDIR)$(pddocdir)/$(MEDIA_NAME) +# ln is cp on MinGW, so these won't work since the target files don't exist at +# the time that the media_install target is generally run. For MinGW, this is +# instead handled in packages/win32_inno/pd-inno.iss.in +ifneq (MINGW,$(findstring MINGW,$(UNAME))) # random sound files ln -s ../../doc/sound/bell.aiff \ $(DESTDIR)$(pddocdir)/$(MEDIA_NAME)/bell.aiff @@ -127,6 +131,7 @@ media_install: $(pddocdir) $(DESTDIR)$(pddocdir)/$(MEDIA_NAME)/homer.avi ln -s ../../extra/Gem/examples/data/anim-1.mov \ $(DESTDIR)$(pddocdir)/$(MEDIA_NAME)/anim-1.mov +endif media_clean: -rm -f -- $(DESTDIR)$(pddocdir)/$(MEDIA_NAME)/*.* diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in index c389cafc..fc0fad8c 100755 --- a/packages/win32_inno/pd-inno.iss.in +++ b/packages/win32_inno/pd-inno.iss.in @@ -362,6 +362,19 @@ Source: build\lib\*.*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs Source: build\startup\*.*; DestDir: {app}\startup; Flags: ignoreversion recursesubdirs confirmoverwrite uninsremovereadonly promptifolder; Attribs: readonly
Source: build\tcl\*.*; DestDir: {app}\tcl; Flags: ignoreversion confirmoverwrite uninsremovereadonly; Attribs: readonly
;
+; put all extra media in the main media for easy finding, same as doc/Makefile's make media_install for other platforms
+;
+Source: build\doc\sound\bell.aiff; DestDir: {app}\doc\media; Flags: ignoreversion confirmoverwrite uninsremovereadonly; Attribs: readonly
+Source: build\doc\sound\voice.wav; DestDir: {app}\doc\media; Flags: ignoreversion confirmoverwrite uninsremovereadonly; Attribs: readonly
+Source: build\doc\sound\voice2.wav; DestDir: {app}\doc\media; Flags: ignoreversion confirmoverwrite uninsremovereadonly; Attribs: readonly
+Source: build\extra\bsaylor\examples\noiseburst.wav; DestDir: {app}\doc\media; Flags: ignoreversion confirmoverwrite uninsremovereadonly; Attribs: readonly
+Source: build\extra\ekext\examples\stink.wav; DestDir: {app}\doc\media; Flags: ignoreversion confirmoverwrite uninsremovereadonly; Attribs: readonly
+Source: build\extra\ekext\examples\beauty.wav; DestDir: {app}\doc\media; Flags: ignoreversion confirmoverwrite uninsremovereadonly; Attribs: readonly
+Source: build\extra\ekext\examples\drummach.wav; DestDir: {app}\doc\media; Flags: ignoreversion confirmoverwrite uninsremovereadonly; Attribs: readonly
+Source: build\extra\Gem\examples\data\alea.mpg; DestDir: {app}\doc\media; Flags: ignoreversion confirmoverwrite uninsremovereadonly; Attribs: readonly
+Source: build\extra\Gem\examples\data\homer.avi; DestDir: {app}\doc\media; Flags: ignoreversion confirmoverwrite uninsremovereadonly; Attribs: readonly
+Source: build\extra\Gem\examples\data\anim-1.mov; DestDir: {app}\doc\media; Flags: ignoreversion confirmoverwrite uninsremovereadonly; Attribs: readonly
+;
; DLLs
;
Source: build\lib*.dll; DestDir: {sys}; Flags: restartreplace confirmoverwrite sharedfile
|