X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=virtualjaguar.pro;h=aa65a916f527293fe9ba06bcd9b63e755eb6085a;hb=c1aa2a5180362f141ce43b76942952e1f6680347;hp=60653bfae6d4938926ba953ee62745de99a9b54a;hpb=166019baeee39e3867ecf6c4eddd0855dc3507a4;p=virtualjaguar

diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index 60653bf..aa65a91 100644
--- a/virtualjaguar.pro
+++ b/virtualjaguar.pro
@@ -15,7 +15,8 @@
 TARGET     = virtualjaguar
 CONFIG    += qt warn_on release debug
 RESOURCES += virtualjaguar.qrc
-LIBS      += -lz -Lobj -ljaguarcore -lmusashi
+#LIBS      += -lz -Lobj -ljaguarcore -lmusashi
+LIBS      += -lz -Lobj -ljaguarcore -lm68k
 QT        += opengl
 
 # We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-)
@@ -26,7 +27,7 @@ UI_DIR      = obj
 
 # Platform specific defines
 win32     { DEFINES += __GCCWIN32__ }
-else:macx { DEFINES += __GCCUNIX__ _OSX_ }
+else:macx { DEFINES += __GCCUNIX__ __THINK_STUPID__ }
 else:unix { DEFINES += __GCCUNIX__ }
 
 # SDL (to link statically on Mac)
@@ -47,7 +48,8 @@ INCLUDEPATH += \
 
 DEPENDPATH = \
 	src \
-	src/gui
+	src/gui \
+	src/m68000
 
 # The GUI
 
@@ -57,14 +59,17 @@ HEADERS = \
 	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/keygrabber.h \
-	src/gui/mainwin.h
+	src/gui/mainwin.h \
+#	src/gui/sdljoystick.h
 
 SOURCES = \
 	src/gui/about.cpp \
@@ -72,11 +77,14 @@ SOURCES = \
 	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/keygrabber.cpp \
-	src/gui/mainwin.cpp
+	src/gui/mainwin.cpp \
+#	src/gui/sdljoystick.cpp