Update of /cvsroot/pure-data/externals/moonlib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21608
Modified Files: absolutepath.c basedir.c gamme.c image.c mknob.c readsfv~.c relativepath.c sfread2~.c Log Message: got the lib to compile on MinGW by ifdeffing out the failing objects. These could be ported pretty easily since it's just a question of the open() function, I think. But it's really old, funky code, so why?
Index: sfread2~.c =================================================================== RCS file: /cvsroot/pure-data/externals/moonlib/sfread2~.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** sfread2~.c 9 Jul 2007 20:45:58 -0000 1.1.1.1 --- sfread2~.c 11 Jul 2007 16:40:24 -0000 1.2 *************** *** 1,6 **** #include <m_pd.h> //#include <m_imp.h> #include "g_canvas.h" ! #ifdef NT #pragma warning( disable : 4244 ) #pragma warning( disable : 4305 ) --- 1,8 ---- + #ifndef _WIN32 + #include <m_pd.h> //#include <m_imp.h> #include "g_canvas.h" ! #ifdef _MSC_VER #pragma warning( disable : 4244 ) #pragma warning( disable : 4305 ) *************** *** 9,13 **** #include <stdio.h> #include <string.h> ! #ifndef NT #include <unistd.h> #include <sys/mman.h> --- 11,15 ---- #include <stdio.h> #include <string.h> ! #ifndef _WIN32 #include <unistd.h> #include <sys/mman.h> *************** *** 22,26 **** /* ------------------------ sfread~ ----------------------------- */
! #ifdef NT #define BINREADMODE "rb" #else --- 24,28 ---- /* ------------------------ sfread~ ----------------------------- */
! #ifdef _WIN32 #define BINREADMODE "rb" #else *************** *** 408,410 **** --- 410,413 ----
+ #endif /* NOT _WIN32 */
Index: image.c =================================================================== RCS file: /cvsroot/pure-data/externals/moonlib/image.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** image.c 9 Jul 2007 20:45:57 -0000 1.1.1.1 --- image.c 11 Jul 2007 16:40:24 -0000 1.2 *************** *** 5,9 **** #include <stdio.h>
! #ifdef NT #pragma warning( disable : 4244 ) #pragma warning( disable : 4305 ) --- 5,9 ---- #include <stdio.h>
! #ifdef _MSC_VER #pragma warning( disable : 4244 ) #pragma warning( disable : 4305 )
Index: relativepath.c =================================================================== RCS file: /cvsroot/pure-data/externals/moonlib/relativepath.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** relativepath.c 9 Jul 2007 20:45:58 -0000 1.1.1.1 --- relativepath.c 11 Jul 2007 16:40:24 -0000 1.2 *************** *** 1,2 **** --- 1,3 ---- + #ifndef _WIN32 /* Copyright (C) 2002 Antoine Rousseau *************** *** 145,146 **** --- 146,148 ---- }
+ #endif /* NOT _WIN32 */
Index: mknob.c =================================================================== RCS file: /cvsroot/pure-data/externals/moonlib/mknob.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** mknob.c 9 Jul 2007 20:45:57 -0000 1.1.1.1 --- mknob.c 11 Jul 2007 16:40:24 -0000 1.2 *************** *** 18,22 **** #include <math.h>
! #ifdef NT #include <io.h> #else --- 18,22 ---- #include <math.h>
! #ifdef _WIN32 #include <io.h> #else
Index: basedir.c =================================================================== RCS file: /cvsroot/pure-data/externals/moonlib/basedir.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** basedir.c 9 Jul 2007 20:45:57 -0000 1.1.1.1 --- basedir.c 11 Jul 2007 16:40:24 -0000 1.2 *************** *** 1,2 **** --- 1,3 ---- + #ifndef _WIN32 /* Copyright (C) 2002 Antoine Rousseau *************** *** 71,72 **** --- 72,75 ---- }
+ + #endif /* NOT _WIN32 */
Index: absolutepath.c =================================================================== RCS file: /cvsroot/pure-data/externals/moonlib/absolutepath.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** absolutepath.c 9 Jul 2007 20:45:57 -0000 1.1.1.1 --- absolutepath.c 11 Jul 2007 16:40:24 -0000 1.2 *************** *** 1,2 **** --- 1,3 ---- + #ifndef _WIN32 /* Copyright (C) 2002 Antoine Rousseau *************** *** 139,140 **** --- 140,142 ---- }
+ #endif /* NOT _WIN32 */
Index: readsfv~.c =================================================================== RCS file: /cvsroot/pure-data/externals/moonlib/readsfv~.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** readsfv~.c 9 Jul 2007 20:45:58 -0000 1.1.1.1 --- readsfv~.c 11 Jul 2007 16:40:24 -0000 1.2 *************** *** 1,2 **** --- 1,3 ---- + #ifndef _WIN32 /* Copyright (c) 1997-1999 Miller Puckette. * For information on usage and redistribution, and for a DISCLAIMER OF ALL *************** *** 26,30 **** #endif #include <pthread.h> ! #ifdef NT #include <io.h> #endif --- 27,31 ---- #endif #include <pthread.h> ! #ifdef _WIN32 #include <io.h> #endif *************** *** 153,157 **** #define OBUFSIZE MAXPDSTRING /* assume MAXPDSTRING is bigger than headers */
! #ifdef NT #include <fcntl.h> #define BINCREATE _O_WRONLY | _O_CREAT | _O_BINARY | _O_TRUNC | --- 154,158 ---- #define OBUFSIZE MAXPDSTRING /* assume MAXPDSTRING is bigger than headers */
! #ifdef _WIN32 #include <fcntl.h> #define BINCREATE _O_WRONLY | _O_CREAT | _O_BINARY | _O_TRUNC | *************** *** 1681,1683 ****
! --- 1682,1684 ----
! #endif /* NOT _WIN32 */
Index: gamme.c =================================================================== RCS file: /cvsroot/pure-data/externals/moonlib/gamme.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** gamme.c 9 Jul 2007 20:45:57 -0000 1.1.1.1 --- gamme.c 11 Jul 2007 16:40:24 -0000 1.2 *************** *** 1,3 **** ! /* Copyright (C) 2002 Antoine Rousseau
--- 1,3 ---- ! emacs /* Copyright (C) 2002 Antoine Rousseau
*************** *** 22,26 **** #include "g_canvas.h"
! #ifdef NT #pragma warning( disable : 4244 ) #pragma warning( disable : 4305 ) --- 22,26 ---- #include "g_canvas.h"
! #ifdef _MSC_VER #pragma warning( disable : 4244 ) #pragma warning( disable : 4305 )