X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=virtualjaguar.pro;h=0478be2b411fb8d852d95314c65e8cab748d16b1;hb=417c77735e5e76ab8803694511b465206d64bf97;hp=9530f018ab7f159d7237ef977062988a95a61105;hpb=f548beede257a2252a2639e3fe03c7cda99433ed;p=virtualjaguar

diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index 9530f01..0478be2 100644
--- a/virtualjaguar.pro
+++ b/virtualjaguar.pro
@@ -8,11 +8,14 @@
 #
 # NOTE: Musashi 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
 RESOURCES += virtualjaguar.qrc
-LIBS      += `sdl-config --libs` -lz -Lobj -lmusashi
+LIBS      += -lz -Lobj -ljaguarcore -lmusashi
 QT        += opengl
 
 # We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-)
@@ -22,17 +25,17 @@ 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__ _OSX_ }
+else:unix { DEFINES += __GCCUNIX__ }
 
-#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
+# SDL (to link statically on Mac)
+macx { LIBS += `sdl-config --static-libs` }
+else { LIBS += `sdl-config --libs` }
 
 # 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.
+#       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
 
@@ -73,57 +76,3 @@ SOURCES = \
 	src/gui/glwidget.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/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/unzip.c           \
-	src/wavetable.cpp