diff options
| -rw-r--r-- | packages/Makefile | 9 | ||||
| -rwxr-xr-x | packages/win32_inno/Makefile | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/packages/Makefile b/packages/Makefile index 6d65ff0f..7aff40cb 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -802,7 +802,7 @@ patch_pd: echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 < $$patch; \ done -# apply all platform-specific patches +# apply all platform-specific patches (is broken on MINGW/Windows) ifneq ($(OS_NAME),windows) for patch in $(shell ls -1 $(CWD)/patches/$(OS_NAME)/*.patch); do \ echo "Applying $$patch"; \ @@ -815,17 +815,20 @@ endif unpatch_pd: -# apply all platform-specific patches +# apply all platform-specific patches (is broken on MINGW/Windows) +ifneq ($(OS_NAME),windows) for patch in $(shell ls -1r $(CWD)/patches/$(OS_NAME)/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 -R < $$patch; \ done +endif # apply all platform-neutral patches for patch in $(shell ls -1r $(CWD)/patches/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 -R < $$patch; \ done - -rm -f -- $(pd_src)/src/configure $(pd_src)/src/makefile + -rm -f -- $(pd_src)/src/configure $(pd_src)/src/makefile \ + $(pd_src)/src/makefile.dependencies @echo " " @echo "unpatching completed." diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile index 536d1c34..8c713aa8 100755 --- a/packages/win32_inno/Makefile +++ b/packages/win32_inno/Makefile @@ -64,6 +64,7 @@ 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) @@ -79,6 +80,9 @@ lib_install: 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 # this is a quick hack, since the gripd.dll still looks for pthreadVC.dll # (test -e $(DESTDIR)$(prefix)/gripd/pthreadVC.dll && \ # install -p $(DESTDIR)$(prefix)/gripd/pthreadVC.dll $(dlldir)/pthreadVC.dll) || \ @@ -130,6 +134,7 @@ package_clean: -rm $(PD_INNO_SETUP) -chmod -R +w $(DESTDIR) -rm -rf $(DESTDIR) + -rm -rf Output clean: package_clean |