puae 2.3.1

configure.in

@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Written 1996, 1997, 1998 Bernd Schmidt
 dnl
 dnl Updated, re-written and generally mauled 2003 Richard Drummond
-dnl Updated and generally mauled 2008 Mustafa Tufan
+dnl Updated and generally mauled             2008-2010 Mustafa Tufan
 dnl
 
 AC_PREREQ(2.55)
@@ -950,16 +950,18 @@ if [[ "x$WANT_NCURSES" = "xyes" ]]; then
  fi
 fi
 
-dnl Qt graphics
-if [[ "x$WANT_QT" = "xyes" ]]; then
- if [[ "x$HAVE_QT" = "xyes" ]]; then
-  GFX_DEP=gfx-qt
-  GFX_NAME=QT
-  GFX_LIBS=
-  GFX_CFLAGS=
-  GFX_CPPFLAGS=
- fi
-fi
+dnl
+dnl QT graphics
+dnl
+dnl if [[ "x$WANT_QT" = "xyes" ]]; then
+dnl if [[ "x$HAVE_QT" = "xyes" ]]; then
+dnl  GFX_DEP=gfx-qt
+dnl  GFX_NAME=QT
+dnl  GFX_LIBS=
+dnl  GFX_CFLAGS=
+dnl  GFX_CPPFLAGS=
+dnl fi
+dnl fi
 
 dnl  Check whether we actually wanted to use SDL or whether
 dnl  we need to use SDL because we couldn't find any other
@@ -1176,9 +1178,22 @@ if [[ "x$WANT_UI" = "xno" ]]; then
   GUI_DEP=gui-none
   GUI_LIBS=
   GUI_NAME=none
-else
- dnl 
- dnl
+fi
+
+  dnl Hack for building Cocoa gui on OS X
+  dnl We really should reall check for the presence of objc and Cocoa first
+  if [[ "$HOST_OS" = "darwin" ]]; then
+    if [[ "x$WANT_COCOA_UI" != "xno" -o "x$HAVE_GTK" = "xno" ]]; then
+      GUI_DEP=gui-cocoa
+      GUI_CFLAGS="$CFLAGS -DNO_MAIN_IN_MAIN_C"
+      GUI_LIBS="-framework Cocoa"
+      GUI_NAME="Cocoa"
+    fi
+  fi
+
+dnl 
+dnl QT GUI
+dnl
  if [[ "x$WANT_QT" = "xyes" ]]; then
   if [[ "x$HAVE_QT" = "xyes" ]]; then
       GUI_DEP=gui-qt
@@ -1193,16 +1208,6 @@ else
   fi
  fi
 
-  dnl Hack for building Cocoa gui on OS X
-  dnl We really should reall check for the presence of objc and Cocoa first
-  if [[ "$HOST_OS" = "darwin" ]]; then
-    if [[ "x$WANT_COCOA_UI" != "xno" -o "x$HAVE_GTK" = "xno" ]]; then
-      GUI_DEP=gui-cocoa
-      GUI_CFLAGS="$CFLAGS -DNO_MAIN_IN_MAIN_C"
-      GUI_LIBS="-framework Cocoa"
-      GUI_NAME="Cocoa"
-    fi
-  fi
   if [[ "$GUI_DEP" = "gui-none" ]]; then
     if [[ "x$HAVE_GTK" = "xno" ]]; then
       AC_MSG_WARN([UI wanted, but no UI useable target found])
@@ -1219,7 +1224,7 @@ else
       fi
     fi
   fi
-fi
+
 AC_MSG_RESULT("$GUI_NAME")
 
 
@@ -1693,7 +1698,11 @@ dnl
 AC_MSG_CHECKING([want floppy drive sound emulation])
 if [[ "x$WANT_DRVSND" != "xno" ]]; then
   AC_MSG_RESULT(yes)
+if [[ "x$SND_NAME" != "xnone" ]]; then
   UAE_DEFINES="$UAE_DEFINES -DDRIVESOUND"
+else
+ AC_MSG_NOTICE([No (No Sound Emulation)])
+fi
 else
   AC_MSG_RESULT(no)
 fi
@@ -1711,10 +1720,10 @@ UAE_DEFINES="$UAE_DEFINES -DCPU_64_BIT -D__x86_64__"
 fi
 AC_MSG_RESULT([$is_64bit])
 
-dnl
-dnl Do we want CPU Specific Optimizations
-dnl //mtufan
-dnl
+dnl -----------------------------------------------
+dnl Do we want CPU Specific Optimizations?
+dnl mtufan
+dnl -----------------------------------------------
 AC_MSG_CHECKING([whether to use CPU Specific GCC Optimizations])
 if [[ "x$WANT_OPT" == "xyes" ]]; then
   AC_MSG_RESULT(yes)

src/Makefile.am

 AM_CFLAGS = @UAE_CFLAGS@
 AM_CPPFLAGS = @UAE_CPPFLAGS@
 AM_CPPFLAGS += -I$(top_srcdir)/src/include -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)
-LIBS = -L/usr/lib -lpthread
-
+LIBS = -L/usr/lib -lpthread -lstdc++
 if IS_QT
 QT_INCPATH = $(shell qmake -query QT_INSTALL_HEADERS)
 QT_INSPATH = $(shell qmake -query QT_INSTALL_DATA)
+QT_INSLIBS = $(shell qmake -query QT_INSTALL_LIBS)
 AM_CPPFLAGS += -I$(QT_INCPATH) -I$(QT_INCPATH)/QtCore -I$(QT_INCPATH)/QtGui
 AM_CPPFLAGS += -I$(QT_INSPATH)/mkspecs/default
 if BUILD_MACOSX_BUNDLE
-AM_CPPFLAGS += -I/usr/local/Qt4.7/mkspecs/macx-xcode
+AM_CPPFLAGS += -I$(QT_INSPATH)/mkspecs/macx-xcode -I$(QT_INSPATH)/mkspecs/macx-g++
 AM_CPPFLAGS += -I/System/Library/Frameworks/CarbonCore.framework/Headers
-AM_CPPFLAGS += -F/Library/Frameworks
-AM_CPPFLAGS += -I/Library/Frameworks/QtCore.framework/Versions/4/Headers
-AM_CPPFLAGS += -I/Library/Frameworks/QtGui.framework/Versions/4/Headers
+AM_CPPFLAGS += -F$(QT_INSLIBS)
+AM_CPPFLAGS += -I$(QT_INSLIBS)/QtCore.framework/Versions/4/Headers
+AM_CPPFLAGS += -I$(QT_INSLIBS)/QtGui.framework/Versions/4/Headers
+LIBS += -F$(QT_INSLIBS) -L$(QT_INSLIBS) -framework QtGui -framework QtCore 
 else
 LIBS += -lQtGui -lQtCore
 endif

src/cfgfile.c

@@ -1348,9 +1348,10 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
 		|| cfgfile_intval (option, value, "floppy1sound", &p->floppyslots[1].dfxclick, 1)
 		|| cfgfile_intval (option, value, "floppy2sound", &p->floppyslots[2].dfxclick, 1)
 		|| cfgfile_intval (option, value, "floppy3sound", &p->floppyslots[3].dfxclick, 1)
-#endif
 		|| cfgfile_intval (option, value, "floppy_channel_mask", &p->dfxclickchannelmask, 1)
-		|| cfgfile_intval (option, value, "floppy_volume", &p->dfxclickvolume, 1))
+		|| cfgfile_intval (option, value, "floppy_volume", &p->dfxclickvolume, 1)
+#endif
+		)
 		return 1;
 
 	if (

src/gui-qt/puae_bridge.cpp

@@ -36,6 +36,13 @@ void MyThread::run()
 }
 */
 
+/* This function is called from od-macosx/main.m
+ * WARNING: This gets called *before* real_main(...)!
+ */
+extern "C" void cocoa_gui_early_setup (void)
+{
+}
+
 int gui_init (void)
 {
 //  MyThread *QT_GUI_Thread=new MyThread;
@@ -55,12 +62,18 @@ int gui_update (void)
 
 void gui_display (int shortcut)
 {
+	int foo;
+
 	if (shortcut == -1) {
-		QApplication *pApp = new QApplication(NULL,NULL);
-		puae_MainWindow wptr;
+	int argc;
+	char *argv[0];
+	argc = NULL;
+	*argv = NULL;
+		QApplication myApp(argc,argv);
+		puae_MainWindow w;
 
-		wptr.show();
-		pApp->exec();
+		w.show();
+		foo = myApp.exec();
 	}
 }
 

src/jd-none/joystick.c

@@ -90,7 +90,7 @@ struct inputdevice_functions inputdevicefunc_joystick = {
 /*
  * Set default inputdevice config for SDL joysticks
  */
-int input_get_default_joystick (struct uae_input_device *uid, int num, int port, int cd32)
+int input_get_default_joystick (struct uae_input_device *uid, int i, int port, int af, int mode)
 {
     uid[0].enabled = 0;
 	return 0;

src/sd-none/sound.c

@@ -69,3 +69,8 @@ void master_sound_volume (int dir)
 void sound_mute (int newmute)
 {
 }
+
+void restart_sound_buffer (void)
+{
+}
+

src/sd-none/sound.h

@@ -7,6 +7,7 @@
   */
 
 #define SOUNDSTUFF 1
+extern void restart_sound_buffer (void);
 
 STATIC_INLINE void check_sound_buffers (void)
 {
@@ -20,18 +21,25 @@ STATIC_INLINE void set_sound_buffers (void)
 #define PUT_SOUND_WORD(b) do { ; } while (0)
 #define PUT_SOUND_BYTE_LEFT(b) PUT_SOUND_BYTE(b)
 #define PUT_SOUND_WORD_LEFT(b) PUT_SOUND_WORD(b)
+#define PUT_SOUND_WORD_LEFT2(b) PUT_SOUND_WORD(b)
 #define PUT_SOUND_BYTE_RIGHT(b) PUT_SOUND_BYTE(b)
 #define PUT_SOUND_WORD_RIGHT(b) PUT_SOUND_WORD(b)
+#define PUT_SOUND_WORD_RIGHT2(b) PUT_SOUND_WORD(b)
 #define PUT_SOUND_WORD_MONO(b) PUT_SOUND_WORD_LEFT(b)
 
 #define SOUND16_BASE_VAL 0
 #define SOUND8_BASE_VAL 0
 
+#define DEFAULT_SOUND_MAXB 16384
+#define DEFAULT_SOUND_MINB 16384
 #define DEFAULT_SOUND_BITS 16
 #define DEFAULT_SOUND_FREQ 44100
-#define DEFAULT_SOUND_LATENCY 100
+#define HAVE_STEREO_SUPPORT
+                        
+#define FILTER_SOUND_OFF 0
+#define FILTER_SOUND_EMUL 1
+#define FILTER_SOUND_ON 2
+
+#define FILTER_SOUND_TYPE_A500 0
+#define FILTER_SOUND_TYPE_A1200 1
 
-#define UNSUPPORTED_OPTION_B
-#define UNSUPPORTED_OPTION_R
-#define UNSUPPORTED_OPTION_b
-#define UNSUPPORTED_OPTION_S