Avoid ls errors when default paths for Pd on Windows do not exist
Such error messages are confusing if you do not intend to use default paths. Therefore the probes with ls are removed. Paths to m_pd.h and pd.dll are probed later in the process when they are possibly overriden by user definitions.
This commit is contained in:
parent
9240b64eba
commit
fe45bcb376
1 changed files with 7 additions and 2 deletions
|
|
@ -602,8 +602,8 @@ ifeq ($(system), Windows)
|
||||||
else
|
else
|
||||||
programfiles := $(PROGRAMFILES)
|
programfiles := $(PROGRAMFILES)
|
||||||
endif
|
endif
|
||||||
pdbinpath := $(shell ls -d "$(programfiles)/Pd/bin")
|
pdbinpath := $(programfiles)/Pd/bin
|
||||||
pdincludepath := $(shell ls -d "$(programfiles)/Pd/src")
|
pdincludepath := $(programfiles)/Pd/src
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Store default path to pd.dll in PDBINDIR if the latter is not user-defined.
|
# Store default path to pd.dll in PDBINDIR if the latter is not user-defined.
|
||||||
|
|
@ -747,6 +747,11 @@ ifdef PDINCLUDEDIR
|
||||||
mpdh := $(shell ls "$(PDINCLUDEDIR)/m_pd.h")
|
mpdh := $(shell ls "$(PDINCLUDEDIR)/m_pd.h")
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# store path to pd.dll; if not found, ls will give a useful error
|
||||||
|
ifeq ($(system), Windows)
|
||||||
|
pddll := $(shell ls "$(PDBINDIR)/pd.dll")
|
||||||
|
endif
|
||||||
|
|
||||||
# print Makefile.pdlibbuilder version
|
# print Makefile.pdlibbuilder version
|
||||||
$(info ++++ info: using Makefile.pdlibbuilder version $(version))
|
$(info ++++ info: using Makefile.pdlibbuilder version $(version))
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue