Update of /cvsroot/pure-data/externals/unauthorized/speex~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14988/speex~
Modified Files: speexin~.c speexout~.c Added Files: speexin~.libs speexout~.libs Log Message: updated things for the new build system while maintaining backwords compatibilty
Index: speexin~.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/speex~/speexin~.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** speexin~.c 12 Apr 2005 15:31:12 -0000 1.3 --- speexin~.c 9 Dec 2005 06:25:59 -0000 1.4 *************** *** 34,38 **** #include <string.h> #include <stdlib.h> ! #ifdef UNIX #include <sys/socket.h> #include <errno.h> --- 34,40 ---- #include <string.h> #include <stdlib.h> ! #ifdef WIN32 ! #include <winsock.h> ! #else #include <sys/socket.h> #include <errno.h> *************** *** 46,51 **** #include <stdio.h> #define SOCKET_ERROR -1 ! #else ! #include <winsock.h> #endif
--- 48,56 ---- #include <stdio.h> #define SOCKET_ERROR -1 ! #endif ! ! #if defined(__APPLE__) || defined(WIN32) ! #define MSG_NOSIGNAL 0 ! #define SOL_TCP IPPROTO_TCP #endif
*************** *** 53,57 **** #include <speex/speex_bits.h> /* speex decoder stuff */
! #ifdef NT #pragma warning( disable : 4244 ) #pragma warning( disable : 4305 ) --- 58,62 ---- #include <speex/speex_bits.h> /* speex decoder stuff */
! #ifdef _MSC_VER #pragma warning( disable : 4244 ) #pragma warning( disable : 4305 )
Index: speexout~.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/speex~/speexout~.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** speexout~.c 19 Apr 2005 00:17:37 -0000 1.5 --- speexout~.c 9 Dec 2005 06:25:59 -0000 1.6 *************** *** 48,52 **** #endif #include <ctype.h> ! #ifdef UNIX #include <unistd.h> #include <sys/socket.h> --- 48,57 ---- #endif #include <ctype.h> ! #ifdef WIN32 ! #include <io.h> ! #include <windows.h> ! #include <winsock.h> ! #include <windef.h> ! #else #include <unistd.h> #include <sys/socket.h> *************** *** 56,64 **** #include <sys/time.h> #define SOCKET_ERROR -1 ! #else ! #include <io.h> ! #include <windows.h> ! #include <winsock.h> ! #include <windef.h> #endif
--- 61,68 ---- #include <sys/time.h> #define SOCKET_ERROR -1 ! #endif ! ! #if defined(__APPLE__) || defined(WIN32) ! #define MSG_NOSIGNAL 0 #endif
--- NEW FILE: speexout~.libs --- -lspeex
--- NEW FILE: speexin~.libs --- -lspeex