mirror of
https://github.com/libretro/PUAE.git
synced 2024-11-24 00:09:54 +00:00
puae 2.3.1
This commit is contained in:
parent
a5813573b2
commit
2f8cc85e5a
@ -13,6 +13,6 @@ other=" --with-caps --enable-amax "
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
./bootstrap.sh
|
./bootstrap.sh
|
||||||
./configure $base $cd32 $a600 $scsi $other
|
./configure $base $wiqt $cd32 $a600 $scsi $other
|
||||||
make clean
|
make clean
|
||||||
make
|
make
|
||||||
|
11
configure.in
11
configure.in
@ -134,6 +134,15 @@ AC_MSG_RESULT( $QT_INSTALL_LIBS )
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
dnl
|
||||||
|
if [[ "x$HAVE_QT" = "xno" ]]; then
|
||||||
|
if [[ "x$WANT_QT" = "xyes" ]]; then
|
||||||
|
WANT_QT=no
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Checks for header files.
|
dnl Checks for header files.
|
||||||
dnl
|
dnl
|
||||||
@ -1886,7 +1895,9 @@ AC_CONFIG_FILES([Makefile
|
|||||||
AM_CONDITIONAL(TARGET_BIGENDIAN, test x$ac_cv_c_bigendian = xyes)
|
AM_CONDITIONAL(TARGET_BIGENDIAN, test x$ac_cv_c_bigendian = xyes)
|
||||||
AM_CONDITIONAL(TARGET_BEOS, test x$OSDEP = xod-beos)
|
AM_CONDITIONAL(TARGET_BEOS, test x$OSDEP = xod-beos)
|
||||||
AM_CONDITIONAL(TARGET_WIN32, test x$OSDEP = xod-win32)
|
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(BUILD_MACOSX_BUNDLE, test x$OSDEP = xod-macosx)
|
||||||
|
AM_CONDITIONAL(IS_QT, test x$WANT_QT = xyes)
|
||||||
|
|
||||||
AC_SUBST(UAE_CFLAGS)
|
AC_SUBST(UAE_CFLAGS)
|
||||||
AC_SUBST(UAE_CPPFLAGS)
|
AC_SUBST(UAE_CPPFLAGS)
|
||||||
|
@ -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$(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
|
LIBS = -L/usr/lib -lpthread
|
||||||
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
|
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
|
DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
|
||||||
LIBS = -L/usr/lib -lQtGui -lQtCore -lpthread
|
LIBS += -lQtGui -lQtCore
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
|
@ -1,22 +1,27 @@
|
|||||||
#UNAME = $(shell uname)
|
|
||||||
QT_INCPATH = $(shell qmake -query QT_INSTALL_HEADERS)
|
QT_INCPATH = $(shell qmake -query QT_INSTALL_HEADERS)
|
||||||
|
QT_INSPATH = $(shell qmake -query QT_INSTALL_DATA)
|
||||||
MOC = $(shell which moc)
|
MOC = $(shell which moc)
|
||||||
UIC = $(shell which uic)
|
UIC = $(shell which uic)
|
||||||
RCC = $(shell which rcc)
|
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$(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$(QT_INCPATH) -I$(QT_INCPATH)/QtCore -I$(QT_INCPATH)/QtGui
|
||||||
INCLUDES += -I/Library/Frameworks/QtCore.framework/Versions/4/Headers -I/Library/Frameworks/QtGui.framework/Versions/4/Headers
|
INCLUDES += -I$(QT_INSPATH)/mkspecs/default
|
||||||
INCLUDES += -I/System/Library/Frameworks/CarbonCore.framework/Headers -F/Library/Frameworks
|
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
|
DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
|
||||||
LIBS = -L/usr/lib -lQtGui -lQtCore -lpthread
|
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_CPPFLAGS += -I$(top_srcdir)/src/include -I$(top_builddir)/src -I$(top_srcdir)/src
|
||||||
AM_CFLAGS = @UAE_CFLAGS@
|
AM_CFLAGS = @UAE_CFLAGS@
|
||||||
AM_CFLAGS += @QT_CFLAGS@
|
AM_CFLAGS += @QT_CFLAGS@
|
||||||
AR_FLAGS = $(LIBS)
|
AR_FLAGS = $(LIBS)
|
||||||
|
|
||||||
noinst_LIBRARIES = libguidep.a
|
noinst_LIBRARIES = libguidep.a
|
||||||
|
|
||||||
|
@ -1,3 +1,12 @@
|
|||||||
|
/*
|
||||||
|
* PUAE - The *nix Amiga Emulator
|
||||||
|
*
|
||||||
|
* QT GUI for PUAE
|
||||||
|
*
|
||||||
|
* Copyright 2010 Mustafa 'GnoStiC' TUFAN
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
#include <QtGui/QApplication>
|
#include <QtGui/QApplication>
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
#include "puae_bridge.h"
|
#include "puae_bridge.h"
|
||||||
|
@ -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 "puae_mainwindow.h"
|
||||||
#include "ui_puae_mainwindow.h"
|
#include "ui_puae_mainwindow.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user