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

Define default paths for 32 bit build on 64 bit Windows

Browse source
This commit is contained in:
katjav 2018-01-27 00:07:21 +01:00
parent 7740128257
commit 1bcf78f86e
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile.pdlibbuilder
View file

@ -588,11 +588,16 @@ endif
# variables are assembled or re-expanded later, great care must be taken to put # variables are assembled or re-expanded later, great care must be taken to put
# quotes at appropriate points throughout the makefile. Thanks, Bill. # quotes at appropriate points throughout the makefile. Thanks, Bill.
# paths for 32-bit executables on 64-bit Windows aren't yet defined here (TODO) # default paths in Mingw environments
ifeq ($(system), Windows) ifeq ($(system), Windows)
pkglibdir := $(APPDATA)/Pd pkglibdir := $(APPDATA)/Pd
pdbinpath := $(shell ls -d "$(PROGRAMFILES)/pd/bin") ifeq ($(MINGW_CHOST), i686-w64-mingw32)
pdincludepath := $(shell ls -d "$(PROGRAMFILES)/pd/src") programfiles := ${ProgramFiles(x86)}
else
programfiles := $(PROGRAMFILES)
endif
pdbinpath := $(shell ls -d "$(programfiles)/Pd/bin")
pdincludepath := $(shell ls -d "$(programfiles)/Pd/src")
PDBINDIR ?= $(pdbinpath) PDBINDIR ?= $(pdbinpath)
endif endif