[DVDnav-discuss] r1154 - in trunk/libdvdread: configure.ac src/bswap.h src/dvd_input.c src/dvd_reader.c

[diego]

Author: diego
Date: Fri Oct 10 00:04:24 2008
New Revision: 1154

Log:
OS/2 support by KO Myung-Hun, komh chollian net


Modified:
   trunk/libdvdread/configure.ac
   trunk/libdvdread/src/bswap.h
   trunk/libdvdread/src/dvd_input.c
   trunk/libdvdread/src/dvd_reader.c

Modified: trunk/libdvdread/configure.ac
==============================================================================
--- trunk/libdvdread/configure.ac	(original)
+++ trunk/libdvdread/configure.ac	Fri Oct 10 00:04:24 2008
@@ -145,6 +145,9 @@ case $host in
   *cygwin*)
     LDFLAGS="-no-undefined $LDFLAGS"
     ;;
+  *os2*)
+    LDFLAGS="-no-undefined -Zbin-files $LDFLAGS"
+    ;;
   *)
     AC_CHECK_LIB(c, dlopen,
                  DYNAMIC_LD_LIBS="",

Modified: trunk/libdvdread/src/bswap.h
==============================================================================
--- trunk/libdvdread/src/bswap.h	(original)
+++ trunk/libdvdread/src/bswap.h	Fri Oct 10 00:04:24 2008
@@ -73,7 +73,7 @@
  * functionality!
  */
 
-#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__)
+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__)
 #define B2N_16(x)                             \
  x = ((((x) & 0xff00) >> 8) |                 \
       (((x) & 0x00ff) << 8))

Modified: trunk/libdvdread/src/dvd_input.c
==============================================================================
--- trunk/libdvdread/src/dvd_input.c	(original)
+++ trunk/libdvdread/src/dvd_input.c	Fri Oct 10 00:04:24 2008
@@ -288,13 +288,15 @@ int dvdinput_setup(void)
   #define CSS_LIB "libdvdcss.2.dylib"
 #elif defined(WIN32)
   #define CSS_LIB "libdvdcss.dll"
+#elif defined(__OS2__)
+  #define CSS_LIB "dvdcss.dll"
 #else
   #define CSS_LIB "libdvdcss.so.2"
 #endif
   dvdcss_library = dlopen(CSS_LIB, RTLD_LAZY);
 
   if(dvdcss_library != NULL) {
-#if defined(__OpenBSD__) && !defined(__ELF__)
+#if defined(__OpenBSD__) && !defined(__ELF__) || defined(__OS2__)
 #define U_S "_"
 #else
 #define U_S

Modified: trunk/libdvdread/src/dvd_reader.c
==============================================================================
--- trunk/libdvdread/src/dvd_reader.c	(original)
+++ trunk/libdvdread/src/dvd_reader.c	Fri Oct 10 00:04:24 2008
@@ -508,11 +508,11 @@ dvd_reader_t *DVDOpen( const char *ppath
       }
       fclose( mntfile );
     }
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(__OS2__)
     auth_drive = DVDOpenImageFile( path, have_css );
 #endif
 
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && !defined(__OS2__)
     if( !dev_name ) {
       fprintf( stderr, "libdvdread: Couldn't find device name.\n" );
     } else if( !auth_drive ) {