claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

More MinGW fixes.

Browse Source
This commit is contained in:
rocky
2003-06-07 08:53:16 +00:00
parent 5aa007965a
commit 1608739d4d
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@@ -15,7 +15,7 @@ dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
dnl 02111-1307, USA. dnl 02111-1307, USA.
AC_REVISION([$Id: configure.ac,v 1.24 2003/06/07 01:20:40 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.25 2003/06/07 08:53:16 rocky Exp $])dnl
AC_INIT(lib/cdio.c) AC_INIT(lib/cdio.c)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(libcdio, 0.61) AM_INIT_AUTOMAKE(libcdio, 0.61)
@@ -144,10 +144,6 @@ dnl
dnl system dnl system
dnl test for non-Unix variants
AC_CYGWIN
AC_MINGW32
LIBS="$LIBS -lm" LIBS="$LIBS -lm"
CFLAGS="$CFLAGS $WARN_CFLAGS" CFLAGS="$CFLAGS $WARN_CFLAGS"
@@ -199,7 +195,16 @@ int has_timeout=sizeof(test.timeout);],
AC_DEFINE([HAVE_SOLARIS_CDROM], [1], AC_DEFINE([HAVE_SOLARIS_CDROM], [1],
[Define 1 if you have Solaris CD-ROM support]) [Define 1 if you have Solaris CD-ROM support])
;; ;;
mingw*|cygwin*) cygwin*)
AC_DEFINE([HAVE_WIN32_CDROM], [1],
[Define 1 if you have cywin MinGW CD-ROM support])
LIBS="$LIBS -lwinmm -mwindows"
AC_DEFINE([CYGWIN], [1],
[Define 1 if you are compiling using cygwin])
;;
mingw*)
AC_DEFINE([MINGW32], [1],
[Define 1 if you are compiling using MinGW])
AC_DEFINE([HAVE_WIN32_CDROM], [1], AC_DEFINE([HAVE_WIN32_CDROM], [1],
[Define 1 if you have cywin MinGW CD-ROM support]) [Define 1 if you have cywin MinGW CD-ROM support])
LIBS="$LIBS -lwinmm -mwindows" LIBS="$LIBS -lwinmm -mwindows"

8
lib/_cdio_win32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_win32.c,v 1.1 2003/05/27 02:55:58 rocky Exp $ $Id: _cdio_win32.c,v 1.2 2003/06/07 08:53:16 rocky Exp $
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -26,7 +26,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_win32.c,v 1.1 2003/05/27 02:55:58 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_win32.c,v 1.2 2003/06/07 08:53:16 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -42,8 +42,9 @@ static const char _rcsid[] = "$Id: _cdio_win32.c,v 1.1 2003/05/27 02:55:58 rocky
#include <string.h> #include <string.h>
/* NOT COMPLETE YET.... */ /* NOT COMPLETE YET....
#undef HAVE_WIN32_CDROM #undef HAVE_WIN32_CDROM
*/
#ifdef HAVE_WIN32_CDROM #ifdef HAVE_WIN32_CDROM
@@ -58,7 +59,6 @@ static const char _rcsid[] = "$Id: _cdio_win32.c,v 1.1 2003/05/27 02:55:58 rocky
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h>
/* Win32 DeviceIoControl specifics */ /* Win32 DeviceIoControl specifics */
#ifndef MAXIMUM_NUMBER_TRACKS #ifndef MAXIMUM_NUMBER_TRACKS

4
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cd-info.c,v 1.6 2003/06/07 01:20:40 rocky Exp $ $Id: cd-info.c,v 1.7 2003/06/07 08:53:16 rocky Exp $
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996,1997,1998 Gerd Knorr <kraxel@bytesex.org> Copyright (C) 1996,1997,1998 Gerd Knorr <kraxel@bytesex.org>
@@ -55,7 +55,6 @@
#include <cdio/util.h> #include <cdio/util.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h>
#ifdef __linux__ #ifdef __linux__
# include <linux/version.h> # include <linux/version.h>
# include <linux/cdrom.h> # include <linux/cdrom.h>
@@ -64,7 +63,6 @@
# endif # endif
#endif #endif
#include <sys/ioctl.h>
#include <errno.h> #include <errno.h>
#ifdef ENABLE_NLS #ifdef ENABLE_NLS