[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [450] trunk/fuse
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [450] trunk/fuse
|
From: <fr...@us...> - 2007-08-06 02:24:36
|
Revision: 450
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=450&view=rev
Author: fredm
Date: 2007-08-05 19:24:38 -0700 (Sun, 05 Aug 2007)
Log Message:
-----------
Merge up to vendor revision 3095.
Revision Links:
--------------
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=3095&view=rev
Modified Paths:
--------------
trunk/fuse/Makefile.am
trunk/fuse/compat/Makefile.am
trunk/fuse/compat/dirname.c
trunk/fuse/compat/getopt.c
trunk/fuse/compat/getopt1.c
trunk/fuse/compat/mkstemp.c
trunk/fuse/compat.h
trunk/fuse/configure.in
trunk/fuse/event.c
trunk/fuse/fuse.cpp
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/config.h
trunk/fuse/hacking/ChangeLog
trunk/fuse/machines/tc2048.c
trunk/fuse/menu_data.pl
trunk/fuse/printer.c
trunk/fuse/rzx.c
trunk/fuse/settings.pl
trunk/fuse/sound/Makefile.am
trunk/fuse/sound/alsasound.c
trunk/fuse/sound/aosound.c
trunk/fuse/sound/coreaudiosound.c
trunk/fuse/sound/dxsound.c
trunk/fuse/sound/hpsound.c
trunk/fuse/sound/nullsound.c
trunk/fuse/sound/osssound.c
trunk/fuse/sound/sdlsound.c
trunk/fuse/sound/sfifo.c
trunk/fuse/sound/sunsound.c
trunk/fuse/sound.c
trunk/fuse/spectrum.c
trunk/fuse/tape.c
trunk/fuse/tape.h
trunk/fuse/trdos.c
trunk/fuse/ui/gtk/debugger.c
trunk/fuse/ui/gtk/gtkjoystick.c
trunk/fuse/ui/gtk/gtkmouse.c
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/gtk/pokefinder.c
trunk/fuse/ui/gtk/stock.c
trunk/fuse/ula.c
trunk/fuse/utils.c
trunk/fuse/widget/widget.c
trunk/fuse/z80/coretest.c
Added Paths:
-----------
trunk/fuse/compat/amiga/
trunk/fuse/compat/amiga/Makefile.am
trunk/fuse/compat/amiga/paths.c
trunk/fuse/compat/morphos/
trunk/fuse/compat/morphos/Makefile.am
trunk/fuse/compat/morphos/osname.c
trunk/fuse/compat/unix/
trunk/fuse/compat/unix/Makefile.am
trunk/fuse/compat/unix/osname.c
trunk/fuse/compat/unix/paths.c
trunk/fuse/compat/win32/
trunk/fuse/compat/win32/Makefile.am
trunk/fuse/compat/win32/osname.c
trunk/fuse/compat/win32/paths.c
trunk/fuse/timer/
trunk/fuse/timer/Makefile.am
trunk/fuse/timer/sdl.c
trunk/fuse/timer/timer.c
trunk/fuse/timer/timer.h
trunk/fuse/timer/unix.c
trunk/fuse/timer/win32.c
Removed Paths:
-------------
trunk/fuse/compat/amiga/Makefile.am
trunk/fuse/compat/amiga/paths.c
trunk/fuse/compat/morphos/Makefile.am
trunk/fuse/compat/morphos/osname.c
trunk/fuse/compat/unix/Makefile.am
trunk/fuse/compat/unix/osname.c
trunk/fuse/compat/unix/paths.c
trunk/fuse/compat/win32/Makefile.am
trunk/fuse/compat/win32/osname.c
trunk/fuse/compat/win32/paths.c
trunk/fuse/sound/lowlevel.h
trunk/fuse/timer/Makefile.am
trunk/fuse/timer/sdl.c
trunk/fuse/timer/timer.c
trunk/fuse/timer/timer.h
trunk/fuse/timer/unix.c
trunk/fuse/timer/win32.c
trunk/fuse/timer.c
trunk/fuse/timer.h
Modified: trunk/fuse/Makefile.am
===================================================================
--- trunk/fuse/Makefile.am 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/Makefile.am 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2004 Philip Kendall
-## $Id: Makefile.am 3007 2007-06-17 18:50:48Z zubzero $
+## $Id: Makefile.am 3091 2007-08-04 16:44:45Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@
pokefinder \
roms \
sound \
+ timer \
ui \
@WIDGET@ \
z80
@@ -87,7 +88,6 @@
sound.c \
spectrum.c \
tape.c \
- timer.c \
trdos.c \
ui.c \
uidisplay.c \
@@ -107,19 +107,18 @@
sound/libsound.a \
ui/scaler/libscaler.a \
debugger/libdebugger.a \
+timer/libtimer.a \
z80/libz80.a \
@DSKLIBS@ \
@LIBSPEC_LIBS@ \
@GLIB_LIBS@ \
@PNG_LIBS@ \
-@ASOUND_LIBS@ \
-@AO_LIBS@ \
+@SOUND_LIBS@ \
@SAMPLERATE_LIBS@ \
-@DIRECTSOUND_LIBS@ \
-@COREAUDIO_LIBS@ \
@X_LIBS@ \
@XML_LIBS@ \
compat/libcompat.a \
+compat/unix/libcompatos.a \
@WINDRES_OBJ@
fuse_DEPENDENCIES = @UI_LIBS@ \
@@ -173,7 +172,6 @@
sound.h \
spectrum.h \
tape.h \
- timer.h \
trdos.h \
utils.h \
joystick.h \
Modified: trunk/fuse/compat/Makefile.am
===================================================================
--- trunk/fuse/compat/Makefile.am 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/Makefile.am 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2003 Philip Kendall
+## Copyright (c) 2003-2007 Philip Kendall
-## $Id: Makefile.am 2889 2007-05-26 17:45:08Z zubzero $
+## $Id: Makefile.am 3091 2007-08-04 16:44:45Z pak21 $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -23,13 +23,25 @@
AUTOMAKE_OPTIONS = foreign
+SUBDIRS = @COMPAT_OSNAME@
+
+DIST_SUBDIRS = amiga \
+ morphos \
+ unix \
+ win32
+
noinst_LIBRARIES = libcompat.a
-libcompat_a_SOURCES = dirname.c \
- getopt.c \
- getopt1.c \
- mkstemp.c
+libcompat_a_SOURCES =
+EXTRA_libcompat_a_SOURCES = dirname.c \
+ getopt.c \
+ getopt1.c \
+ mkstemp.c
+
+libcompat_a_LIBADD = $(COMPAT_LIBADD)
+libcompat_a_DEPENDENCIES = $(COMPAT_LIBADD)
+
INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
noinst_HEADERS = getopt.h
Copied: trunk/fuse/compat/amiga (from rev 449, vendor/fuse-emulator/current/fuse/compat/amiga)
Deleted: trunk/fuse/compat/amiga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/amiga/Makefile.am 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,31 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007 Philip Kendall
-
-## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = ../unix/osname.c \
- paths.c
-
-INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Copied: trunk/fuse/compat/amiga/Makefile.am (from rev 449, vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am)
===================================================================
--- trunk/fuse/compat/amiga/Makefile.am (rev 0)
+++ trunk/fuse/compat/amiga/Makefile.am 2007-08-06 02:24:38 UTC (rev 450)
@@ -0,0 +1,31 @@
+## Process this file with automake to produce Makefile.in
+## Copyright (c) 2007 Philip Kendall
+
+## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with this program; if not, write to the Free Software Foundation, Inc.,
+## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+##
+## Author contact information:
+##
+## E-mail: phi...@sh...
+
+AUTOMAKE_OPTIONS = foreign
+
+noinst_LIBRARIES = libcompatos.a
+
+libcompatos_a_SOURCES = ../unix/osname.c \
+ paths.c
+
+INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Deleted: trunk/fuse/compat/amiga/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/paths.c 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/amiga/paths.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,40 +0,0 @@
-/* paths.c: Path-related compatability routines
- Copyright (c) 1999-2007 Philip Kendall
-
- $Id: paths.c 3092 2007-08-04 19:20:58Z pak21 $
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Author contact information:
-
- E-mail: phi...@sh...
-
-*/
-
-#include <config.h>
-
-#include "compat.h"
-
-const char*
-compat_get_temp_path( void )
-{
- return "T:";
-}
-
-const char*
-compat_get_home_path( void )
-{
- return "PROGDIR:settings";
-}
Copied: trunk/fuse/compat/amiga/paths.c (from rev 449, vendor/fuse-emulator/current/fuse/compat/amiga/paths.c)
===================================================================
--- trunk/fuse/compat/amiga/paths.c (rev 0)
+++ trunk/fuse/compat/amiga/paths.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -0,0 +1,40 @@
+/* paths.c: Path-related compatability routines
+ Copyright (c) 1999-2007 Philip Kendall
+
+ $Id: paths.c 3092 2007-08-04 19:20:58Z pak21 $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include "compat.h"
+
+const char*
+compat_get_temp_path( void )
+{
+ return "T:";
+}
+
+const char*
+compat_get_home_path( void )
+{
+ return "PROGDIR:settings";
+}
Modified: trunk/fuse/compat/dirname.c
===================================================================
--- trunk/fuse/compat/dirname.c 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/dirname.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -26,8 +26,6 @@
#include <config.h>
-#ifndef HAVE_DIRNAME
-
#include <string.h>
#include "fuse.h"
@@ -99,5 +97,3 @@
return path;
}
-
-#endif /* #ifndef HAVE_DIRNAME */
Modified: trunk/fuse/compat/getopt.c
===================================================================
--- trunk/fuse/compat/getopt.c 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/getopt.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -34,8 +34,6 @@
# include <config.h>
#endif
-#if !defined HAVE_GETOPT_LONG && !defined AMIGA && !defined __MORPHOS__
-
#if !defined __STDC__ || !__STDC__
/* This is a separate conditional since some stdc systems
reject `defined (const)'. */
@@ -1280,5 +1278,3 @@
}
#endif /* TEST */
-
-#endif /* #ifndef HAVE_GETOPT_LONG */
Modified: trunk/fuse/compat/getopt1.c
===================================================================
--- trunk/fuse/compat/getopt1.c 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/getopt1.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -24,8 +24,6 @@
#include <config.h>
#endif
-#if !defined HAVE_GETOPT_LONG && !defined AMIGA && !defined __MORPHOS__
-
#ifdef _LIBC
# include <getopt.h>
#else
@@ -198,5 +196,3 @@
}
#endif /* TEST */
-
-#endif /* #ifndef HAVE_GETOPT_LONG */
Modified: trunk/fuse/compat/mkstemp.c
===================================================================
--- trunk/fuse/compat/mkstemp.c 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/mkstemp.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -20,8 +20,6 @@
#include <config.h>
-#ifndef HAVE_MKSTEMP
-
#include <errno.h>
#include <stdlib.h>
#include <string.h>
@@ -109,5 +107,3 @@
errno = EEXIST;
return -1;
}
-
-#endif /* #ifdef HAVE_MKSTEMP */
Copied: trunk/fuse/compat/morphos (from rev 449, vendor/fuse-emulator/current/fuse/compat/morphos)
Deleted: trunk/fuse/compat/morphos/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/morphos/Makefile.am 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,31 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007 Philip Kendall
-
-## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = osname.c \
- ../amiga/paths.c
-
-INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Copied: trunk/fuse/compat/morphos/Makefile.am (from rev 449, vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am)
===================================================================
--- trunk/fuse/compat/morphos/Makefile.am (rev 0)
+++ trunk/fuse/compat/morphos/Makefile.am 2007-08-06 02:24:38 UTC (rev 450)
@@ -0,0 +1,31 @@
+## Process this file with automake to produce Makefile.in
+## Copyright (c) 2007 Philip Kendall
+
+## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with this program; if not, write to the Free Software Foundation, Inc.,
+## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+##
+## Author contact information:
+##
+## E-mail: phi...@sh...
+
+AUTOMAKE_OPTIONS = foreign
+
+noinst_LIBRARIES = libcompatos.a
+
+libcompatos_a_SOURCES = osname.c \
+ ../amiga/paths.c
+
+INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Deleted: trunk/fuse/compat/morphos/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/osname.c 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/morphos/osname.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,34 +0,0 @@
-/* osname.c: Get a representation of the OS we're running on
- Copyright (c) 1999-2007 Philip Kendall
-
- $Id: osname.c 3091 2007-08-04 16:44:45Z pak21 $
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Author contact information:
-
- E-mail: phi...@sh...
-
-*/
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int compat_osname( char *buffer, size_t length )
-{
- snprintf( buffer, length, "%s %s %s", "MorphOS", "Pegasos", "1.4.4" );
-}
Copied: trunk/fuse/compat/morphos/osname.c (from rev 449, vendor/fuse-emulator/current/fuse/compat/morphos/osname.c)
===================================================================
--- trunk/fuse/compat/morphos/osname.c (rev 0)
+++ trunk/fuse/compat/morphos/osname.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -0,0 +1,34 @@
+/* osname.c: Get a representation of the OS we're running on
+ Copyright (c) 1999-2007 Philip Kendall
+
+ $Id: osname.c 3091 2007-08-04 16:44:45Z pak21 $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int compat_osname( char *buffer, size_t length )
+{
+ snprintf( buffer, length, "%s %s %s", "MorphOS", "Pegasos", "1.4.4" );
+}
Copied: trunk/fuse/compat/unix (from rev 449, vendor/fuse-emulator/current/fuse/compat/unix)
Deleted: trunk/fuse/compat/unix/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/unix/Makefile.am 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,31 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007 Philip Kendall
-
-## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = osname.c \
- paths.c
-
-INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Copied: trunk/fuse/compat/unix/Makefile.am (from rev 449, vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am)
===================================================================
--- trunk/fuse/compat/unix/Makefile.am (rev 0)
+++ trunk/fuse/compat/unix/Makefile.am 2007-08-06 02:24:38 UTC (rev 450)
@@ -0,0 +1,31 @@
+## Process this file with automake to produce Makefile.in
+## Copyright (c) 2007 Philip Kendall
+
+## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with this program; if not, write to the Free Software Foundation, Inc.,
+## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+##
+## Author contact information:
+##
+## E-mail: phi...@sh...
+
+AUTOMAKE_OPTIONS = foreign
+
+noinst_LIBRARIES = libcompatos.a
+
+libcompatos_a_SOURCES = osname.c \
+ paths.c
+
+INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Deleted: trunk/fuse/compat/unix/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/osname.c 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/unix/osname.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,50 +0,0 @@
-/* osname.c: Get a representation of the OS we're running on
- Copyright (c) 1999-2007 Philip Kendall
-
- $Id: osname.c 3094 2007-08-05 14:20:15Z fredm $
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Author contact information:
-
- E-mail: phi...@sh...
-
-*/
-
-#include <config.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/utsname.h>
-
-#include "ui/ui.h"
-
-int compat_osname( char *buffer, size_t length )
-{
- struct utsname osname;
- int error;
-
- error = uname( &osname );
- if( error ) {
- ui_error( UI_ERROR_ERROR, "error getting system information: %s",
- strerror( errno ) );
- return 1;
- }
-
- snprintf( buffer, length, "%s %s %s", osname.sysname, osname.machine,
- osname.release );
- return 0;
-}
Copied: trunk/fuse/compat/unix/osname.c (from rev 449, vendor/fuse-emulator/current/fuse/compat/unix/osname.c)
===================================================================
--- trunk/fuse/compat/unix/osname.c (rev 0)
+++ trunk/fuse/compat/unix/osname.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -0,0 +1,50 @@
+/* osname.c: Get a representation of the OS we're running on
+ Copyright (c) 1999-2007 Philip Kendall
+
+ $Id: osname.c 3094 2007-08-05 14:20:15Z fredm $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/utsname.h>
+
+#include "ui/ui.h"
+
+int compat_osname( char *buffer, size_t length )
+{
+ struct utsname osname;
+ int error;
+
+ error = uname( &osname );
+ if( error ) {
+ ui_error( UI_ERROR_ERROR, "error getting system information: %s",
+ strerror( errno ) );
+ return 1;
+ }
+
+ snprintf( buffer, length, "%s %s %s", osname.sysname, osname.machine,
+ osname.release );
+ return 0;
+}
Deleted: trunk/fuse/compat/unix/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/paths.c 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/unix/paths.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,48 +0,0 @@
-/* paths.c: Path-related compatability routines
- Copyright (c) 1999-2007 Philip Kendall
-
- $Id: paths.c 3092 2007-08-04 19:20:58Z pak21 $
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Author contact information:
-
- E-mail: phi...@sh...
-
-*/
-
-#include <config.h>
-
-#include <stdlib.h>
-
-#include "compat.h"
-
-const char*
-compat_get_temp_path( void )
-{
- const char *dir;
-
- /* Use TMPDIR if specified, if not /tmp */
- dir = getenv( "TMPDIR" ); if( dir ) return dir;
- return "/tmp";
-}
-
-const char*
-compat_get_home_path( void )
-{
- const char *dir;
- dir = getenv( "HOME" ); if( dir ) return dir;
- return ".";
-}
Copied: trunk/fuse/compat/unix/paths.c (from rev 449, vendor/fuse-emulator/current/fuse/compat/unix/paths.c)
===================================================================
--- trunk/fuse/compat/unix/paths.c (rev 0)
+++ trunk/fuse/compat/unix/paths.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -0,0 +1,48 @@
+/* paths.c: Path-related compatability routines
+ Copyright (c) 1999-2007 Philip Kendall
+
+ $Id: paths.c 3092 2007-08-04 19:20:58Z pak21 $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <stdlib.h>
+
+#include "compat.h"
+
+const char*
+compat_get_temp_path( void )
+{
+ const char *dir;
+
+ /* Use TMPDIR if specified, if not /tmp */
+ dir = getenv( "TMPDIR" ); if( dir ) return dir;
+ return "/tmp";
+}
+
+const char*
+compat_get_home_path( void )
+{
+ const char *dir;
+ dir = getenv( "HOME" ); if( dir ) return dir;
+ return ".";
+}
Copied: trunk/fuse/compat/win32 (from rev 449, vendor/fuse-emulator/current/fuse/compat/win32)
Deleted: trunk/fuse/compat/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/win32/Makefile.am 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,31 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007 Philip Kendall
-
-## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = osname.c \
- paths.c
-
-INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Copied: trunk/fuse/compat/win32/Makefile.am (from rev 449, vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am)
===================================================================
--- trunk/fuse/compat/win32/Makefile.am (rev 0)
+++ trunk/fuse/compat/win32/Makefile.am 2007-08-06 02:24:38 UTC (rev 450)
@@ -0,0 +1,31 @@
+## Process this file with automake to produce Makefile.in
+## Copyright (c) 2007 Philip Kendall
+
+## $Id: Makefile.am 3092 2007-08-04 19:20:58Z pak21 $
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with this program; if not, write to the Free Software Foundation, Inc.,
+## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+##
+## Author contact information:
+##
+## E-mail: phi...@sh...
+
+AUTOMAKE_OPTIONS = foreign
+
+noinst_LIBRARIES = libcompatos.a
+
+libcompatos_a_SOURCES = osname.c \
+ paths.c
+
+INCLUDES = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Deleted: trunk/fuse/compat/win32/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/osname.c 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/win32/osname.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,56 +0,0 @@
-/* osname.c: Get a representation of the OS we're running on
- Copyright (c) 1999-2007 Philip Kendall
-
- $Id: osname.c 3091 2007-08-04 16:44:45Z pak21 $
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Author contact information:
-
- E-mail: phi...@sh...
-
-*/
-
-#include <config.h>
-
-#include <windows.h>
-
-int compat_osname( char *osname, size_t length )
-{
- OSVERSIONINFO buf;
- char *windows_name;
-
- buf.dwOSVersionInfoSize = sizeof( buf );
- sys_error = GetVersionEx( &buf );
- if( sys_error == 0 ) {
- ui_error( UI_ERROR_ERROR, "error getting system information." );
- return 1;
- }
-
- switch( buf.dwPlatformId ) {
- case VER_PLATFORM_WIN32_NT: windows_name = "NT"; break;
- case VER_PLATFORM_WIN32_WINDOWS: windows_name = "95/98"; break;
- case VER_PLATFORM_WIN32s: windows_name = "3.1"; break;
- default: windows_name = "unknown"; break;
- }
-
- snprintf( osname, length,
- "gcrypt: %s\nlibspectrum: %s\nuname: Windows %s %d.%d build %d %s",
- gcrypt_version, libspectrum_version(),
- windows_name, buf.dwMajorVersion, buf.dwMinorVersion,
- buf.dwBuildNumber, buf.szCSDVersion );
-
- return 0;
-}
Copied: trunk/fuse/compat/win32/osname.c (from rev 449, vendor/fuse-emulator/current/fuse/compat/win32/osname.c)
===================================================================
--- trunk/fuse/compat/win32/osname.c (rev 0)
+++ trunk/fuse/compat/win32/osname.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -0,0 +1,56 @@
+/* osname.c: Get a representation of the OS we're running on
+ Copyright (c) 1999-2007 Philip Kendall
+
+ $Id: osname.c 3091 2007-08-04 16:44:45Z pak21 $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <windows.h>
+
+int compat_osname( char *osname, size_t length )
+{
+ OSVERSIONINFO buf;
+ char *windows_name;
+
+ buf.dwOSVersionInfoSize = sizeof( buf );
+ sys_error = GetVersionEx( &buf );
+ if( sys_error == 0 ) {
+ ui_error( UI_ERROR_ERROR, "error getting system information." );
+ return 1;
+ }
+
+ switch( buf.dwPlatformId ) {
+ case VER_PLATFORM_WIN32_NT: windows_name = "NT"; break;
+ case VER_PLATFORM_WIN32_WINDOWS: windows_name = "95/98"; break;
+ case VER_PLATFORM_WIN32s: windows_name = "3.1"; break;
+ default: windows_name = "unknown"; break;
+ }
+
+ snprintf( osname, length,
+ "gcrypt: %s\nlibspectrum: %s\nuname: Windows %s %d.%d build %d %s",
+ gcrypt_version, libspectrum_version(),
+ windows_name, buf.dwMajorVersion, buf.dwMinorVersion,
+ buf.dwBuildNumber, buf.szCSDVersion );
+
+ return 0;
+}
Deleted: trunk/fuse/compat/win32/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat/win32/paths.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,52 +0,0 @@
-/* paths.c: Path-related compatability routines
- Copyright (c) 1999-2007 Philip Kendall
-
- $Id: paths.c 3092 2007-08-04 19:20:58Z pak21 $
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Author contact information:
-
- E-mail: phi...@sh...
-
-*/
-
-#include <config.h>
-
-#include <stdlib.h>
-
-#include "compat.h"
-
-const char*
-compat_get_temp_path( void )
-{
- const char *dir;
-
- /* Something close to this algorithm specified at
- http://msdn.microsoft.com/library/default.asp?url=/library/en-us/fileio/base/gettemppath.asp
- */
- dir = getenv( "TMP" ); if( dir ) return dir;
- dir = getenv( "TEMP" ); if( dir ) return dir;
- return ".";
-}
-
-const char*
-compat_get_home_path( void )
-{
- const char *dir;
- dir = getenv( "USERPROFILE" ); if( dir ) return dir;
- dir = getenv( "WINDIR" ); if( dir ) return dir;
- return ".";
-}
Copied: trunk/fuse/compat/win32/paths.c (from rev 449, vendor/fuse-emulator/current/fuse/compat/win32/paths.c)
===================================================================
--- trunk/fuse/compat/win32/paths.c (rev 0)
+++ trunk/fuse/compat/win32/paths.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -0,0 +1,52 @@
+/* paths.c: Path-related compatability routines
+ Copyright (c) 1999-2007 Philip Kendall
+
+ $Id: paths.c 3092 2007-08-04 19:20:58Z pak21 $
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Author contact information:
+
+ E-mail: phi...@sh...
+
+*/
+
+#include <config.h>
+
+#include <stdlib.h>
+
+#include "compat.h"
+
+const char*
+compat_get_temp_path( void )
+{
+ const char *dir;
+
+ /* Something close to this algorithm specified at
+ http://msdn.microsoft.com/library/default.asp?url=/library/en-us/fileio/base/gettemppath.asp
+ */
+ dir = getenv( "TMP" ); if( dir ) return dir;
+ dir = getenv( "TEMP" ); if( dir ) return dir;
+ return ".";
+}
+
+const char*
+compat_get_home_path( void )
+{
+ const char *dir;
+ dir = getenv( "USERPROFILE" ); if( dir ) return dir;
+ dir = getenv( "WINDIR" ); if( dir ) return dir;
+ return ".";
+}
Modified: trunk/fuse/compat.h
===================================================================
--- trunk/fuse/compat.h 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/compat.h 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,7 +1,7 @@
/* compat.h: various compatibility bits
Copyright (c) 2003 Philip Kendall
- $Id: compat.h 3039 2007-07-03 12:17:27Z fredm $
+ $Id: compat.h 3092 2007-08-04 19:20:58Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -26,6 +26,8 @@
#ifndef FUSE_COMPAT_H
#define FUSE_COMPAT_H
+#include <stdlib.h>
+
/* Remove the gcc-specific incantations if we're not using gcc */
#ifdef __GNUC__
@@ -70,4 +72,8 @@
#define FUSE_DIR_SEP_STR "/"
#endif
+int compat_osname( char *buffer, size_t length );
+const char* compat_get_temp_path( void );
+const char* compat_get_home_path( void );
+
#endif /* #ifndef FUSE_COMPAT_H */
Modified: trunk/fuse/configure.in
===================================================================
--- trunk/fuse/configure.in 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/configure.in 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in 3078 2007-07-27 10:49:51Z pak21 $
+dnl $Id: configure.in 3093 2007-08-04 20:51:34Z pak21 $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -352,11 +352,12 @@
plus3disk=yes)
AC_MSG_RESULT($plus3disk)
if test "$plus3disk" = yes; then
- AC_CHECK_HEADERS(765.h, DSKLIBS="$DSKLIBS -l765"; lib765=yes,
+ AC_CHECK_HEADERS(765.h, DSKLIBS="$DSKLIBS -l765" lib765=yes,
AC_MSG_WARN(765.h not found - +3 disk support disabled))
fi
dnl Do we want LibDsk support?
+AC_MSG_CHECKING(whether libdsk is available)
AC_ARG_WITH(libdsk,
[ --without-libdsk disable LibDsk support],
if test "$withval" = no; then libdsk=no; else libdsk=yes; fi,
@@ -397,12 +398,11 @@
AC_CHECK_LIB( asound, snd_pcm_hw_params_set_period_size_near,
[AC_CHECK_HEADER(
alsa/asoundlib.h,
- [AC_DEFINE([USE_LIBASOUND], 1, [Defined if we're going to be using the installed libasound]) ASOUND_LIBS='-lasound'],
+ [alsa_available=yes],
[AC_MSG_WARN(alsa/asoundlib.h not found - no ALSA output)]
)],
[AC_MSG_WARN(snd_pcm_hw_params_set_period_size_near not found - no ALSA output)]
)
- AC_SUBST(ASOUND_LIBS)
fi
dnl Check if a version of libao which supplies ao_open_live is available
@@ -416,21 +416,19 @@
AC_CHECK_LIB( ao, ao_open_live,
[AC_CHECK_HEADER(
ao/ao.h,
- [AC_DEFINE([USE_LIBAO], 1, [Defined if we're going to be using the installed libao]) AO_LIBS='-lao'],
+ [ao_available=yes],
[AC_MSG_WARN(ao/ao.h not found - no libao sound output)]
)],
[AC_MSG_WARN(ao_open_live not found - no libao sound output)]
)
- AC_SUBST(AO_LIBS)
fi
dnl Check if DirectSound is available
AC_CHECK_HEADER(
dsound.h,
- [AC_DEFINE([USE_DIRECTSOUND], 1, [Defined if we're going to be using DirectSound]) DIRECTSOUND_LIBS='-ldsound -lole32 -ldxguid'],
+ [dxsound_available=yes],
[AC_MSG_WARN(dsound.h not found - no DirectSound output)]
)
-AC_SUBST(DIRECTSOUND_LIBS)
PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.1.0,
AC_DEFINE([HAVE_SAMPLERATE],1,[Define to 1 if you have libsamplerate.]),
@@ -441,11 +439,56 @@
dnl Check if CoreAudio is available
AC_CHECK_HEADER(
CoreAudio/AudioHardware.h,
- [AC_DEFINE([USE_COREAUDIO], 1, [Defined if we're going to be using CoreAudio]) COREAUDIO_LIBS='-framework CoreAudio -framework AudioUnit -framework CoreServices'],
+ [coreaudio_available=yes],
[AC_MSG_WARN(CoreAudio/AudioHardware.h not found - no CoreAudio sound output)]
)
-AC_SUBST(COREAUDIO_LIBS)
+dnl
+dnl Decide which sound routines to use
+dnl
+
+AC_MSG_CHECKING(which sound routines to use)
+if test "$dxsound_available" = yes; then
+ SOUND_LIBADD='dxsound.$(OBJEXT)' SOUND_LIBS='-ldsound -lole32 -ldxguid'
+ AC_MSG_RESULT(DirectX)
+elif test "$UI" = sdl; then
+ SOUND_LIBADD='sdlsound.$(OBJEXT)' SOUND_LIBS='' sound_fifo=yes
+ AC_MSG_RESULT(SDL)
+elif test "$alsa_available" = yes; then
+ SOUND_LIBADD='alsasound.$(OBJEXT)' SOUND_LIBS='-lasound'
+ AC_MSG_RESULT(ALSA)
+elif test "$ao_available" = yes; then
+ SOUND_LIBADD='aosound.$(OBJEXT)' SOUND_LIBS='-lao'
+ AC_MSG_RESULT(libao)
+elif test "$ac_cv_header_dsound_h" = yes; then
+ # Later selection between these two
+ SOUND_LIBADD='sunsound.$(OBJEXT) hpsound.$(OBJEXT)' SOUND_LIBS=''
+ AC_MSG_RESULT(Solaris or HP/UX)
+elif test "$ac_cv_header_sys_soundcard_h" = yes; then
+ SOUND_LIBADD='osssound.$(OBJEXT)' SOUND_LIBS=''
+ AC_MSG_RESULT(OSS)
+elif test "$ac_cv_header_sys_audioio_h" = yes; then
+ dnl OpenBSD
+ SOUND_LIBADD='sunsound.$(OBJEXT)' SOUND_LIBS=''
+ AC_MSG_RESULT(OpenBSD)
+elif test "$coreaudio_available" = yes; then
+ SOUND_LIBADD='coreaudiosound.$(OBJEXT)' SOUND_LIBS='-framework CoreAudio -framework AudioUnit -framework CoreServices' sound_fifo=yes
+ AC_MSG_RESULT(CoreAudio)
+else
+ SOUND_LIBADD='nullsound.$(OBJEXT)' SOUND_LIBS=''
+ AC_MSG_RESULT(none)
+ AC_DEFINE([NO_SOUND], 1, [Defined if no sound code is present])
+fi
+
+if test "$sound_fifo" = yes; then
+ dnl Strange construct used here as += doesn't seem to work on OS X
+ SOUND_LIBADD="$SOUND_LIBADD"' sfifo.$(OBJEXT)'
+ AC_DEFINE([SOUND_FIFO], 1, [Defined if the sound code uses a fifo])
+fi
+
+AC_SUBST(SOUND_LIBADD)
+AC_SUBST(SOUND_LIBS)
+
dnl Are we supplying the ROMs or relying on another package?
AC_MSG_CHECKING(where to find the Spectrum ROM images)
AC_ARG_WITH(roms-dir,
@@ -505,6 +548,82 @@
[Defined if we've got libxml2]),
AC_WARN(libxml2 not found - config file use disabled))
+dnl Work out which timer routines to use
+AC_MSG_CHECKING(which timer routines to use)
+if test "$UI" = sdl; then
+ TIMER_LIBADD='sdl.$(OBJEXT)'
+ timer_header='<SDL.h>'
+ timer_type='Uint32'
+ AC_MSG_RESULT(SDL)
+else
+ case "$target_os" in
+ win32)
+ TIMER_LIBADD='win32.$(OBJEXT)'
+ timer_header='<windows.h>'
+ timer_type='DWORD'
+ AC_MSG_RESULT(Win32)
+ ;;
+ *)
+ TIMER_LIBADD='unix.$(OBJEXT)'
+ timer_header='<sys/time.h>'
+ timer_type='struct timeval'
+ AC_MSG_RESULT(unix)
+ ;;
+ esac
+fi
+
+AC_SUBST(TIMER_LIBADD)
+AC_DEFINE_UNQUOTED([TIMER_HEADER], $timer_header, [The header needed to define the timer type])
+AC_DEFINE_UNQUOTED([TIMER_TYPE], $timer_type, [The type needed for the timer routines])
+
+dnl Work out which standard routines we're missing
+AC_MSG_CHECKING(which standard routines we're missing)
+COMPAT_LIBADD=''
+missing_routines=''
+if test "$ac_cv_func_dirname" = no; then
+ COMPAT_LIBADD="$COMPAT_LIBADD"'dirname.$(OBJEXT) '
+ missing_routines="$missing_routines"'dirname '
+fi
+if test "$ac_cv_func_getopt_long" = no; then
+ case "$target_os" in
+ amiga|morphos)
+ dnl Our getopt_long replacement doesn't work, so don't use it
+ ;;
+ *)
+ COMPAT_LIBADD="$COMPAT_LIBADD"'getopt.$(OBJEXT) getopt1.$(OBJEXT) '
+ missing_routines="$missing_routines"'getopt_long '
+ ;;
+ esac
+fi
+if test "$ac_cv_func_mkstemp" = no; then
+ COMPAT_LIBADD="$COMPAT_LIBADD"'mkstemp.$(OBJEXT) '
+ missing_routines="$missing_routines"'mkstemp '
+fi
+if test "x$missing_routines" = x; then
+ missing_routines='(none)'
+fi
+AC_MSG_RESULT($missing_routines)
+AC_SUBST(COMPAT_LIBADD)
+
+dnl Work out which compatability routines to use
+AC_MSG_CHECKING(which compatability routines to use)
+case "$target_os" in
+ amiga)
+ COMPAT_OSNAME='amiga'
+ ;;
+ morphos)
+ COMPAT_OSNAME='morphos'
+ ;;
+ win32)
+ COMPAT_OSNAME='win32'
+ ;;
+ *)
+ COMPAT_OSNAME='unix'
+ ;;
+esac
+AC_MSG_RESULT($COMPAT_OSNAME)
+AC_SUBST(COMPAT_OSNAME)
+
dnl Do we want the low memory compile?
AC_MSG_CHECKING(whether low memory compile requested)
AC_ARG_ENABLE(smallmem,
@@ -541,24 +660,12 @@
fi
fi
-dnl Debugging mode: turns off any use of signals to make running under gdb
-dnl useful.
-AC_MSG_CHECKING(whether debugging mode requested)
-AC_ARG_ENABLE(debug-mode,
-[ --enable-debug-mode enable debugging mode (developers only)],
-if test "$enableval" = yes; then
- debugging=yes;
-else
- debugging=no;
-fi,
-debugging=no)
-AC_MSG_RESULT($debugging)
-if test "$debugging" = yes; then
- AC_DEFINE([DEBUG_MODE], 1, [Defined if we're in debugging mode])
-fi
-
AC_OUTPUT(Makefile \
compat/Makefile \
+compat/amiga/Makefile \
+compat/morphos/Makefile \
+compat/unix/Makefile \
+compat/win32/Makefile \
debugger/Makefile \
disk/Makefile \
hacking/Makefile \
@@ -570,6 +677,7 @@
pokefinder/Makefile \
roms/Makefile \
sound/Makefile \
+timer/Makefile \
ui/Makefile \
ui/fb/Makefile \
ui/gtk/Makefile \
Modified: trunk/fuse/event.c
===================================================================
--- trunk/fuse/event.c 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/event.c 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,7 +1,7 @@
/* event.c: Routines needed for dealing with the event list
Copyright (c) 2000-2004 Philip Kendall
- $Id: event.c 3032 2007-06-28 22:48:54Z zubzero $
+ $Id: event.c 3084 2007-07-30 21:54:54Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -38,12 +38,11 @@
#include "psg.h"
#include "rzx.h"
#include "tape.h"
-#include "timer.h"
+#include "timer/timer.h"
#include "trdos.h"
#include "ui/ui.h"
#include "ui/uijoystick.h"
#include "spectrum.h"
-#include "timer.h"
#include "z80/z80.h"
/* A large value to mean `no events due' */
Modified: trunk/fuse/fuse.cpp
===================================================================
--- trunk/fuse/fuse.cpp 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/fuse.cpp 2007-08-06 02:24:38 UTC (rev 450)
@@ -1,7 +1,7 @@
/* fuse.c: The Free Unix Spectrum Emulator
Copyright (c) 1999-2007 Philip Kendall
- $Id: fuse.c 3040 2007-07-03 14:14:00Z zubzero $
+ $Id: fuse.c 3091 2007-08-04 16:44:45Z pak21 $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -69,10 +69,9 @@
#include "slt.h"
#include "snapshot.h"
#include "sound.h"
-#include "sound/lowlevel.h"
#include "spectrum.h"
#include "tape.h"
-#include "timer.h"
+#include "timer/timer.h"
#include "trdos.h"
#include "ui/ui.h"
#include "ui/scaler/scaler.h"
@@ -294,15 +293,8 @@
{
size_t i;
unsigned int version[4] = { 0, 0, 0, 0 };
- char *custom;
+ char *custom, osname[ 256 ];
-#ifndef WIN32
- struct utsname buf;
-#else /* #ifndef WIN32 */
- OSVERSIONINFO buf;
- char *windows_name;
-#endif /* #ifndef WIN32 */
-
libspectrum_error error; int sys_error;
const char *gcrypt_version;
@@ -312,25 +304,8 @@
for( i=0; i<4; i++ ) if( version[i] > 0xff ) version[i] = 0xff;
-#if defined(__MORPHOS__)
- snprintf(buf.sysname, __SYS_NMLN, "MorphOS");
- snprintf(buf.release, __SYS_NMLN, "1.4.4");
- snprintf(buf.machine, __SYS_NMLN, "Pegasos");
-#elif defined(WIN32) /* #if defined(__MORPHOS__) */
- buf.dwOSVersionInfoSize = sizeof( buf );
- sys_error = GetVersionEx( &buf );
- if( sys_error == 0 ) {
- ui_error( UI_ERROR_ERROR, "error getting system information." );
- return 1;
- }
-#else /* #if defined(__MORPHOS__) */
- sys_error = uname( &buf );
- if( sys_error == -1 ) {
- ui_error( UI_ERROR_ERROR, "error getting system information: %s",
- strerror( errno ) );
- return 1;
- }
-#endif /* #if defined(__MORPHOS__) */
+ sys_error = compat_osname( osname, sizeof( osname ) );
+ if( sys_error ) return 1;
error = libspectrum_creator_alloc( &fuse_creator ); if( error ) return error;
@@ -355,29 +330,10 @@
gcrypt_version = libspectrum_gcrypt_version();
if( !gcrypt_version ) gcrypt_version = "not available";
-#ifndef WIN32
-
- snprintf( custom, 256, "gcrypt: %s\nlibspectrum: %s\nuname: %s %s %s",
- gcrypt_version, libspectrum_version(),
- buf.sysname, buf.machine, buf.release );
-
-#else /* #ifndef WIN32 */
-
- switch( buf.dwPlatformId ) {
- case VER_PLATFORM_WIN32_NT: windows_name = "NT"; break;
- case VER_PLATFORM_WIN32_WINDOWS: windows_name = "95/98"; break;
- case VER_PLATFORM_WIN32s: windows_name = "3.1"; break;
- default: windows_name = "unknown"; break;
- }
-
snprintf( custom, 256,
- "gcrypt: %s\nlibspectrum: %s\nuname: Windows %s %d.%d build %d %s",
- gcrypt_version, libspectrum_version(),
- windows_name, buf.dwMajorVersion, buf.dwMinorVersion,
- buf.dwBuildNumber, buf.szCSDVersion );
+ "gcrypt: %s\nlibspectrum: %s\nuname: %s", gcrypt_version,
+ libspectrum_version(), osname );
-#endif /* #ifndef WIN32 */
-
error = libspectrum_creator_set_custom(
fuse_creator, (libspectrum_byte*)custom, strlen( custom )
);
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2007-08-06 01:18:06 UTC (rev 449)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2007-08-06 02:24:38 UTC (rev 450)
@@ -49,7 +49,6 @@
B61F45C109121DF100C8096C /* specplus3.h in Headers */ = {isa = PBXBuildFile; fileRef = F55986160389234A01A804BA /* specplus3.h */; };
B61F45C209121DF100C8096C /* spectrum.h in Headers */ = {isa = PBXBuildFile; fileRef = F55986180389234A01A804BA /* spectrum.h */; };
B61F45C309121DF100C8096C /* tape.h in Headers */ = {isa = PBXBuildFile; fileRef = F559862C0389235F01A804BA /* tape.h */; };
- B61F45C409121DF100C8096C /* timer.h in Headers */ = {isa = PBXBuildFile; fileRef = F55986360389237101A804BA /* timer.h */; };
B61F45C509121DF100C8096C /* FuseController.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F876370399540D011FA3A4 /* FuseController.h */; };
B61F45C609121DF100C8096C /* TapeBrowserController.h in Headers */ = {isa = PBXBuildFile; fileRef = F59B558F039FD8F901A804BA /* TapeBrowserController.h */; };
B61F45C709121DF100C8096C /* KeyboardController.h in Headers */ = {isa = PBXBuildFile; fileRef = F56B6A5E03A6273801CA65B5 /* KeyboardController.h */; };
@@ -170,7 +169,6 @@
B61F464A09121DF100C8096C /* spectrum.c in Sources */ = {isa = PBXBuildFile; fileRef = F55986170389234A01A804BA /* spectrum.c */; };
B61F464B09121DF100C8096C /* tape.c in Sources */ = {isa = PBXBuildFile; fileRef = F559862B0389235F01A804BA /* tape.c */; };
B61F464C09121DF100C8096C /* tc2048.c in Sources */ = {isa = PBXBuildFile; fileRef = F559862D0389235F01A804BA /* tc2048.c */; };
- B61F464D09121DF100C8096C /* timer.c in Sources */ = {isa = PBXBuildFile; fileRef = F55986350389237101A804BA /* timer.c */; };
B61F464E09121DF100C8096C /* ui.c in Sources */ = {isa = PBXBuildFile; fileRef = F559863B0389238101A804BA /* ui.c */; };
B61F464F09121DF100C8096C /* uidisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = F559863C0389238101A804BA /* uidisplay.c */; };
B61F465109121DF100C8096C /* FuseController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5F876380399540D011FA3A4 /* FuseController.m */; };
@@ -239,6 +237,11 @@
B61F46A209121DF100C8096C /* libbz2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6202BD105BD43D800A1EA8F /* libbz2.framework */; };
B61F46A409121DF100C8096C /* FuseImporter.mdimporter in CopyFiles */ = {isa = PBXBuildFile; fileRef = B64FEA96084F8EC300879389 /* FuseImporter.mdimporter */; };
B6251C3E0C2EB24500BD5543 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6251C3D0C2EB24500BD5543 /* QuartzCore.framework */; };
+ B63225EC0C66BA1300BB081B /* osname.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225EB0C66BA1300BB081B /* osname.c */; };
+ B63225EE0C66BA3700BB081B /* paths.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225ED0C66BA3700BB081B /* paths.c */; };
+ B63225F50C66BA7400BB081B /* timer.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225F20C66BA7400BB081B /* timer.c */; };
+ B63225F60C66BA7400BB081B /* timer.h in Headers */ = {isa = PBXBuildFile; fileRef = B63225F30C66BA7400BB081B /* timer.h */; };
+ B63225F70C66BA7400BB081B /* unix.c in Sources */ = {isa = PBXBuildFile; fileRef = B63225F40C66BA7400BB081B /* unix.c */; };
B639B7680A6BAFCF00927E24 /* csw.icns in Resources */ = {isa = PBXBuildFile; fileRef = B639B7670A6BAFCF00927E24 /* csw.icns */; };
B639B7D10A6BB45600927E24 /* raw.icns in Resources */ = {isa = PBXBuildFile; fileRef = B639B7D00A6BB45600927E24 /* raw.icns */; };
B6403FD80A7E4B1A00E00B11 /* loader.c in Sources */ = {isa = PBXBuildFile; fileRef = B6403FD60A7E4B1A00E00B11 /* loader.c */; };
@@ -398,6 +401,11 @@
B62F3BB4059F5B5900A7009A /* PokeFinder.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = PokeFinder.nib; path = nibs/PokeFinder.nib; sourceTree = "<group>"; };
B62F3BCE059F5BF300A7009A /* PokeFinderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PokeFinderController.h; path = controllers/PokeFinderController.h; sourceTree = "<group>"; };
B62F3BCF059F5BF300A7009A /* PokeFinderController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PokeFinderController.m; path = controllers/PokeFinderController.m; sourceTree = "<group>"; };
+ B63225EB0C66BA1300BB081B /* osname.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = osname.c; sourceTree = "<group>"; };
+ B63225ED0C66BA3700BB081B /* paths.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = paths.c; sourceTree = "<group>"; };
+ B63225F20C66BA7400BB081B /* timer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = timer.c; sourceTree = "<group>"; };
+ B63225F30C66BA7400BB081B /* timer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = timer.h; sourceTree = "<group>"; };
+ B63225F40C66BA7400BB081B /* unix.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = unix.c; sourceTree = "<group>"; };
B632C6AE03E5368700A864FD /* DebuggerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerController.h; path = controllers/DebuggerController.h; sourceTree = "<group>"; };
B632C6AF03E5368700A864FD /* DebuggerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerController.m; path = controllers/DebuggerController.m; sourceTree = "<group>"; };
B6379299060AA0D300246736 /* se-0.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "se-0.rom"; path = "../roms/se-0.rom"; sourceTree = SOURCE_ROOT; };
@@ -661,8 +669,6 @@
F559862B0389235F01A804BA /* tape.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = tape.c; path = ../tape.c; sourceTree = SOURCE_ROOT; };
F559862C0389235F01A804BA /* tape.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = tape.h; path = ../tape.h; sourceTree = SOURCE_ROOT; };
F559862D0389235F01A804BA /* tc2048.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = tc2048.c; path = ../machines/tc2048.c; sourceTree = SOURCE_ROOT; };
- F55986350389237101A804BA /* timer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = timer.c; path = ../timer.c; sourceTree = SOURCE_ROOT; };
- F55986360389237101A804BA /* ...
[truncated message content] |
