Moved Jaguar core to library, fixes for Mac OSX compilation.

[virtualjaguar] / virtualjaguar.pro

diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index ecaf4d4c9e475e48e13c2177505dbeffce13fb5c..15fc2073df04eeb372312f878ff905a28e00c3d8 100644 (file)
--- a/virtualjaguar.pro
+++ b/virtualjaguar.pro
@@ -9,13 +9,13 @@
 # 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 -lmusashi
+LIBS      += -lz -Lobj -ljaguarcore -lmusashi
 QT        += opengl
 
 # We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-)
@@ -29,17 +29,13 @@ win32 { DEFINES += __GCCWIN32__ }
 macx  { DEFINES += __GCCUNIX__ _OSX_ }
 unix  { DEFINES += __GCCUNIX__ }
 
-# SDL
+# SDL (to link statically on Mac)
 macx       { LIBS += `sdl-config --static-libs` }
 win32|unix { LIBS += `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
-
 # 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
 
@@ -83,56 +79,56 @@ SOURCES = \
 
 # 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
+#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
+#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