updated things for the new build system while maintaining backwords compatibilty

svn path=/trunk/externals/unauthorized/; revision=4173

15 files changed, 54 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index a415d40..d995e74 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ MINGW_INCLUDE =  -I../../src -I../../pd/src -IC:/msys/1.0/include
 
 
 MINGW_LDFLAGS = -shared -L../../pd/bin -LC:/msys/1.0/lib \
-		 -lpd -logg -lvorbis -lpthreadGC2
+		 -lpd -logg -lvorbis -lspeex -lpthreadGC2
 
 
 .c.dll:
@@ -140,22 +140,24 @@ pd_darwin: $(TARGETS)
 #     -DMSG_NOSIGNAL=0 -DSOL_TCP=0
 # I got this from here: http://www.holwegner.com/forum/viewtopic.php?t=4
 # <hans@eds.org>
-DARWINCFLAGS = -DPD -DUNIX -DICECAST -DMSG_NOSIGNAL=0  -DSOL_TCP=0 \
+DARWINCFLAGS = -DPD -DUNIX \
 	-O2 -Wall -W -Wshadow -Wstrict-prototypes -Wno-unused -Wno-parentheses \
 	-Wno-switch
 
 ##  if you point the linker to the pd binary, then it can check the symbols,
 ## and therefore allow for a two-level namespace, and that makes Darwin happy
 ## but this doesn't work for some of the files yet.
-#DARWINLINKFLAGS = -bundle -bundle_loader ../../pd/bin/pd
-DARWINLINKFLAGS = -bundle -undefined suppress -flat_namespace
+DARWINLINKFLAGS = -bundle -bundle_loader ../../pd/bin/pd
+DARWINLIBS = -L/sw/lib -logg -lvorbis -lmp3lame -lspeex
+#DARWINLINKFLAGS = -bundle -undefined suppress -flat_namespace
 
 DARWININCLUDE =  -I../../src -I../../pd/src -I/sw/include
 
 .c.pd_darwin:
 	$(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -o $*.o -c $*.c
-	$(CC) $(DARWINLINKFLAGS) -o $*.pd_darwin $*.o
+	$(CC) $(DARWINLINKFLAGS) -o $*.pd_darwin $*.o $(DARWINLIBS)
 	chmod a-x "$*.pd_darwin"
+	strip -u -r $*.pd_darwin
 	-rm $*.o
 
 # added by Hans-Christoph Steiner <hans@eds.org>
diff --git a/mp3amp~/mp3amp~.c b/mp3amp~/mp3amp~.c
index 8eaebdb..c1f79be 100644
--- a/mp3amp~/mp3amp~.c
+++ b/mp3amp~/mp3amp~.c
@@ -57,17 +57,19 @@
 #include <io.h>

 #endif

 

-#ifdef NT

+#ifdef _MSC_VER

 #pragma warning( disable : 4244 )

 #pragma warning( disable : 4305 )

 #endif

 

+#if defined(__APPLE__) || defined(WIN32)

+#define MSG_NOSIGNAL 0

+#endif

 #ifdef UNIX

 #define STRDUP strdup

 #endif

-#ifdef NT

+#ifdef WIN32

 #define STRDUP _strdup

-#define MSG_NOSIGNAL 0

 #define sys_closesocket closesocket

 #endif

 

diff --git a/mp3amp~/mp3amp~.libs b/mp3amp~/mp3amp~.libs
new file mode 100644
index 0000000..25f437c
--- /dev/null
+++ b/mp3amp~/mp3amp~.libs
@@ -0,0 +1 @@
+-lmp3lame
diff --git a/mp3cast~/mp3cast~.libs b/mp3cast~/mp3cast~.libs
new file mode 100644
index 0000000..25f437c
--- /dev/null
+++ b/mp3cast~/mp3cast~.libs
@@ -0,0 +1 @@
+-lmp3lame
diff --git a/mp3live~/mp3fileout~.c b/mp3live~/mp3fileout~.c
index 0559a75..e8e1c6b 100644
--- a/mp3live~/mp3fileout~.c
+++ b/mp3live~/mp3fileout~.c
@@ -52,8 +52,13 @@
 #include <winsock.h>
 #include <io.h>
 #include <fcntl.h>
-#define  MSG_NOSIGNAL 0
 #endif
+
+#if defined(__APPLE__) || defined(WIN32)
+#define MSG_NOSIGNAL 0
+#endif
+
+
 #include "mpg123.h"      /* mpg123 decoding library from lame 3.92 */
 #include "mpglib.h"      /* mpglib decoding library from lame 3.92 */
 #include "interface.h"   /* mpglib decoding library from lame 3.92 */
diff --git a/mp3live~/mp3fileout~.libs b/mp3live~/mp3fileout~.libs
new file mode 100644
index 0000000..25f437c
--- /dev/null
+++ b/mp3live~/mp3fileout~.libs
@@ -0,0 +1 @@
+-lmp3lame
diff --git a/mp3live~/mp3streamin~.c b/mp3live~/mp3streamin~.c
index 74a11f4..d34150b 100644
--- a/mp3live~/mp3streamin~.c
+++ b/mp3live~/mp3streamin~.c
@@ -40,7 +40,7 @@
 
 #include <sys/types.h>
 #include <string.h>
-#ifdef UNIX
+#ifndef WIN32
 #include <sys/socket.h>
 #include <errno.h>
 #include <netinet/in.h>
@@ -54,9 +54,13 @@
 #define SOCKET_ERROR -1
 #else
 #include <winsock.h>
+#endif
+
+#if defined(__APPLE__) || defined(WIN32)
 #define MSG_NOSIGNAL 0
 #define SOL_TCP IPPROTO_TCP
 #endif
+
 #include "mpg123.h"      /* mpg123 decoding library from lame 3.92 */
 #include "mpglib.h"      /* mpglib decoding library from lame 3.92 */
 #include "interface.h"   /* mpglib decoding library from lame 3.92 */
diff --git a/mp3live~/mp3streamin~.libs b/mp3live~/mp3streamin~.libs
new file mode 100644
index 0000000..25f437c
--- /dev/null
+++ b/mp3live~/mp3streamin~.libs
@@ -0,0 +1 @@
+-lmp3lame
diff --git a/mp3live~/mp3streamout~.c b/mp3live~/mp3streamout~.c
index 9c9a024..0ed908a 100644
--- a/mp3live~/mp3streamout~.c
+++ b/mp3live~/mp3streamout~.c
@@ -53,8 +53,12 @@
 #include <windows.h>
 #include <winsock.h>
 #include <windef.h>
+#endif
+
+#if defined(__APPLE__) || defined(WIN32)
 #define MSG_NOSIGNAL 0
 #endif
+
 #include <lame/lame.h>        /* lame encoder stuff */
 
 #include "m_pd.h"            /* standard pd stuff */
diff --git a/mp3live~/mp3streamout~.libs b/mp3live~/mp3streamout~.libs
new file mode 100644
index 0000000..25f437c
--- /dev/null
+++ b/mp3live~/mp3streamout~.libs
@@ -0,0 +1 @@
+-lmp3lame
diff --git a/mp3write~/mp3write~.libs b/mp3write~/mp3write~.libs
new file mode 100644
index 0000000..25f437c
--- /dev/null
+++ b/mp3write~/mp3write~.libs
@@ -0,0 +1 @@
+-lmp3lame
diff --git a/speex~/speexin~.c b/speex~/speexin~.c
index 1db6dbd..786a9e7 100644
--- a/speex~/speexin~.c
+++ b/speex~/speexin~.c
@@ -33,7 +33,9 @@
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
-#ifdef UNIX
+#ifdef WIN32
+#include <winsock.h>
+#else
 #include <sys/socket.h>
 #include <errno.h>
 #include <netinet/in.h>
@@ -45,14 +47,17 @@
 #include <fcntl.h>
 #include <stdio.h>
 #define SOCKET_ERROR -1
-#else
-#include <winsock.h>
+#endif
+
+#if defined(__APPLE__) || defined(WIN32)
+#define MSG_NOSIGNAL 0
+#define SOL_TCP IPPROTO_TCP
 #endif
 
 #include <speex/speex.h>        /* speex decoder stuff */
 #include <speex/speex_bits.h>   /* speex decoder stuff */
 
-#ifdef NT
+#ifdef _MSC_VER
 #pragma warning( disable : 4244 )
 #pragma warning( disable : 4305 )
 #endif
diff --git a/speex~/speexin~.libs b/speex~/speexin~.libs
new file mode 100644
index 0000000..eaefc44
--- /dev/null
+++ b/speex~/speexin~.libs
@@ -0,0 +1 @@
+-lspeex
diff --git a/speex~/speexout~.c b/speex~/speexout~.c
index c6968d9..2d2c104 100644
--- a/speex~/speexout~.c
+++ b/speex~/speexout~.c
@@ -47,7 +47,12 @@
 #include <malloc.h>
 #endif
 #include <ctype.h>
-#ifdef UNIX
+#ifdef WIN32
+#include <io.h>
+#include <windows.h>
+#include <winsock.h>
+#include <windef.h>
+#else
 #include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -55,11 +60,10 @@
 #include <time.h>
 #include <sys/time.h>
 #define SOCKET_ERROR -1
-#else
-#include <io.h>
-#include <windows.h>
-#include <winsock.h>
-#include <windef.h>
+#endif
+
+#if defined(__APPLE__) || defined(WIN32)
+#define MSG_NOSIGNAL 0
 #endif
 
 #include <speex/speex.h>        /* speex codec stuff */ 
diff --git a/speex~/speexout~.libs b/speex~/speexout~.libs
new file mode 100644
index 0000000..eaefc44
--- /dev/null
+++ b/speex~/speexout~.libs
@@ -0,0 +1 @@
+-lspeex