puae 2.3.1

bronx_.sh

@@ -4,7 +4,7 @@
 #
 # this is the main script to build (and test) PUAE
 #
-base=" --with-sdl --with-sdl-gl --with-sdl-gfx --with-sdl-sound --enable-drvsnd "
+base=" --with-sdl --with-sdl-gl --with-sdl-gfx --with-sdl-sound --enable-drvsnd --with-qt "
 cd32=" --enable-cd32 "
 a600=" --enable-gayle "
 scsi=" --enable-scsi-device --enable-ncr --enable-a2091 "

build_macos_xcode.sh

 # P-UAE
 #
-# 2010 Mustafa TUFAN
+# 2010 Mustafa TUFAN (aka GnoStiC/BRONX)
+#
+#
+#
+base=" --with-sdl --with-sdl-gl --with-sdl-gfx --with-sdl-sound --enable-drvsnd "
+cd32=" --enable-cd32 "
+a600=" --enable-gayle "
+scsi=" --enable-scsi-device --enable-ncr --enable-a2091 "
+other=" --with-caps --enable-amax "
+#
 #
-
 ./bootstrap.sh
-./configure --with-sdl --with-sdl-gl --with-sdl-gfx --with-sdl-sound --with-caps --enable-drvsnd --enable-amax --enable-cd32 --enable-scsi-device --enable-a2091 --enable-gayle --enable-ncr --target=i586 CFLAGS="-m32" LDFLAGS="-m32" CPPFLAGS="-m32"
+./configure $base $cd32 $a600 $scsi $other --target=i586 CFLAGS="-m32" LDFLAGS="-m32" CPPFLAGS="-m32"
 make clean
 make

configure.in

@@ -67,23 +67,72 @@ dnl
 dnl Check if Qt 4 is installed
 dnl
 HAVE_QT=no
-AC_MSG_CHECKING(QT version via qmake-qt4)
+AC_MSG_CHECKING(QT version via qmake)
 if test -z "$QMAKE"; then
 dnl AC_MSG_NOTICE([QMAKE env not set, we'll try to find it on our own])
-QMAKE=`which qmake-qt4`
+QMAKE=`which qmake`
 if test -z "$QMAKE"; then
-AC_MSG_NOTICE([Can't find qmake-qt4])
+AC_MSG_NOTICE([Can't find qmake])
 else
 HAVE_QT=yes
-qmake_version=`$QMAKE -v 2>&1 | awk '/Using Qt version/ { print $4;}'`
+qmake_version=`$QMAKE -query QT_VERSION 2>&1`
 AC_MSG_RESULT( $qmake_version )
 fi
 else
 HAVE_QT=yes
-qmake_version=`$QMAKE -v 2>&1 | awk '/Using Qt version/ { print $4;}'`
+qmake_version=`$QMAKE -query QT_VERSION 2>&1`
 AC_MSG_RESULT( $qmake_version )
 fi
 
+dnl
+dnl if QT
+dnl
+if [[ "x$HAVE_QT" = "xyes" ]]; then
+
+AC_MSG_CHECKING(QT: Meta Object Compiler)
+if test -z "$QT_MOC"; then
+dnl AC_MSG_NOTICE([QT_MOC env not set, we'll try to find it on our own])
+QT_MOC=`which moc`
+if test -z "$QT_MOC"; then
+AC_MSG_NOTICE([Can't find moc])
+else
+AC_MSG_RESULT( $QT_MOC )
+fi
+fi
+
+AC_MSG_CHECKING(QT: User Interface Compiler)
+if test -z "$QT_UIC"; then
+dnl AC_MSG_NOTICE([QT_UIC env not set, we'll try to find it on our own])
+QT_UIC=`which uic`
+if test -z "$QT_UIC"; then
+AC_MSG_NOTICE([Can't find uic])
+else
+AC_MSG_RESULT( $QT_UIC )
+fi
+fi
+
+AC_MSG_CHECKING(QT: Resource Compiler)
+if test -z "$QT_RCC"; then
+dnl AC_MSG_NOTICE([QT_RCC env not set, we'll try to find it on our own])
+QT_RCC=`which rcc`
+if test -z "$QT_RCC"; then
+AC_MSG_NOTICE([Can't find rcc])
+else
+AC_MSG_RESULT( $QT_RCC )
+fi
+fi
+
+dnl
+dnl
+AC_MSG_CHECKING(QT HEADERS via qmake)
+QT_INSTALL_HEADERS=`$QMAKE -query QT_INSTALL_HEADERS 2>&1`
+AC_MSG_RESULT( $QT_INSTALL_HEADERS )
+
+AC_MSG_CHECKING(QT LIBS via qmake)
+QT_INSTALL_LIBS=`$QMAKE -query QT_INSTALL_LIBS 2>&1`
+AC_MSG_RESULT( $QT_INSTALL_LIBS )
+
+fi
 
 dnl
 dnl  Checks for header files.
@@ -1278,7 +1327,7 @@ if [[ "x$WANT_SCSIEMU" = "xyes" ]]; then
       UAE_DEFINES="$UAE_DEFINES -DSCSIEMU"
 if [[ "x$WANT_A2091" = "xyes" ]]; then
       UAE_DEFINES="$UAE_DEFINES -DA2091"
-      SCSIOBJS='$SCSIOBJS a2091.$(OBJEXT)'
+      SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)'
 fi
       NEED_THREAD_SUPPORT=yes
     else
@@ -1316,7 +1365,7 @@ typedef int BOOL;
       UAE_DEFINES="$UAE_DEFINES -DSCSIEMU"
 if [[ "x$WANT_A2091" = "xyes" ]]; then
       UAE_DEFINES="$UAE_DEFINES -DA2091"
-      SCSIOBJS='$SCSIOBJS a2091.$(OBJEXT)'
+      SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)'
 fi
       UAE_CPPFLAGS="$UAE_CPPFLAGS $LIBSCG_CPPFLAGS"
       UAE_LIBS="$LIBSCG_LIBS $UAE_LIBS"
@@ -1341,7 +1390,7 @@ typedef int BOOL;
         UAE_DEFINES="$UAE_DEFINES -DSCSIEMU"
 if [[ "x$WANT_A2091" = "xyes" ]]; then
 	UAE_DEFINES="$UAE_DEFINES -DA2091"
-	SCSIOBJS='$SCSIOBJS a2091.$(OBJEXT)'
+	SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) blkdev-libscg.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)'
 fi
         NEED_THREAD_SUPPORT=yes
         if [[ "$srcdir" != "." ]]; then
@@ -1367,7 +1416,7 @@ fi
 	   UAE_DEFINES="$UAE_DEFINES -DSCSIEMU -DSCSIEMU_LINUX_IOCTL"
 if [[ "x$WANT_A2091" = "xyes" ]]; then
 	UAE_DEFINES="$UAE_DEFINES -DA2091"
-	SCSIOBJS='$SCSIOBJS a2091.$(OBJEXT)'
+	SCSIOBJS='scsiemul.$(OBJEXT) blkdev.$(OBJEXT) scsi.$(OBJEXT) a2091.$(OBJEXT)'
 fi
 	   NEED_THREAD_SUPPORT=yes
 	],
@@ -1829,6 +1878,7 @@ AC_CONFIG_FILES([Makefile
 		 src/gui-cocoa/Makefile
 		 src/gui-gtk/Makefile
 		 src/gui-muirexx/Makefile
+		 src/gui-qt/Makefile
 		 src/keymap/Makefile
 		 src/test/Makefile
 ])

src/gui-qt/main.cpp

-#include <QtGui/QApplication>
-#include "puae_mainwindow.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication a(argc, argv);
-    puae_MainWindow w;
-    w.show();
-
-    return a.exec();
-}
-

src/gui-qt/puae_mainwindow.cpp

 #include "puae_mainwindow.h"
 #include "ui_puae_mainwindow.h"
 
+#include "gui.h"
+#include "options.h"
+
 #include <QMessageBox>
 #include <QDir>
 #include <QFileDialog>
@@ -906,3 +909,60 @@ void puae_MainWindow::enable_for_memorydlg ()
     ui->IDC_RTG_SCALE_ASPECTRATIO->setEnabled(rtg2);
     ui->IDC_RTG_VBLANKRATE->setEnabled(rtg2);
 }
+
+/*
+ * 
+ * 
+ */
+
+int gui_init (void)
+{
+}
+
+void gui_exit (void)
+{
+}
+
+int gui_update (void)
+{
+}
+
+void gui_display (int shortcut)
+{
+}
+
+void gui_message (const char *format,...)
+{
+}
+
+void gui_fps (int fps, int idle)
+{
+}
+
+void gui_handle_events (void)
+{
+}
+
+void gui_led (int num, int on)
+{
+}
+
+void gui_flicker_led (int led, int unitnum, int status)
+{
+}
+
+void gui_gameport_axis_change (int port, int axis, int state, int max)
+{
+}
+
+void gui_gameport_button_change (int port, int button, int onoff)
+{
+}
+
+void gui_disk_image_change (int unitnum, const TCHAR *name, bool writeprotected)
+{
+}
+
+void gui_filename (int num, const char *name)
+{
+}

src/gui-qt/puae_mainwindow.h

 #ifndef PUAE_MAINWINDOW_H
 #define PUAE_MAINWINDOW_H
 
+#include <stdio.h>
 #include <QMainWindow>
 
 namespace Ui {
@@ -121,342 +122,18 @@ private slots:
     void enable_for_memorydlg ();
 };
 
-// ************************************************
-// for now
-// REMOVEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-// ************************************************
+#define TCHAR char
 
-struct uae_prefs {
+typedef unsigned char  uae_u8;
+typedef signed char    uae_s8;
 
-char description[256];
-char info[256];
-int config_version;
-char config_hardware_path[100];
-char config_host_path[100];
+typedef unsigned int   uae_u16;
+typedef int            uae_s16;
 
-bool illegal_mem;
-bool use_serial;
-bool serial_demand;
-bool serial_hwctsrts;
-bool serial_direct;
-bool parallel_demand;
-int parallel_matrix_emulation;
-bool parallel_postscript_emulation;
-bool parallel_postscript_detection;
-int parallel_autoflush_time;
-char ghostscript_parameters[256];
-bool use_gfxlib;
-bool socket_emu;
-
-#ifdef DEBUGGER
-bool start_debugger;
-#endif
-bool start_gui;
-
-int produce_sound;
-int sound_stereo;
-int sound_stereo_separation;
-int sound_mixed_stereo_delay;
-int sound_freq;
-int sound_maxbsiz;
-int sound_latency;
-int sound_interpol;
-int sound_filter;
-int sound_filter_type;
-int sound_volume;
-bool sound_stereo_swap_paula;
-bool sound_stereo_swap_ahi;
-bool sound_auto;
-
-#ifdef JIT
-int comptrustbyte;
-int comptrustword;
-int comptrustlong;
-int comptrustnaddr;
-bool compnf;
-bool compfpu;
-bool comp_midopt;
-bool comp_lowopt;
-bool fpu_strict;
-
-bool comp_hardflush;
-bool comp_constjump;
-bool comp_oldsegv;
-
-int optcount[10];
-#endif
-int cachesize;
-bool avoid_cmov;
-
-int gfx_display;
-char gfx_display_name[256];
-int gfx_framerate, gfx_autoframerate;
-
-bool gfx_autoresolution;
-bool gfx_scandoubler;
-int gfx_refreshrate;
-int gfx_avsync, gfx_pvsync;
-int gfx_resolution;
-int gfx_vresolution;
-int gfx_lores_mode;
-int gfx_scanlines;
-int gfx_afullscreen, gfx_pfullscreen;
-int gfx_xcenter, gfx_ycenter;
-int gfx_xcenter_pos, gfx_ycenter_pos;
-int gfx_xcenter_size, gfx_ycenter_size;
-int gfx_max_horizontal, gfx_max_vertical;
-int gfx_saturation, gfx_luminance, gfx_contrast, gfx_gamma;
-bool gfx_blackerthanblack;
-int gfx_backbuffers;
-int gfx_api;
-int color_mode;
-int gfx_gl_x_offset; //koko
-int gfx_gl_y_offset; //koko
-int gfx_gl_smoothing; //koko
-int gfx_gl_panscan; //koko
-
-int gfx_filter;
-
-int gfx_filteroverlay_overscan;
-int gfx_filter_scanlines;
-int gfx_filter_scanlineratio;
-int gfx_filter_scanlinelevel;
-int gfx_filter_horiz_zoom, gfx_filter_vert_zoom;
-int gfx_filter_horiz_zoom_mult, gfx_filter_vert_zoom_mult;
-int gfx_filter_horiz_offset, gfx_filter_vert_offset;
-int gfx_filter_filtermode;
-int gfx_filter_bilinear;
-int gfx_filter_noise, gfx_filter_blur;
-int gfx_filter_saturation, gfx_filter_luminance, gfx_filter_contrast, gfx_filter_gamma;
-int gfx_filter_keep_aspect, gfx_filter_aspect;
-int gfx_filter_autoscale;
-
-bool immediate_blits;
-unsigned int chipset_mask;
-bool ntscmode;
-bool genlock;
-int chipset_refreshrate;
-int collision_level;
-int leds_on_screen;
-int keyboard_leds[3];
-bool keyboard_leds_in_use;
-int scsi;
-bool sana2;
-bool uaeserial;
-int catweasel;
-int catweasel_io;
-int cpu_idle;
-bool cpu_cycle_exact;
-int cpu_clock_multiplier;
-int cpu_frequency;
-bool blitter_cycle_exact;
-int floppy_speed;
-int floppy_write_length;
-int floppy_random_bits_min;
-int floppy_random_bits_max;
-bool tod_hack;
-unsigned long maprom;
-int turbo_emulation;
-bool headless;
-
-int cs_compatible;
-int cs_ciaatod;
-int cs_rtc;
-int cs_rtc_adjust;
-int cs_rtc_adjust_mode;
-bool cs_ksmirror_e0;
-bool cs_ksmirror_a8;
-bool cs_ciaoverlay;
-bool cs_cd32cd;
-bool cs_cd32c2p;
-bool cs_cd32nvram;
-bool cs_cdtvcd;
-bool cs_cdtvram;
-int cs_cdtvcard;
-int cs_ide;
-bool cs_pcmcia;
-bool cs_a1000ram;
-int cs_fatgaryrev;
-int cs_ramseyrev;
-int cs_agnusrev;
-int cs_deniserev;
-int cs_mbdmac;
-bool cs_cdtvscsi;
-bool cs_a2091, cs_a4091;
-bool cs_df0idhw;
-bool cs_slowmemisfast;
-bool cs_resetwarning;
-bool cs_denisenoehb;
-bool cs_dipagnus;
-bool cs_agnusbltbusybug;
-
-char romfile[100];
-char romident[256];
-char romextfile[100];
-char romextident[256];
-char keyfile[256];
-char flashfile[100];
-#ifdef ACTION_REPLAY
-char cartfile[100];
-char cartident[256];
-int cart_internal;
-#endif
-char pci_devices[256];
-char prtname[256];
-char sername[256];
-char amaxromfile[100];
-char a2065name[100];
-
-char quitstatefile[100];
-char statefile[100];
-#ifndef WIN32
-char scsi_device[256];
-#endif
-
-char path_floppy[256];
-char path_hardfile[256];
-char path_rom[256];
-char path_savestate[256];
-
-int m68k_speed;
-int cpu_model;
-int mmu_model;
-int cpu060_revision;
-int fpu_model;
-int fpu_revision;
-bool cpu_compatible;
-bool address_space_24;
-bool picasso96_nocustom;
-int picasso96_modeflags;
-
-#ifdef HAVE_MACHDEP_TIMER
-    int use_processor_clock;
-#endif
-
-unsigned long z3fastmem_size, z3fastmem2_size;
-unsigned long z3fastmem_start;
-unsigned long z3chipmem_size;
-unsigned long z3chipmem_start;
-unsigned long fastmem_size;
-unsigned long chipmem_size;
-unsigned long bogomem_size;
-unsigned long mbresmem_low_size;
-unsigned long mbresmem_high_size;
-unsigned long gfxmem_size;
-unsigned long custom_memory_addrs[10];
-unsigned long custom_memory_sizes[10];
-
-bool kickshifter;
-bool filesys_no_uaefsdb;
-bool filesys_custom_uaefsdb;
-bool mmkeyboard;
-int uae_hide;
-
-int nr_floppies;
-
-char dfxlist[10][100];
-#ifdef DRIVESOUND
-int dfxclickvolume;
-int dfxclickchannelmask;
-#endif
-
-int hide_cursor; /* Whether to hide host WM cursor or not */
-
-/* Target specific options */
-#ifdef USE_X11_GFX
-int x11_use_low_bandwidth;
-int x11_use_mitshm;
-int x11_use_dgamode;
-int x11_hide_cursor;
-#endif
-
-#ifdef USE_SVGALIB_GFX
-int svga_no_linear;
-#endif
-
-#ifdef _WIN32
-bool win32_middle_mouse;
-bool win32_logfile;
-bool win32_notaskbarbutton;
-bool win32_alwaysontop;
-bool win32_powersavedisabled;
-bool win32_minimize_inactive;
-int win32_statusbar;
-
-int win32_active_priority;
-int win32_inactive_priority;
-bool win32_inactive_pause;
-bool win32_inactive_nosound;
-int win32_iconified_priority;
-bool win32_iconified_pause;
-bool win32_iconified_nosound;
-
-bool win32_rtgmatchdepth;
-bool win32_rtgscaleifsmall;
-bool win32_rtgallowscaling;
-int win32_rtgscaleaspectratio;
-bool win32_borderless;
-bool win32_ctrl_F11_is_quit;
-bool win32_automount_removable;
-bool win32_automount_drives;
-bool win32_automount_cddrives;
-bool win32_automount_netdrives;
-bool win32_automount_removabledrives;
-int win32_midioutdev;
-int win32_midiindev;
-int win32_uaescsimode;
-int win32_soundcard;
-int win32_samplersoundcard;
-bool win32_soundexclusive;
-bool win32_norecyclebin;
-int win32_specialkey;
-int win32_guikey;
-int win32_kbledmode;
-char win32_commandpathstart[100];
-char win32_commandpathend[100];
-char win32_parjoyport0[100];
-char win32_parjoyport1[100];
-#endif
-int win32_rtgvblankrate;
-
-#ifdef USE_CURSES_GFX
-int curses_reverse_video;
-#endif
-
-#if defined USE_SDL_GFX || defined USE_X11_GFX
-int map_raw_keys;
-#endif
-int use_gl;
-
-#ifdef USE_AMIGA_GFX
-int amiga_screen_type;
-char amiga_publicscreen[256];
-int amiga_use_grey;
-int amiga_use_dither;
-#endif
-
-#ifdef SAVESTATE
-bool statecapture;
-int statecapturerate, statecapturebuffersize;
-#endif
-
-/* input */
-
-int input_selected_setting;
-int input_joymouse_multiplier;
-int input_joymouse_deadzone;
-int input_joystick_deadzone;
-int input_joymouse_speed;
-int input_analog_joystick_mult;
-int input_analog_joystick_offset;
-int input_autofire_linecnt;
-int input_mouse_speed;
-int input_tablet;
-bool input_magic_mouse;
-int input_magic_mouse_cursor;
-
-int dongle;
-};
+typedef unsigned long  uae_u32;
+typedef long           uae_s32;
 
+#define MAX_DPATH	512
+#define STATIC_INLINE static __inline__
 
 #endif // PUAE_MAINWINDOW_H