X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=virtualjaguar.pro;h=86bfcca1c6d48469cd166f244c04c7031d4b368e;hb=ab4f660439ff855171f801e3fdfa3e9de69d991b;hp=aa65a916f527293fe9ba06bcd9b63e755eb6085a;hpb=2d556a3eb52664e928014a72ad18edc13281de7e;p=virtualjaguar

diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index aa65a91..86bfcca 100644
--- a/virtualjaguar.pro
+++ b/virtualjaguar.pro
@@ -1,22 +1,22 @@
 #
 # Virtual Jaguar Qt project file
 #
-# by James L. Hammons
+# by James Hammons
 # Copyright (C) 2011 Underground Software
 #
 # See the README and GPLv3 files for licensing and warranty information
 #
-# NOTE: Musashi is built and linked in as a library, so there should be no more
+# 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. :-/
 #
 
 TARGET     = virtualjaguar
-CONFIG    += qt warn_on release debug
+CONFIG    += qt warn_on release
+# debug
 RESOURCES += virtualjaguar.qrc
-#LIBS      += -lz -Lobj -ljaguarcore -lmusashi
-LIBS      += -lz -Lobj -ljaguarcore -lm68k
+LIBS      += -Lobj -ljaguarcore -lz -lm68k
 QT        += opengl
 
 # We stuff all the intermediate crap into obj/ so it won't confuse us mere mortals ;-)
@@ -32,13 +32,16 @@ else:unix { DEFINES += __GCCUNIX__ }
 
 # SDL (to link statically on Mac)
 macx { LIBS += `sdl-config --static-libs` }
-else { LIBS += `sdl-config --libs` }
+else { LIBS += `$(CROSS)sdl-config --libs` }
+
+# Icon on Win32
+win32 { LIBS += res/vj-ico.o }
 
 # 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)
-QMAKE_CFLAGS += `sdl-config --cflags` -O2 -ffast-math -fomit-frame-pointer
-QMAKE_CXXFLAGS += `sdl-config --cflags` -O2 -ffast-math -fomit-frame-pointer
+QMAKE_CFLAGS += `$(CROSS)sdl-config --cflags`
+QMAKE_CXXFLAGS += `$(CROSS)sdl-config --cflags`
 
 # Need to add libcdio stuffola (checking/including)...