Commit 2c4c3e84 authored by Jonathan Wilkes's avatar Jonathan Wilkes

Merge branch 'nerrons/purr-data-gsocp2-general-improvements'

parents 1e7fb0c1 881afcb9
Pipeline #1605 failed with stage
in 0 seconds
......@@ -30,6 +30,11 @@ pd.pc
.svn
packages/linux_make/build/
pd/src/makefile
pd/src/config.h
pd/src/s_version.h
pd/nw/nw/
l2ork_addons/cwiid/defs.mak
CVS
.DS_Store
*.dmg
.vscode/
\ No newline at end of file
......@@ -1291,6 +1291,8 @@ moocow_clean:
$(MAKE) -C $(externals_src)/moocow/extended distclean
-rm -f -- $(MOOCOW_DIR)/*.bak
-rm -f -- $(MOOCOW_DIR)/*.*~
-rm -rf -- $(externals_src)/moocow/*/common/*
-rm -rf -- $(externals_src)/moocow/*/a.out.dSYM/*
cp -f $(MOOCOW_DIR)/../gfsm/gfsm/src/libgfsm/default/* $(MOOCOW_DIR)/../gfsm/gfsm/src/libgfsm/
......@@ -1392,6 +1394,7 @@ oscx_clean:
-$(MAKE) -C $(externals_src)/OSCx CC=gcc clean
-rm $(externals_src)/OSCx/Makefile
-rm $(externals_src)/OSCx/configure
-rm -f -- $(cvs_root_dir)/externals/OSCx/*/Makefile
......@@ -1496,6 +1499,7 @@ pdp_clean:
-find $(externals_src)/pdp -name '*.bak' | xargs rm -f --
-rm -f -- $(externals_src)/pdp/Makefile.config
-rm -f -- $(externals_src)/pdp/configure
-rm -f -- $(externals_src)/pdp/include/pdp_config.h
#------------------------------------------------------------------------------#
......@@ -1899,7 +1903,7 @@ zexy_install: zexy
#endif
zexy_clean:
cd $(externals_src)/zexy && ./autogen.sh
cd $(externals_src)/zexy
-$(MAKE) -C $(externals_src)/zexy clean
-rm -rf -- $(externals_src)/zexy/autom4te.cache
-rm -f -- $(externals_src)/zexy/aclocal.m4
......@@ -1909,6 +1913,18 @@ zexy_clean:
-rm -f -- $(externals_src)/zexy/m4/libtool.m4
-rm -f -- $(externals_src)/zexy/configure
-rm -f -- $(externals_src)/zexy/src/*.o
-rm -f -- $(externals_src)/zexy/Makefile
-rm -f -- $(externals_src)/zexy/Makefile.in
-rm -f -- $(externals_src)/zexy/*/Makefile
-rm -f -- $(externals_src)/zexy/*/Makefile.in
-rm -f -- $(externals_src)/zexy/compile
-rm -f -- $(externals_src)/zexy/config.*
-rm -f -- $(externals_src)/zexy/depcomp
-rm -f -- $(externals_src)/zexy/install-sh
-rm -f -- $(externals_src)/zexy/missing
-rm -f -- $(externals_src)/zexy/stamp-h1
-rm -f -- $(externals_src)/zexy/test-driver
-rm -f -- $(externals_src)/zexy/*.pd
......
#CFLAGS= -O2 -Wall -fPIC
ARFLAGS=srv
# uncomment the following for linux/win
# DEFS= -Dunix
LIB=libOSC.a
CFLAGS=-g -O2 -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1 -fPIC -I../libOSC -I../../pd/src -I../../../pd/src -I../src
INCLUDES=-I../libOSC -I../../pd/src -I../../../pd/src -I../src
LIBOBJS= ${LIB}(OSC-client.o) ${LIB}(OSC-timetag.o)
all: ${LIBOBJS}
.c.a:
${CC} -c ${CFLAGS} ${INCLUDES} ${DEFS} $<
${AR} ${ARFLAGS} $@ $*.o
rm -f $*.o
test_OSC: test_OSC.o ${LIB}
$(CC) -o test_OSC test_OSC.o ${LIB}
test_OSC_timeTag: test_OSC_timeTag.o OSC-timetag.o
$(CC) -o test_OSC_timeTag test_OSC_timeTag.o OSC-timetag.o
clean:
rm -f ${LIB} *.o
LIBS = -L../../../pd/bin -lc -lm
LIBOSCDIR = ../libOSC
LIBOSC = ${LIBOSCDIR}/libOSC.a
# strange bug requires this...
CFLAGS= -g -O2 -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1 -fPIC -I../libOSC -I../../pd/src -I../../../pd/src -I../src -I../libOSC -I../../pd/src -I../../../pd/src -I../src
# INCLUDES= -I../libOSC -I../../pd/src -I../../../pd/src -I../src
DUMPOBJS=dumpOSC.o
both: sendOSC dumpOSC
sendOSC: sendOSC.o htmsocket.o ${LIBOSC}
${CC} ${CFLAGS} $(INCLUDES) -o sendOSC sendOSC.o htmsocket.o $(LIBS) ${LIBOSC}
dumpOSC: ${DUMPOBJS}
${CC} ${CFLAGS} $(INCLUDES) -o $@ ${DUMPOBJS} $(LIBS)
dumpUDP: dumpUDP.o
${CC} ${CFLAGS} $(INCLUDES) -o dumpUDP dumpUDP.o $(LIBS)
${LIBOSC}:
echo "You need to go to " ${LIBOSCDIR} " and do a make."
(cd ../libOSC ; make)
clean:
rm -f sendOSC dumpOSC *.o
#
# Copyright (C) 2004 Hans-Christoph Steiner
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
EXT=o
LIBS = -L../../../pd/bin -lc -lm
LIBOSC = ../libOSC/libOSC.a
CFLAGS = -g -O2 -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1 -fPIC -I../libOSC -I../../pd/src -I../../../pd/src -I../src
INCLUDES = -I../libOSC -I../../pd/src -I../../../pd/src -I../src -I/usr/include/tirpc
LDFLAGS = -Wl,--export-dynamic -shared
prefix=/usr/local
SOURCES = OSC-pattern-match.c OSC.c dumpOSC.c htmsocket.c OSCroute.c sendOSC.c OSC-system-dependent.c
TARGETS = $(SOURCES:.c=.o)
EXTS=sendOSC.pd_linux dumpOSC.pd_linux OSCroute.pd_linux
# ----------------------- autoconf -----------------------
all: $(EXTS)
lib: OSC.pd_linux
dumpOSC.pd_linux: dumpOSC.o
$(CC) $(LDFLAGS) -o dumpOSC.pd_linux $? $(LIBS)
sendOSC.pd_linux: sendOSC.o htmsocket.o OSC-system-dependent.o
$(CC) $(LDFLAGS) -o sendOSC.pd_linux $? $(LIBS) $(LIBOSC)
OSCroute.pd_linux: OSCroute.o OSC-pattern-match.o OSC-system-dependent.o
$(CC) $(LDFLAGS) -o OSCroute.pd_linux $? $(LIBS)
OSC.pd_linux: OSC.o sendOSC.o dumpOSC.o OSCroute.o htmsocket.o OSC-pattern-match.o OSC-system-dependent.o
$(CC) $(LDFLAGS) -o OSC.pd_linux $? $(LIBS) $(LIBOSC)
$(TARGETS): %.o : %.c
$(CC) $(CFLAGS) $(INCLUDES) -c -o $*.o $*.c
# ----------------------------------------------------------
install-doc:
@test -d $(prefix)/lib/pd/doc/5.reference || mkdir -p $(prefix)/lib/pd/doc/5.reference
cp -r ../doc/* $(prefix)/lib/pd/doc/5.reference/
install: install-doc
@test -d $(prefix)/lib/pd/extra || mkdir -p $(prefix)/lib/pd/extra
install -m644 *.pd_linux $(prefix)/lib/pd/extra
clean:
rm -rf *.$(EXT) *.pd_linux
/* include/pdp_config.h. Generated from pdp_config.h.in by configure. */
/* include/pdp_config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the `gslcblas' library (-lgslcblas). */
#define HAVE_LIBGSLCBLAS 1
/* Define to 1 if you have the `m' library (-lm). */
#define HAVE_LIBM 1
/* Define to 1 if you have the <libv4l1-videodev.h> header file. */
#define HAVE_LIBV4L1_VIDEODEV_H 1
/* Define to 1 if you have the <linux/videodev.h> header file. */
/* #undef HAVE_LINUX_VIDEODEV_H */
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
/* build pdp_glx */
#define HAVE_PDP_GLX 1
/* gsl support */
#define HAVE_PDP_GSL 1
/* build pdp_v4l with libv4l */
/* #undef HAVE_PDP_LIBV4L */
/* build png support */
#define HAVE_PDP_PNG 1
/* build pdp_qt */
#define HAVE_PDP_QT 1
/* build pdp_sdl */
#define HAVE_PDP_SDL 1
/* build pdp_v4l */
#define HAVE_PDP_V4L 1
/* build X11 support */
#define HAVE_PDP_X 1
/* build pdp_xv */
/* #undef HAVE_PDP_XV */
/* enable forced pwc v4l support */
/* #undef HAVE_PWCV4L */
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
/* Define to the full name of this package. */
#define PACKAGE_NAME ""
/* Define to the full name and version of this package. */
#define PACKAGE_STRING ""
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME ""
/* Define to the home page for this package. */
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION ""
/* "disable debugging support" */
#define PDP_DEBUG 0
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
......@@ -238,11 +238,9 @@ dmg:
distclean: package_clean
$(MAKE) -C $(packages_src) $(DEST_PATHS) distclean
clean: package_clean
$(MAKE) -C $(packages_src) $(DEST_PATHS) clean
package_clean: darwin_app_clean spotlight_importer_clean
-chmod -R u+w -- $(BUILD_BASE)
-rm -rf -- $(BUILD_BASE)
......
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