X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=virtualjaguar.pro;h=7a6992ecb483dcdce296b789155046d5892130b5;hb=09b508a759ca512da810722a0d4786dd1695d47c;hp=492b568d56e7f0ca5067d8c9b4a291a3bcaf386e;hpb=2e3a9a7467a1740dff9985203f10f7bae01c9d0d;p=virtualjaguar

diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index 492b568..7a6992e 100644
--- 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 ;-)
@@ -26,18 +27,21 @@ UI_DIR      = obj
 
 # Platform specific defines
 win32     { DEFINES += __GCCWIN32__ }
-else:macx { DEFINES += __GCCUNIX__ _OSX_ }
+else:macx { DEFINES += __GCCUNIX__ __THINK_STUPID__ }
 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
 
@@ -66,7 +72,10 @@ HEADERS = \
 	src/gui/help.h \
 	src/gui/imagedelegate.h \
 	src/gui/keygrabber.h \
-	src/gui/mainwin.h
+	src/gui/mainwin.h \
+	src/gui/debug/cpubrowser.h \
+	src/gui/debug/memorybrowser.h \
+#	src/gui/sdljoystick.h
 
 SOURCES = \
 	src/gui/about.cpp \
@@ -83,4 +92,7 @@ SOURCES = \
 	src/gui/help.cpp \
 	src/gui/imagedelegate.cpp \
 	src/gui/keygrabber.cpp \
-	src/gui/mainwin.cpp
+	src/gui/mainwin.cpp \
+	src/gui/debug/cpubrowser.cpp \
+	src/gui/debug/memorybrowser.cpp \
+#	src/gui/sdljoystick.cpp