X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=virtualjaguar.pro;h=7a6992ecb483dcdce296b789155046d5892130b5;hb=09b508a759ca512da810722a0d4786dd1695d47c;hp=27959de7e5c5701eb40b6feb4e77048ff2935cf6;hpb=d848a84a9c3a134b434025f28c9bf567a48bd94b;p=virtualjaguar diff --git a/virtualjaguar.pro b/virtualjaguar.pro index 27959de..7a6992e 100644 --- a/virtualjaguar.pro +++ b/virtualjaguar.pro @@ -6,7 +6,7 @@ # # 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. :-/ @@ -16,10 +16,8 @@ TARGET = virtualjaguar CONFIG += qt warn_on release # debug RESOURCES += virtualjaguar.qrc -#LIBS += -Lobj -ljaguarcore -lz -lmusashi LIBS += -Lobj -ljaguarcore -lz -lm68k QT += opengl -#CROSS = i686-pc-mingw32- # We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-) OBJECTS_DIR = obj @@ -42,8 +40,8 @@ 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 += `$(CROSS)sdl-config --cflags` -O2 -ffast-math -fomit-frame-pointer -QMAKE_CXXFLAGS += `$(CROSS)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)... @@ -54,6 +52,7 @@ INCLUDEPATH += \ DEPENDPATH = \ src \ src/gui \ + src/gui/debug \ src/m68000 # The GUI @@ -74,6 +73,8 @@ HEADERS = \ src/gui/imagedelegate.h \ src/gui/keygrabber.h \ src/gui/mainwin.h \ + src/gui/debug/cpubrowser.h \ + src/gui/debug/memorybrowser.h \ # src/gui/sdljoystick.h SOURCES = \ @@ -92,4 +93,6 @@ SOURCES = \ src/gui/imagedelegate.cpp \ src/gui/keygrabber.cpp \ src/gui/mainwin.cpp \ + src/gui/debug/cpubrowser.cpp \ + src/gui/debug/memorybrowser.cpp \ # src/gui/sdljoystick.cpp