puae 2.3.1

src/Makefile.am

+QT_INCPATH = $(shell qmake -query QT_INSTALL_HEADERS)
+
 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)
+AM_CPPFLAGS += -I$(QT_INCPATH) -I$(QT_INCPATH)/QtCore -I$(QT_INCPATH)/QtGui -I/usr/local/Qt4.7/mkspecs/macx-xcode 
+AM_CPPFLAGS += -I/Library/Frameworks/QtCore.framework/Versions/4/Headers -I/Library/Frameworks/QtGui.framework/Versions/4/Headers 
+AM_CPPFLAGS += -I/System/Library/Frameworks/CarbonCore.framework/Headers -F/Library/Frameworks
+DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+LIBS = -L/usr/lib -lQtGui -lQtCore -lpthread
+
 
 SUBDIRS = \
 	tools @MACHDEP@ @THREADDEP@ @GFX_DEP@ @SND_DEP@ @JOY_DEP@ @GUI_DEP@ \

src/gui-qt/Makefile.am

+#UNAME = $(shell uname)
 QT_INCPATH = $(shell qmake -query QT_INSTALL_HEADERS)
 MOC = $(shell which moc)
 UIC = $(shell which uic)
 RCC = $(shell which rcc)
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir) -I$(QT_INCPATH) -I$(QT_INCPATH)/QtCore -I$(QT_INCPATH)/QtGui
+#
+#ifeq ($(OS),Darwin)
+INCLUDES  = -I$(top_srcdir)/src/include -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)
+INCLUDES += -I$(QT_INCPATH) -I$(QT_INCPATH)/QtCore -I$(QT_INCPATH)/QtGui -I/usr/local/Qt4.7/mkspecs/macx-xcode 
+INCLUDES += -I/Library/Frameworks/QtCore.framework/Versions/4/Headers -I/Library/Frameworks/QtGui.framework/Versions/4/Headers
+INCLUDES += -I/System/Library/Frameworks/CarbonCore.framework/Headers -F/Library/Frameworks
 DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
 LIBS = -L/usr/lib -lQtGui -lQtCore -lpthread 
 
@@ -14,11 +20,11 @@ AR_FLAGS	= $(LIBS)
 
 noinst_LIBRARIES = libguidep.a
 
-libguidep_a_SOURCES = puae_mainwindow.cpp moc_puae_mainwindow.cpp
+libguidep_a_SOURCES = puae_mainwindow.cpp moc_puae_mainwindow.cpp puae_bridge.cpp moc_puae_bridge.cpp
 
-noinst_HEADERS = puae_mainwindow.h ui_puae_mainwindow.h
+noinst_HEADERS = puae_mainwindow.h puae_bridge.h ui_puae_mainwindow.h
 
-BUILT_SOURCES = moc_puae_mainwindow.cpp ui_puae_mainwindow.h
+BUILT_SOURCES = moc_puae_mainwindow.cpp moc_puae_bridge.cpp ui_puae_mainwindow.h
 
 CLEANFILES = *.o qrc*.* ui*.* moc*.*
 

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>
 
+extern "C" {
+#include "include/options.h"
 struct uae_prefs workprefs;
+}
+
 
 // Paths Tab
 QString PATHS_ROM, PATHS_CONFIG, PATHS_SCREENSHOT, PATHS_SAVESTATE, PATHS_AVIOUTPUT, PATHS_SAVEIMAGE, PATHS_RIP;
@@ -909,60 +910,3 @@ 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

@@ -18,7 +18,7 @@ public:
     explicit puae_MainWindow(QWidget *parent = 0);
     ~puae_MainWindow();
 
-private:
+//private:
     Ui::puae_MainWindow *ui;
 
 private slots: