X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=virtualjaguar.pro;h=9c3706fef89270b38b2e62c1bf16b69181506e10;hb=ed33f22a3c3f3ff6be4a9a7156cb36b23e1b4f31;hp=7eb87789c51944d969b4d2f1bf92a7f77ec19960;hpb=69effddb777c2009d32f70e3315d5570973446ef;p=virtualjaguar

diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index 7eb8778..9c3706f 100644
--- a/virtualjaguar.pro
+++ b/virtualjaguar.pro
@@ -6,20 +6,22 @@
 #
 # See the README and GPLv3 files for licensing and warranty information
 #
-# 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. :-/
+# 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 platform
+#       detection there. :-/
 #
 
 TARGET     = virtualjaguar
 CONFIG    += qt warn_on release
 # debug
-RESOURCES += virtualjaguar.qrc
-LIBS      += -Lobj -ljaguarcore -lz -lm68k
-QT        += opengl
+RESOURCES += src/gui/virtualjaguar.qrc
+LIBS      += -Lobj -Lsrc/m68000/obj -ljaguarcore -lz -lm68k
+QT        += opengl widgets
 
-# We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-)
+# We stuff all the intermediate crap into obj/ so it won't confuse us mere
+# mortals ;-)
 OBJECTS_DIR = obj
 MOC_DIR     = obj
 RCC_DIR     = obj
@@ -34,20 +36,29 @@ else:unix { DEFINES += __GCCUNIX__ }
 macx { LIBS += `sdl-config --static-libs` }
 else { LIBS += `$(CROSS)sdl-config --libs` }
 
-# Icon on Win32
-win32 { LIBS += res/vj-ico.o }
+# Icon on Win32, Mac
+#win32 { LIBS += res/vj-ico.o }
+#win32 { ICON = res/vj.ico }
+#win32 { LIBS += res/vj.o; $(CROSS)windres -i res/vj.rc -o vj.o --include-dir=./res }
+win32 { RC_FILE = res/vj.rc }
+macx  { ICON = res/vj-icon.icns }
 
 # 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. (Can do this via command line in qmake)
+#       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)...
 
-# Translations. NB: Nobody has stepped up to do any :-P so these are dummy translations
-TRANSLATIONS = virtualjaguar_fr.ts \
-	virtualjaguar_gr.ts
+# Translations. NB: Nobody has stepped up to do any :-P so these are dummy
+# translations
+# Removed for now, they interfere with proper running in non-English locales for
+# some reason. :-/
+#TRANSLATIONS = \
+#	virtualjaguar_fr.ts \
+#	virtualjaguar_gr.ts
 
 INCLUDEPATH += \
 	src \
@@ -83,8 +94,7 @@ HEADERS = \
 	src/gui/debug/m68kdasmbrowser.h \
 	src/gui/debug/memorybrowser.h \
 	src/gui/debug/opbrowser.h \
-	src/gui/debug/riscdasmbrowser.h \
-#	src/gui/sdljoystick.h
+	src/gui/debug/riscdasmbrowser.h
 
 SOURCES = \
 	src/gui/about.cpp \
@@ -108,5 +118,5 @@ SOURCES = \
 	src/gui/debug/m68kdasmbrowser.cpp \
 	src/gui/debug/memorybrowser.cpp \
 	src/gui/debug/opbrowser.cpp \
-	src/gui/debug/riscdasmbrowser.cpp \
-#	src/gui/sdljoystick.cpp
+	src/gui/debug/riscdasmbrowser.cpp
+