[PD-cvs] SF.net SVN: pure-data: [9992] trunk/externals/iem/dmx512/src
zmoelnig at users.sourceforge.net
zmoelnig at users.sourceforge.net
Fri Jun 13 15:28:09 CEST 2008
Revision: 9992
http://pure-data.svn.sourceforge.net/pure-data/?rev=9992&view=rev
Author: zmoelnig
Date: 2008-06-13 06:28:08 -0700 (Fri, 13 Jun 2008)
Log Message:
-----------
probably got the svnversion magic going
Modified Paths:
--------------
trunk/externals/iem/dmx512/src/Make.version
trunk/externals/iem/dmx512/src/Makefile
trunk/externals/iem/dmx512/src/dmx4pd.h
trunk/externals/iem/dmx512/src/dmxout.c
Modified: trunk/externals/iem/dmx512/src/Make.version
===================================================================
--- trunk/externals/iem/dmx512/src/Make.version 2008-06-13 12:46:17 UTC (rev 9991)
+++ trunk/externals/iem/dmx512/src/Make.version 2008-06-13 13:28:08 UTC (rev 9992)
@@ -1 +1 @@
-VERSION = $(shell svnversion)
+VERSION = $(shell svnversion | grep -e "[0-9]")
Modified: trunk/externals/iem/dmx512/src/Makefile
===================================================================
--- trunk/externals/iem/dmx512/src/Makefile 2008-06-13 12:46:17 UTC (rev 9991)
+++ trunk/externals/iem/dmx512/src/Makefile 2008-06-13 13:28:08 UTC (rev 9992)
@@ -2,11 +2,17 @@
include Make.version
+
Make.config: Make.config.in configure
./configure
-include Make.config
+#VERSIONDEFINE = _$(strip $(VERSION))_
+ifneq ($(strip $(VERSION)),)
+VERSIONDEFINE = -DDMX4PD_VERSION="\"rev.$(VERSION)\""
+endif
+
.SUFFIXES: .$(EXT)
SOURCES=$(sort $(filter %.c, $(wildcard *.c)))
@@ -48,7 +54,7 @@
$(TARGETS): %.o : %.c Make.config
- $(CC) $(DMX4PD_CFLAGS) -DDMX4PD_VERSION="\"$(VERSION)\"" -c -o $@ $*.c
+ $(CC) $(DMX4PD_CFLAGS) $(VERSIONDEFINE) -c -o $@ $*.c
$(OBJECTS): %.$(EXT) : %.o
$(LD) $(LFLAGS) -o $@ $*.o $(LIBS)
Modified: trunk/externals/iem/dmx512/src/dmx4pd.h
===================================================================
--- trunk/externals/iem/dmx512/src/dmx4pd.h 2008-06-13 12:46:17 UTC (rev 9991)
+++ trunk/externals/iem/dmx512/src/dmx4pd.h 2008-06-13 13:28:08 UTC (rev 9992)
@@ -26,9 +26,11 @@
#include "m_pd.h"
+
#define DMX4PD_POSTBANNER \
- post("DMX4PD ver %s: (c) 2008 IOhannes m zm\xF6lnig - iem @ kug", DMX4PD_VERSION);
+ { \
+ post("DMX4PD ("DMX4PD_VERSION"): (c) 2008 IOhannes m zm\xF6lnig - iem @ kug"); \
+ }
-
#endif /* INCLUDE_DMX4PD_H__ */
Modified: trunk/externals/iem/dmx512/src/dmxout.c
===================================================================
--- trunk/externals/iem/dmx512/src/dmxout.c 2008-06-13 12:46:17 UTC (rev 9991)
+++ trunk/externals/iem/dmx512/src/dmxout.c 2008-06-13 13:28:08 UTC (rev 9992)
@@ -64,7 +64,7 @@
static void dmxout_open(t_dmxout*x, t_symbol*s_devname)
{
int argc=2;
- char *args[2] = {"--dmx", s_devname->s_name};
+ const char *args[2] = {"--dmx", s_devname->s_name};
const char**argv=args;
char*devname="";
int fd;
@@ -138,7 +138,7 @@
static void *dmxout_free(t_dmxout*x)
{
-
+ dmxout_close(x);
}
@@ -151,6 +151,7 @@
class_addfloat(dmxout_class, dmxout_float);
-
- post("DMX4PD (ver.%s): (c) 2008 IOhannes m zm\xF6lnig - iem @ kug", DMX4PD_VERSION);
+#ifdef DMX4PD_POSTBANNER
+ DMX4PD_POSTBANNER
+#endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Pd-cvs
mailing list