From 2f8cc85e5aa3024920d647d2ca44b35b84253e0d Mon Sep 17 00:00:00 2001
From: GnoStiC <mtufan@gmail.com>
Date: Tue, 7 Dec 2010 09:05:42 +0200
Subject: [PATCH] puae 2.3.1

---
 bronx_.sh                      |  2 +-
 configure.in                   | 11 +++++++++++
 src/Makefile.am                | 26 ++++++++++++++++++--------
 src/gui-qt/Makefile.am         | 25 +++++++++++++++----------
 src/gui-qt/puae_bridge.cpp     |  9 +++++++++
 src/gui-qt/puae_mainwindow.cpp | 10 ++++++++++
 6 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/bronx_.sh b/bronx_.sh
index aecc2ae..368831c 100755
--- a/bronx_.sh
+++ b/bronx_.sh
@@ -13,6 +13,6 @@ other=" --with-caps --enable-amax "
 #
 #
 ./bootstrap.sh
-./configure $base $cd32 $a600 $scsi $other
+./configure $base $wiqt $cd32 $a600 $scsi $other
 make clean
 make
diff --git a/configure.in b/configure.in
index af22c33..75b5896 100644
--- a/configure.in
+++ b/configure.in
@@ -134,6 +134,15 @@ AC_MSG_RESULT( $QT_INSTALL_LIBS )
 
 fi
 
+dnl
+dnl
+dnl
+if [[ "x$HAVE_QT" = "xno" ]]; then
+if [[ "x$WANT_QT" = "xyes" ]]; then
+WANT_QT=no
+fi
+fi
+
 dnl
 dnl  Checks for header files.
 dnl
@@ -1886,7 +1895,9 @@ AC_CONFIG_FILES([Makefile
 AM_CONDITIONAL(TARGET_BIGENDIAN, test x$ac_cv_c_bigendian = xyes)
 AM_CONDITIONAL(TARGET_BEOS,  test x$OSDEP = xod-beos)
 AM_CONDITIONAL(TARGET_WIN32, test x$OSDEP = xod-win32)
+AM_CONDITIONAL(TARGET_LINUX, test x$OSDEP = xod-linux)
 AM_CONDITIONAL(BUILD_MACOSX_BUNDLE, test x$OSDEP = xod-macosx)
+AM_CONDITIONAL(IS_QT, test x$WANT_QT = xyes)
 
 AC_SUBST(UAE_CFLAGS)
 AC_SUBST(UAE_CPPFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index b6ba894..5be55b4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,23 @@
-QT_INCPATH = $(shell qmake -query QT_INSTALL_HEADERS)
-
-AM_CFLAGS    = @UAE_CFLAGS@
-AM_CPPFLAGS  = @UAE_CPPFLAGS@
+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
+LIBS = -L/usr/lib -lpthread
+
+if IS_QT
+QT_INCPATH = $(shell qmake -query QT_INSTALL_HEADERS)
+QT_INSPATH = $(shell qmake -query QT_INSTALL_DATA)
+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/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
+endif
 DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-LIBS = -L/usr/lib -lQtGui -lQtCore -lpthread
+LIBS += -lQtGui -lQtCore
+endif
 
 
 SUBDIRS = \
diff --git a/src/gui-qt/Makefile.am b/src/gui-qt/Makefile.am
index eb3e1fe..16c716d 100644
--- a/src/gui-qt/Makefile.am
+++ b/src/gui-qt/Makefile.am
@@ -1,22 +1,27 @@
-#UNAME = $(shell uname)
 QT_INCPATH = $(shell qmake -query QT_INSTALL_HEADERS)
+QT_INSPATH = $(shell qmake -query QT_INSTALL_DATA)
 MOC = $(shell which moc)
 UIC = $(shell which uic)
 RCC = $(shell which rcc)
-#
-#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
+INCLUDES += -I$(QT_INCPATH) -I$(QT_INCPATH)/QtCore -I$(QT_INCPATH)/QtGui
+INCLUDES += -I$(QT_INSPATH)/mkspecs/default
+if BUILD_MACOSX_BUNDLE
+INCLUDES += -I/usr/local/Qt4.7/mkspecs/macx-xcode 
+INCLUDES += -I/System/Library/Frameworks/CarbonCore.framework/Headers
+INCLUDES += -F/Library/Frameworks
+INCLUDES += -I/Library/Frameworks/QtCore.framework/Versions/4/Headers
+INCLUDES += -I/Library/Frameworks/QtGui.framework/Versions/4/Headers
+endif
 DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
 LIBS = -L/usr/lib -lQtGui -lQtCore -lpthread 
 
-AM_CPPFLAGS  = @UAE_CPPFLAGS@
+AM_CPPFLAGS = @UAE_CPPFLAGS@
 AM_CPPFLAGS += -I$(top_srcdir)/src/include -I$(top_builddir)/src -I$(top_srcdir)/src
-AM_CFLAGS    = @UAE_CFLAGS@
-AM_CFLAGS   += @QT_CFLAGS@
-AR_FLAGS	= $(LIBS)
+AM_CFLAGS = @UAE_CFLAGS@
+AM_CFLAGS += @QT_CFLAGS@
+AR_FLAGS = $(LIBS)
 
 noinst_LIBRARIES = libguidep.a
 
diff --git a/src/gui-qt/puae_bridge.cpp b/src/gui-qt/puae_bridge.cpp
index 7ff3b51..d0b5bb2 100755
--- a/src/gui-qt/puae_bridge.cpp
+++ b/src/gui-qt/puae_bridge.cpp
@@ -1,3 +1,12 @@
+/*
+ * PUAE - The *nix Amiga Emulator
+ *
+ * QT GUI for PUAE
+ *
+ * Copyright 2010 Mustafa 'GnoStiC' TUFAN
+ *
+ */
+
 #include <QtGui/QApplication>
 #include <QThread>
 #include "puae_bridge.h"
diff --git a/src/gui-qt/puae_mainwindow.cpp b/src/gui-qt/puae_mainwindow.cpp
index ee866d1..0cb89fe 100755
--- a/src/gui-qt/puae_mainwindow.cpp
+++ b/src/gui-qt/puae_mainwindow.cpp
@@ -1,3 +1,13 @@
+/*
+ * PUAE - The *nix Amiga Emulator
+ *
+ * QT GUI for PUAE
+ *
+ * Copyright 2010 Mustafa 'GnoStiC' TUFAN
+ * (GUI layout cloned from WinUAE/Toni Wilen)
+ *
+ */
+
 #include "puae_mainwindow.h"
 #include "ui_puae_mainwindow.h"