doohoyi/comport
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix priority for user path variables 'PDDIR' & Co.

Browse source 
The order of variable expansion prevented this for the path
to binary 'pd.dll'.
This commit is contained in:
katjav 2018-01-24 22:50:20 +01:00
parent 1361dd3999
commit 7740128257
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile.pdlibbuilder
View file

@ -591,12 +591,9 @@ endif
# paths for 32-bit executables on 64-bit Windows aren't yet defined here (TODO) # paths for 32-bit executables on 64-bit Windows aren't yet defined here (TODO)
ifeq ($(system), Windows) ifeq ($(system), Windows)
pkglibdir := $(APPDATA)/Pd pkglibdir := $(APPDATA)/Pd
ifndef pdbinpath pdbinpath := $(shell ls -d "$(PROGRAMFILES)/pd/bin")
pdbinpath := $(shell ls -d "$(PROGRAMFILES)/pd/bin") pdincludepath := $(shell ls -d "$(PROGRAMFILES)/pd/src")
endif PDBINDIR ?= $(pdbinpath)
ifndef pdincludepath
pdincludepath := $(shell ls -d "$(PROGRAMFILES)/pd/src")
endif
endif endif
# TODO: decide whether -mms-bitfields should be specified. # TODO: decide whether -mms-bitfields should be specified.
@ -613,14 +610,14 @@ ifeq ($(system), Windows)
extension = dll extension = dll
c.flags := c.flags :=
c.ldflags = -static-libgcc -shared \ c.ldflags = -static-libgcc -shared \
-Wl,--enable-auto-import "$(pdbinpath)/pd.dll" -Wl,--enable-auto-import "$(PDBINDIR)/pd.dll"
c.ldlibs := c.ldlibs :=
cxx.flags := -fcheck-new cxx.flags := -fcheck-new
cxx.ldflags = -static-libstdc++ -shared \ cxx.ldflags = -static-libstdc++ -shared \
-Wl,--enable-auto-import "$(pdbinpath)/pd.dll" -Wl,--enable-auto-import "$(PDBINDIR)/pd.dll"
cxx.ldlibs := cxx.ldlibs :=
shared.extension = dll shared.extension = dll
shared.ldflags = -static-libgcc -shared "$(pdbinpath)/pd.dll" shared.ldflags = -static-libgcc -shared "$(PDBINDIR)/pd.dll"
stripflags = --strip-unneeded -R .note -R .comment stripflags = --strip-unneeded -R .note -R .comment
endif endif
@ -634,7 +631,6 @@ endif
# the build system that pd-l2ork has inherited from pd-extended. # the build system that pd-l2ork has inherited from pd-extended.
PDINCLUDEDIR ?= $(pdincludepath) PDINCLUDEDIR ?= $(pdincludepath)
PDBINDIR ?= $(pdbinpath)
PDLIBDIR ?= $(firstword $(objectsdir) $(pkglibdir)) PDLIBDIR ?= $(firstword $(objectsdir) $(pkglibdir))
ifneq ($(PDDIR),) ifneq ($(PDDIR),)