X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=virtualjaguar.pro;h=7d1164e11b8758fe27fb29c99b27f2fb511096a7;hb=c3a4ee955a8a3691150ae62dfa3b805a33c27311;hp=ecaf4d4c9e475e48e13c2177505dbeffce13fb5c;hpb=736042421d3aef1d9e223018b91e3485afff495f;p=virtualjaguar

diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index ecaf4d4..7d1164e 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      += `sdl-config --libs` -lz -Lobj -lmusashi
-LIBS      += -lz -Lobj -lmusashi
+LIBS      += -Lobj -ljaguarcore -lz -lm68k
 QT        += opengl
 
 # We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-)
@@ -25,23 +26,22 @@ RCC_DIR     = obj
 UI_DIR      = obj
 
 # Platform specific defines
-win32 { DEFINES += __GCCWIN32__ }
-macx  { DEFINES += __GCCUNIX__ _OSX_ }
-unix  { DEFINES += __GCCUNIX__ }
+win32     { DEFINES += __GCCWIN32__ }
+else:macx { DEFINES += __GCCUNIX__ __THINK_STUPID__ }
+else:unix { DEFINES += __GCCUNIX__ }
 
-# SDL
-macx       { LIBS += `sdl-config --static-libs` }
-win32|unix { LIBS += `sdl-config --libs` }
+# SDL (to link statically on Mac)
+macx { LIBS += `sdl-config --static-libs` }
+else { LIBS += `$(CROSS)sdl-config --libs` }
 
-#CFLAGS   := -MMD -Wall -Wno-switch -O2 -D$(SYSTYPE) -ffast-math -fomit-frame-pointer `sdl-config --cflags`
-#CPPFLAGS := -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) -Wno-trigraphs \
-#		$(HAVECDIO) -ffast-math -fomit-frame-pointer `sdl-config --cflags` -g
+# 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.
-QMAKE_CFLAGS += `sdl-config --cflags` -O2 -ffast-math -fomit-frame-pointer
-QMAKE_CXXFLAGS += `sdl-config --cflags` -O2 -ffast-math -fomit-frame-pointer
+#       cause problems if you're not careful. (Can do this via command line in qmake)
+QMAKE_CFLAGS += `$(CROSS)sdl-config --cflags`
+QMAKE_CXXFLAGS += `$(CROSS)sdl-config --cflags`
 
 # Need to add libcdio stuffola (checking/including)...
 
@@ -51,88 +51,50 @@ INCLUDEPATH += \
 
 DEPENDPATH = \
 	src \
-	src/gui
+	src/gui \
+	src/gui/debug \
+	src/m68000
 
 # The GUI
 
 HEADERS = \
 	src/gui/about.h \
+	src/gui/alpinetab.h \
 	src/gui/app.h \
 	src/gui/configdialog.h \
 	src/gui/controllertab.h \
+	src/gui/controllerwidget.h \
 	src/gui/filelistmodel.h \
 	src/gui/filepicker.h \
 	src/gui/filethread.h \
 	src/gui/generaltab.h \
 	src/gui/glwidget.h \
+	src/gui/help.h \
 	src/gui/imagedelegate.h \
-	src/gui/mainwin.h
+	src/gui/keygrabber.h \
+	src/gui/mainwin.h \
+	src/gui/debug/cpubrowser.h \
+	src/gui/debug/memorybrowser.h \
+	src/gui/debug/opbrowser.h \
+#	src/gui/sdljoystick.h
 
 SOURCES = \
 	src/gui/about.cpp \
+	src/gui/alpinetab.cpp \
 	src/gui/app.cpp \
 	src/gui/configdialog.cpp \
 	src/gui/controllertab.cpp \
+	src/gui/controllerwidget.cpp \
 	src/gui/filelistmodel.cpp \
 	src/gui/filepicker.cpp \
 	src/gui/filethread.cpp \
 	src/gui/generaltab.cpp \
 	src/gui/glwidget.cpp \
+	src/gui/help.cpp \
 	src/gui/imagedelegate.cpp \
-	src/gui/mainwin.cpp
-
-# The core (soon to be made into a library of its own)
-
-HEADERS += \
-	src/blitter.h       \
-	src/cdintf.h        \
-	src/cdrom.h         \
-	src/crc32.h         \
-	src/dac.h           \
-	src/dsp.h           \
-	src/eeprom.h        \
-	src/event.h         \
-	src/file.h          \
-	src/filedb.h        \
-	src/gpu.h           \
-	src/jagdasm.h       \
-	src/jaguar.h        \
-	src/jerry.h         \
-	src/joystick.h      \
-	src/log.h           \
-	src/memory.h        \
-	src/mmu.h           \
-	src/objectp.h       \
-	src/settings.h      \
-	src/state.h         \
-	src/tom.h           \
-	src/unzip.h         \
-	src/universalhdr.h  \
-	src/wavetable.h
-
-SOURCES += \
-	src/blitter.cpp       \
-	src/cdintf.cpp        \
-	src/cdrom.cpp         \
-	src/crc32.cpp         \
-	src/dac.cpp           \
-	src/dsp.cpp           \
-	src/eeprom.cpp        \
-	src/event.cpp         \
-	src/file.cpp          \
-	src/filedb.cpp        \
-	src/gpu.cpp           \
-	src/jagdasm.cpp       \
-	src/jaguar.cpp        \
-	src/jerry.cpp         \
-	src/joystick.cpp      \
-	src/log.cpp           \
-	src/memory.cpp        \
-	src/mmu.cpp           \
-	src/objectp.cpp       \
-	src/settings.cpp      \
-	src/state.cpp         \
-	src/tom.cpp           \
-	src/universalhdr.cpp  \
-	src/unzip.c           \
-	src/wavetable.cpp
+	src/gui/keygrabber.cpp \
+	src/gui/mainwin.cpp \
+	src/gui/debug/cpubrowser.cpp \
+	src/gui/debug/memorybrowser.cpp \
+	src/gui/debug/opbrowser.cpp \
+#	src/gui/sdljoystick.cpp