Added memory browser, fixed documentation, M68000 exception explanations.

[virtualjaguar] / virtualjaguar.pro

diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index 1b286b08e9f99258ff4766761b3c7ae638237268..f16d7ceea766726f104a2e6277774a461d409ed9 100644 (file)
--- a/virtualjaguar.pro
+++ b/virtualjaguar.pro
@@ -1,21 +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      += -Lobj -ljaguarcore -lz -lm68k
 QT        += opengl
 
 # We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-)
@@ -31,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)...
 
@@ -47,7 +51,9 @@ INCLUDEPATH += \
 
 DEPENDPATH = \
        src \
-       src/gui
+       src/gui \
+       src/gui/debug \
+       src/m68000
 
 # The GUI
 
@@ -67,7 +73,8 @@ HEADERS = \
        src/gui/imagedelegate.h \
        src/gui/keygrabber.h \
        src/gui/mainwin.h \
-       src/gui/sdljoystick.h
+       src/gui/debug/memorybrowser.h \
+#      src/gui/sdljoystick.h
 
 SOURCES = \
        src/gui/about.cpp \
@@ -85,4 +92,5 @@ SOURCES = \
        src/gui/imagedelegate.cpp \
        src/gui/keygrabber.cpp \
        src/gui/mainwin.cpp \
-       src/gui/sdljoystick.cpp
+       src/gui/debug/memorybrowser.cpp \
+#      src/gui/sdljoystick.cpp