X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=virtualjaguar.pro;h=dfc9c7d49bf613d0fdba87dafb6eb00f67de917e;hb=22e4f2eeba52ba2a1f2808e82147dc57a9e4e44f;hp=15fc2073df04eeb372312f878ff905a28e00c3d8;hpb=4b629b399ccfba8ca942acbdb808938f0f1aabca;p=virtualjaguar

diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index 15fc207..dfc9c7d 100644
--- a/virtualjaguar.pro
+++ b/virtualjaguar.pro
@@ -25,13 +25,13 @@ 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 (to link statically on Mac)
-macx       { LIBS += `sdl-config --static-libs` }
-win32|unix { LIBS += `sdl-config --libs` }
+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
@@ -53,82 +53,36 @@ DEPENDPATH = \
 
 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/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/sdljoystick.cpp