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

Scrap all default include / bin paths except vanilla's

Browse source 
Multiple defaults cause confusion and after discussion vanilla is preferred
default because:

1. vanilla is actively maintained
2. currently most pd lib authors develop against vanilla
3. unlike other pd flavors, vanilla is not part of a centralized build system
   with internal include path
This commit is contained in:
katja 2016-10-04 17:33:45 +02:00
parent dc9a8df02a
commit a6a89dc021
1 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Makefile.pdlibbuilder
View file

@ -1,5 +1,5 @@
# Makefile.pdlibbuilder dated 2016-09-20 # Makefile.pdlibbuilder dated 2016-10-04
version = 0.2.6 version = 0.2.7
# Helper makefile for Pure Data external libraries. # Helper makefile for Pure Data external libraries.
# Written by Katja Vetter March-June 2015 for the public domain. No warranties. # Written by Katja Vetter March-June 2015 for the public domain. No warranties.
@ -220,18 +220,13 @@ version = 0.2.6
# Executables are built in current working directory. # Executables are built in current working directory.
# #
# Variable 'pdincludepath' stores a location where m_pd.h is expected to reside. # Variable 'pdincludepath' stores a location where m_pd.h is expected to reside.
# Locations where Makefile.pdlibbuilder tries to find it, in order of priority: # Location where Makefile.pdlibbuilder tries to find it:
# #
# any OS: $(externalsdir)../pd/src # Linux: /usr/include/pd
# #
# Linux: /usr/include/pdextended # OSX: /Applications/Pd*.app/Contents/Resources/src
# /usr/include/pd
# #
# OSX: /Applications/Pd-extended.app/Contents/Resources/include/pdextended # Windows: %PROGRAMFILES%/pd/src
# /Applications/Pd.app/Contents/Resources/src
#
# Windows: %PROGRAMFILES%/pd/include/pdextended
# %PROGRAMFILES%/pd/src
# #
# The path for installation of all library components is constructed as: # The path for installation of all library components is constructed as:
# #
@ -337,8 +332,7 @@ endif
# Relative path to externals root dir in multi-lib source tree like # Relative path to externals root dir in multi-lib source tree like
# pd-extended SVN. Default is parent of current working directory. May be # pd-extended SVN. Default is parent of current working directory. May be
# defined differently in including makefile. This variable is used to probe for # defined differently in including makefile.
# paths.
externalsdir ?= .. externalsdir ?= ..
# variable you can use to check if Makefile.pdlibbuilder is already included # variable you can use to check if Makefile.pdlibbuilder is already included
@ -486,10 +480,7 @@ ifeq ($(system), Linux)
prefix = /usr/local prefix = /usr/local
libdir := $(prefix)/lib libdir := $(prefix)/lib
pkglibdir = $(libdir)/pd-externals pkglibdir = $(libdir)/pd-externals
pdincludepath := $(firstword $(wildcard \ pdincludepath := $(wildcard /usr/include/pd)
$(externalsdir)/../pd/src \
/usr/include/pdextended \
/usr/include/pd))
extension = pd_linux extension = pd_linux
cpp.flags := -DUNIX cpp.flags := -DUNIX
c.flags := -fpic c.flags := -fpic
@ -515,8 +506,6 @@ endif
ifeq ($(system), Darwin) ifeq ($(system), Darwin)
pkglibdir = $(HOME)/Library/Pd pkglibdir = $(HOME)/Library/Pd
pdincludepath := $(firstword $(wildcard \ pdincludepath := $(firstword $(wildcard \
$(externalsdir)/../pd/src \
/Applications/Pd-extended*.app/Contents/Resources/include/pdextended \
/Applications/Pd*.app/Contents/Resources/src)) /Applications/Pd*.app/Contents/Resources/src))
extension = pd_darwin extension = pd_darwin
cpp.flags := -DUNIX -DMACOSX -I /sw/include cpp.flags := -DUNIX -DMACOSX -I /sw/include
@ -555,14 +544,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
pdbinpath := $(wildcard $(externalsdir)/../pd/bin)
pdincludepath := $(wildcard $(externalsdir)/../pd/src)
ifndef pdbinpath ifndef pdbinpath
pdbinpath := $(shell ls -d "$(PROGRAMFILES)/pd/bin") pdbinpath := $(shell ls -d "$(PROGRAMFILES)/pd/bin")
endif endif
ifndef pdincludepath
pdincludepath := $(shell ls -d "$(PROGRAMFILES)/pd/include/pdextended")
endif
ifndef pdincludepath ifndef pdincludepath
pdincludepath := $(shell ls -d "$(PROGRAMFILES)/pd/src") pdincludepath := $(shell ls -d "$(PROGRAMFILES)/pd/src")
endif endif
@ -1160,7 +1144,7 @@ depend:
ifdef mpdh ifdef mpdh
mpdhinfo := $(mpdh) mpdhinfo := $(mpdh)
else else
mpdhinfo := m_pd.h was not found. Is Pd(-extended) installed? mpdhinfo := m_pd.h was not found. Is Pd installed?
endif endif
help: help: