diff --git a/README b/README index 75144bdb..6a5637fb 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOSBox v0.71 +DOSBox v0.72 ===== diff --git a/VERSION b/VERSION index a55c553f..b214dd99 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.71 +0.72 diff --git a/configure.in b/configure.in index 209c1979..d12e026f 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Init. -AC_INIT(dosbox,0.71) +AC_INIT(dosbox,0.72) AC_PREREQ(2.50) AC_CONFIG_SRCDIR(README) @@ -405,13 +405,19 @@ case "$target" in dnl For now I am lazy and do not add proper detection code. AC_DEFINE(MACOSX, 1, [Compiling on Mac OS X]) LIBS="$LIBS -framework AudioUnit" + AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support (Win32, Posix and OS/2).]) ;; *-*-linux*) AC_DEFINE(LINUX, 1, [Compiling on GNU/Linux]) AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support (Win32, Posix and OS/2).]) ;; *-*-freebsd* | *-*-dragonfly* | *-*-netbsd* | *-*-openbsd*) - AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support (Win32, Posix and OS/2).]) + dnl Disabled directserial for now. It doesn't do anything without + dnl specifying an extra ifdef in directserial_posix.* + dnl directserial detection should be rewritten to test for the needed + dnl functions and headers. I currently do not know + dnl which ones are needed for BSD + dnl AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support (Win32, Posix and OS/2).]) ;; *-*-os2-emx*) AC_DEFINE(OS2, 1, [Compiling on OS/2 EMX]) diff --git a/src/hardware/serialport/directserial_posix.cpp b/src/hardware/serialport/directserial_posix.cpp index 58f2d0bc..5b6c9db4 100644 --- a/src/hardware/serialport/directserial_posix.cpp +++ b/src/hardware/serialport/directserial_posix.cpp @@ -16,14 +16,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: directserial_posix.cpp,v 1.1 2007-01-13 08:35:49 qbix79 Exp $ */ +/* $Id: directserial_posix.cpp,v 1.2 2007-08-26 17:19:46 qbix79 Exp $ */ #include "dosbox.h" #if C_DIRECTSERIAL // Posix version -#if defined (LINUX) +#if defined (LINUX) || defined (MACOSX) #include "serialport.h" #include "directserial_posix.h" @@ -44,7 +44,7 @@ CDirectSerial::CDirectSerial (Bitu id, CommandLine* cmd) InstallationSuccessful = false; rx_retry = 0; - rx_retry_max = 0; + rx_retry_max = 0; std::string prefix="/dev/"; std::string tmpstring; diff --git a/src/hardware/serialport/directserial_posix.h b/src/hardware/serialport/directserial_posix.h index f57102a2..93c7d6a3 100644 --- a/src/hardware/serialport/directserial_posix.h +++ b/src/hardware/serialport/directserial_posix.h @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: directserial_posix.h,v 1.1 2007-01-13 08:35:49 qbix79 Exp $ */ +/* $Id: directserial_posix.h,v 1.2 2007-08-26 17:19:46 qbix79 Exp $ */ // include guard #ifndef DOSBOX_DIRECTSERIAL_POSIX_H @@ -25,7 +25,7 @@ #include "dosbox.h" #if C_DIRECTSERIAL -#ifdef LINUX +#if defined (LINUX) || defined (MACOSX) diff --git a/src/platform/visualc/config.h b/src/platform/visualc/config.h index 9694796d..630e8b5f 100644 --- a/src/platform/visualc/config.h +++ b/src/platform/visualc/config.h @@ -1,6 +1,6 @@ #define INLINE __forceinline -#define VERSION "0.71" +#define VERSION "0.72" /* Define to 1 to enable internal debugger, requires libcurses */