Commit e72deb8d authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

moved cwiid and all disis libs except disis_munger to externals/disis, and...

moved cwiid and all disis libs except disis_munger to externals/disis, and removed linux-specific build instructions from tar_em_up.sh
parent 416c6486
......@@ -5,7 +5,7 @@
path = externals/rtcmix-in-pd
url = https://github.com/jwmatthys/rtcmix-in-pd.git
[submodule "l2ork_addons/cwiid"]
path = l2ork_addons/cwiid
path = externals/disis/cwiid
url = https://github.com/pd-l2ork/cwiid
[submodule "l2ork_addons/lyonpotpourri"]
path = externals/lyonpotpourri
......
This diff is collapsed.
NAME=disis_phasor~
SYM=disis_phasor~
# Makefile for mylib
# If you want to use a customized Pd, then define a $PD_PATH variable.
# Otherwise, the Pd must be installed on the system
PD_PATH=../../pd
lib.name = disis
######################################################
# You shouldn't need to change anything beyond here! #
######################################################
class.sources = disis_phasor~.c disis_netsend.c disis_netreceive.c
datafiles = disis_phasor~-help.pd disis_netsend-help.pd disis_netreceive-help.pd disis_wiimote-help.pd disis_wiimote_legacy.pd README patch_name-help.pd patch_name.pd
ifdef PD_PATH
PD_INCLUDE := -I$(PD_PATH)/src
PD_EXTRA_PATH := $(PD_PATH)/extra
PD_DOC_PATH := $(PD_PATH)/doc
else
PD_INCLUDE := -I/usr/local/include
PD_EXTRA_PATH := /usr/local/lib/pd/extra
PD_DOC_PATH := /usr/local/lib/pd/doc
endif
LIBS =
#LIBS = -lrt -lbluetooth -lpthread
# IMPORTANT! disis_wiimote requires a custom L2Ork version of cwiid library
# For the time being we statically link to a L2Ork version of cwiid library
# Change this paths if you are compiling disis_wiimote separately from
# the rest of the pd-l2ork source to reflect the correct location of the
# custom L2Ork version of the libcwiid
CWIID_PATH=./cwiid
CWIID_LIB_STATIC= $(CWIID_PATH)/libcwiid/libcwiid.a
CWIID_INCLUDE = -I$(CWIID_PATH)/libcwiid
cflags = $(CWIID_INCLUDE)
disis_wiimote.class.sources = disis_wiimote.c
current: pd_linux
disis_wiimote.class.ldlibs = $(CWIID_LIB_STATIC) -lbluetooth -lpthread
##### LINUX:
pd_linux: $(NAME).pd_linux
.SUFFIXES: .pd_linux
LINUXCFLAGS = -DPD -g -fPIC #-funroll-loops -fomit-frame-pointer -Wall -Wshadow -Wstrict-prototypes
.c.pd_linux:
gcc $(LINUXCFLAGS) $(PD_INCLUDE) -o $*.o -c $*.c
gcc -shared -o $(NAME).pd_linux $(NAME).o -lm -lc
strip --strip-unneeded $*.pd_linux
rm -f $*.o
install:
-cp *.pd_linux $(PD_EXTRA_PATH)/.
-cp *help*.pd $(PD_DOC_PATH)/.
clean:
-rm -f *.o *.pd_* so_locations
include Makefile.pdlibbuilder
NAME=disis_netreceive
SYM=disis_netreceive
# If you want to use a customized Pd, then define a $PD_PATH variable.
# Otherwise, the Pd must be installed on the system
PD_PATH=../../pd
######################################################
# You shouldn't need to change anything beyond here! #
######################################################
ifdef PD_PATH
PD_INCLUDE := -I$(PD_PATH)/src
PD_EXTRA_PATH := $(PD_PATH)/extra
PD_DOC_PATH := $(PD_PATH)/doc
else
PD_INCLUDE := -I/usr/local/include
PD_EXTRA_PATH := /usr/local/lib/pd/extra
PD_DOC_PATH := /usr/local/lib/pd/doc
endif
# we just use the cwiid that comes with ubuntu/hardy
# although the code still uses the cwiid_internal.h from the
# supplied source
#LIBS = -lcwiid -lbluetooth -lpthread
#LIBS = $(CWIID_PATH)/libcwiid/libcwiid.a -lrt -lbluetooth -lpthread
current: pd_linux
##### LINUX:
#CWIID_INCLUDE = -I$(CWIID_PATH)/libcwiid
pd_linux: $(NAME).pd_linux
.SUFFIXES: .pd_linux
LINUXCFLAGS = -DPD -g -funroll-loops -fomit-frame-pointer \
-Wall -Wshadow -Wstrict-prototypes -fPIC
.c.pd_linux:
cc $(LINUXCFLAGS) $(PD_INCLUDE) $(CWIID_INCLUDE) -o $*.o -c $*.c
ld --export-dynamic -shared -o $*.pd_linux $*.o $(LIBS) -lc -lm
#strip --strip-unneeded $*.pd_linux
rm -f $*.o
install:
ifdef ASCAPE_INSTALLED
-cp *help*.pd $(ASCAPE_PATH)/ss_engine/pd/help/.
ifeq ($(findstring Linux,$(ASCAPE_OS)),Linux)
-cp *.pd_linux $(ASCAPE_PATH)/ss_engine/pd/externs/$(ASCAPE_OS)$(ASCAPE_ARCH)/.
endif
ifeq ($(findstring Darwin,$(SS_OS)),Darwin)
-cp *.pd_darwin $(ASCAPE_PATH)/ss_engine/pd/externs/$(ASCAPE_OS)$(ASCAPE_ARCH)/.
endif
endif
-cp *.pd_linux $(PD_EXTRA_PATH)/.
-cp *help*.pd $(PD_DOC_PATH)/.
clean:
-rm -f *.o *.pd_* so_locations
NAME=disis_netsend
SYM=disis_netsend
# If you want to use a customized Pd, then define a $PD_PATH variable.
# Otherwise, the Pd must be installed on the system
PD_PATH=../../pd
######################################################
# You shouldn't need to change anything beyond here! #
######################################################
ifdef PD_PATH
PD_INCLUDE := -I$(PD_PATH)/src
PD_EXTRA_PATH := $(PD_PATH)/extra
PD_DOC_PATH := $(PD_PATH)/doc
else
PD_INCLUDE := -I/usr/local/include
PD_EXTRA_PATH := /usr/local/lib/pd/extra
PD_DOC_PATH := /usr/local/lib/pd/doc
endif
current: pd_linux
##### LINUX:
pd_linux: $(NAME).pd_linux
.SUFFIXES: .pd_linux
LINUXCFLAGS = -DPD -g -funroll-loops -fomit-frame-pointer \
-Wall -Wshadow -Wstrict-prototypes -fPIC
.c.pd_linux:
cc $(LINUXCFLAGS) $(PD_INCLUDE) $(CWIID_INCLUDE) -o $*.o -c $*.c
ld --export-dynamic -shared -o $*.pd_linux $*.o $(LIBS) -lc -lm
rm -f $*.o
install:
ifdef ASCAPE_INSTALLED
-cp *help*.pd $(ASCAPE_PATH)/ss_engine/pd/help/.
ifeq ($(findstring Linux,$(ASCAPE_OS)),Linux)
-cp *.pd_linux $(ASCAPE_PATH)/ss_engine/pd/externs/$(ASCAPE_OS)$(ASCAPE_ARCH)/.
endif
ifeq ($(findstring Darwin,$(SS_OS)),Darwin)
-cp *.pd_darwin $(ASCAPE_PATH)/ss_engine/pd/externs/$(ASCAPE_OS)$(ASCAPE_ARCH)/.
endif
endif
-cp *.pd_linux $(PD_EXTRA_PATH)/.
-cp *help*.pd $(PD_DOC_PATH)/.
clean:
-rm -f *.o *.pd_* so_locations
NAME=disis_wiimote
SYM=disis_wiimote
# If you want to use a customized Pd, then define a $PD_PATH variable.
# Otherwise, the Pd must be installed on the system
PD_PATH=../../pd
# IMPORTANT! disis_wiimote requires a custom L2Ork version of cwiid library
# For the time being we statically link to a L2Ork version of cwiid library
# Change this paths if you are compiling disis_wiimote separately from
# the rest of the pd-l2ork source to reflect the correct location of the
# custom L2Ork version of the libcwiid
CWIID_PATH=../cwiid
######################################################
# You shouldn't need to change anything beyond here! #
######################################################
CWIID_LIB_STATIC= $(CWIID_PATH)/libcwiid/libcwiid.a
ifdef PD_PATH
PD_INCLUDE := -I$(PD_PATH)/src
PD_EXTRA_PATH := $(PD_PATH)/extra
PD_DOC_PATH := $(PD_PATH)/doc
else
PD_INCLUDE := -I/usr/local/include
PD_EXTRA_PATH := /usr/local/lib/pd/extra
PD_DOC_PATH := /usr/local/lib/pd/doc
endif
# we use custom version of cwiid so for the time being we statically link to it
LIBS = $(CWIID_LIB_STATIC) -lbluetooth -lpthread
# later
#LIBS = -lcwiid -lbluetooth -lpthread
#LIBS = $(CWIID_PATH)/libcwiid/libcwiid.a -lrt -lbluetooth -lpthread
current: pd_linux
##### LINUX:
CWIID_INCLUDE = -I$(CWIID_PATH)/libcwiid
pd_linux: $(NAME).pd_linux
.SUFFIXES: .pd_linux
LINUXCFLAGS = -DPD -g -funroll-loops -fomit-frame-pointer \
-Wall -Wshadow -Wstrict-prototypes -fPIC
.c.pd_linux:
cc $(LINUXCFLAGS) $(PD_INCLUDE) $(CWIID_INCLUDE) -o $*.o -c $*.c
ld --export-dynamic -shared -o $*.pd_linux $*.o $(LIBS) -lc -lm
#strip --strip-unneeded $*.pd_linux
rm -f $*.o
install:
ifdef ASCAPE_INSTALLED
-cp *help*.pd $(ASCAPE_PATH)/ss_engine/pd/help/.
ifeq ($(findstring Linux,$(ASCAPE_OS)),Linux)
-cp *.pd_linux $(ASCAPE_PATH)/ss_engine/pd/externs/$(ASCAPE_OS)$(ASCAPE_ARCH)/.
endif
ifeq ($(findstring Darwin,$(SS_OS)),Darwin)
-cp *.pd_darwin $(ASCAPE_PATH)/ss_engine/pd/externs/$(ASCAPE_OS)$(ASCAPE_ARCH)/.
endif
endif
-cp *.pd_linux $(PD_EXTRA_PATH)/.
-cp *help*.pd $(PD_DOC_PATH)/.
clean:
-rm -f *.o *.pd_* so_locations
......@@ -208,24 +208,6 @@ then
then
# echo "Since we are doing a complete recompile we are assuming we will need to install l2ork version of the cwiid library. You will need to remove any existing cwiid libraries manually as they will clash with this one. L2Ork version is fully backwards compatible while also offering unique features like full extension support including the passthrough mode. YOU SHOULD REMOVE EXISTING CWIID LIBRARIES PRIOR TO RUNNING THIS INSTALL... You will also have to enter sudo password to install these... Press any key to continue or CTRL+C to cancel install..."
# read dummy
# if [ $no_cwiid -eq 0 ]
# then
cd l2ork_addons/cwiid/
# install cwiid
# git submodule update
aclocal
autoconf
./configure --with-python=python2
make
# we have disabled system-wide install because as of 23-03-2013
# we now statically link disis_wiimote against custom L2Ork version
# of the cwiid library
if [ $sys_cwiid -eq 1 ]
then
sudo make install
fi
cd ../../
# fi
# clean files that may remain stuck even after doing global make clean (if any)
cd externals/miXed
make clean
......@@ -302,24 +284,6 @@ then
cd ../../l2ork_addons/patch_name
cp -f patch_name.pd ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
cp -f patch_name-help.pd ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
# disis_wiimote
cd ../disis_wiimote
make clean
make
cp -f disis_wiimote.pd_linux ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
cp -f disis_wiimote-help.pd ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
# disis_netsend
cd ../disis_netsend
make clean
make
cp -f disis_netsend.pd_linux ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
cp -f disis_netsend-help.pd ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
# disis_netreceive
cd ../disis_netreceive
make clean
make
cp -f disis_netreceive.pd_linux ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
cp -f disis_netreceive-help.pd ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra
# spectdelay
cd ../spectdelay/spectdelay~
./linux-install.sh
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment