Fixed missing border color on left hand side of screen.

[virtualjaguar] / virtualjaguar.pro

diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index aa65a916f527293fe9ba06bcd9b63e755eb6085a..d31d2fbc8e666cc18c6c070ffd6c1408da562ca0 100644 (file)
--- a/virtualjaguar.pro
+++ b/virtualjaguar.pro
@@ -1,22 +1,22 @@
 #
 # Virtual Jaguar Qt project file
 #
-# by James L. Hammons
+# by James Hammons
 # Copyright (C) 2011 Underground Software
 #
 # See the README and GPLv3 files for licensing and warranty information
 #
-# NOTE: Musashi is built and linked in as a library, so there should be no more
+# NOTE: M68000 core is built and linked in as a library, so there should be no more
 #       problems with using the qmake build system as-is. :-)
 #       Other than on the Mac, where it stupidly defaults to making XCode binaries. >:-(
 #       Well, we fixed it in the Makefile, by doing platfrom detection there. :-/
 #
 
 TARGET     = virtualjaguar
-CONFIG    += qt warn_on release debug
+CONFIG    += qt warn_on release
+# debug
 RESOURCES += virtualjaguar.qrc
-#LIBS      += -lz -Lobj -ljaguarcore -lmusashi
-LIBS      += -lz -Lobj -ljaguarcore -lm68k
+LIBS      += -Lobj -ljaguarcore -lz -lm68k
 QT        += opengl
 
 # We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-)
@@ -32,13 +32,16 @@ else:unix { DEFINES += __GCCUNIX__ }
 
 # SDL (to link statically on Mac)
 macx { LIBS += `sdl-config --static-libs` }
-else { LIBS += `sdl-config --libs` }
+else { LIBS += `$(CROSS)sdl-config --libs` }
+
+# Icon on Win32
+win32 { LIBS += res/vj-ico.o }
 
 # C/C++ flags...
 # NOTE: May have to put -Wall back in, but only on non-release cycles. It can
 #       cause problems if you're not careful. (Can do this via command line in qmake)
-QMAKE_CFLAGS += `sdl-config --cflags` -O2 -ffast-math -fomit-frame-pointer
-QMAKE_CXXFLAGS += `sdl-config --cflags` -O2 -ffast-math -fomit-frame-pointer
+QMAKE_CFLAGS += `$(CROSS)sdl-config --cflags`
+QMAKE_CXXFLAGS += `$(CROSS)sdl-config --cflags`
 
 # Need to add libcdio stuffola (checking/including)...
 
@@ -49,6 +52,7 @@ INCLUDEPATH += \
 DEPENDPATH = \
        src \
        src/gui \
+       src/gui/debug \
        src/m68000
 
 # The GUI
@@ -63,12 +67,18 @@ HEADERS = \
        src/gui/filelistmodel.h \
        src/gui/filepicker.h \
        src/gui/filethread.h \
+       src/gui/gamepad.h \
        src/gui/generaltab.h \
        src/gui/glwidget.h \
        src/gui/help.h \
        src/gui/imagedelegate.h \
        src/gui/keygrabber.h \
        src/gui/mainwin.h \
+       src/gui/debug/cpubrowser.h \
+       src/gui/debug/m68kdasmbrowser.h \
+       src/gui/debug/memorybrowser.h \
+       src/gui/debug/opbrowser.h \
+       src/gui/debug/riscdasmbrowser.h \
 #      src/gui/sdljoystick.h
 
 SOURCES = \
@@ -81,10 +91,16 @@ SOURCES = \
        src/gui/filelistmodel.cpp \
        src/gui/filepicker.cpp \
        src/gui/filethread.cpp \
+       src/gui/gamepad.cpp \
        src/gui/generaltab.cpp \
        src/gui/glwidget.cpp \
        src/gui/help.cpp \
        src/gui/imagedelegate.cpp \
        src/gui/keygrabber.cpp \
        src/gui/mainwin.cpp \
+       src/gui/debug/cpubrowser.cpp \
+       src/gui/debug/m68kdasmbrowser.cpp \
+       src/gui/debug/memorybrowser.cpp \
+       src/gui/debug/opbrowser.cpp \
+       src/gui/debug/riscdasmbrowser.cpp \
 #      src/gui/sdljoystick.cpp