diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2005-12-09 06:25:59 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2005-12-09 06:25:59 +0000 |
| commit | b13e2d6c3a525918ed0816c41433509477c9912a (patch) | |
| tree | 3742538a19289098ae8ff6b04fec94bcab104dbc /mp3live~ | |
| parent | f3fa1baae47dcbf5539c877c20189a5e3dc37909 (diff) | |
updated things for the new build system while maintaining backwords compatibilty
svn path=/trunk/externals/unauthorized/; revision=4173
Diffstat (limited to 'mp3live~')
| -rw-r--r-- | mp3live~/mp3fileout~.c | 7 | ||||
| -rw-r--r-- | mp3live~/mp3fileout~.libs | 1 | ||||
| -rw-r--r-- | mp3live~/mp3streamin~.c | 6 | ||||
| -rw-r--r-- | mp3live~/mp3streamin~.libs | 1 | ||||
| -rw-r--r-- | mp3live~/mp3streamout~.c | 4 | ||||
| -rw-r--r-- | mp3live~/mp3streamout~.libs | 1 |
6 files changed, 18 insertions, 2 deletions
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 |