Fix for bad icon path on OSX, also updated OSX compilation docs.

diff --git a/docs/INSTALL b/docs/INSTALL
index 23a2ca23fac2536ce3f61084f7188601e5decc29..3709f0dd8c880047d1c69a2905c87025376072bf 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -40,11 +40,13 @@ For even more info, go to http://icculus.org/virtualjaguar.
 NOTES FOR COMPILING UNDER MAC OSX:
 ----------------------------------
 
-All is not well in Appleland, but we can help. To compile the bare minimum app
-under OSX requires libsdl and Qt; however, these must be made statically and
-installed "the unix way". What that means is you have to download and unpack
-the source directories, then make and install them from the terminal. For
-libsdl, this is as simple as doing:
+All is not well in Appleland, but we can help. Apple, in their infinite wisdom,
+has decided not to ship a compiler and tools to build software. So first of all
+you need to download and install 'Command Line Tools for XCode'. Then, to
+compile the bare minimum app under OSX requires libsdl and Qt; however, these
+must be made statically and installed "the unix way". What that means is you
+have to download and unpack the source directories, then make and install them
+from the terminal. For libsdl, this is as simple as doing:
 
 ./configure
 make

diff --git a/src/file.cpp b/src/file.cpp
index 06c6822378f2daf982bfe544cdf30983389e2c3d..00ef5f3eff749632b11b3d9618784111167bc92c 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -251,14 +251,16 @@ SET16(jaguarMainRAM, 0x1000, 0x60FE);             // Here: bra Here
        }
 
        // We can assume we have JST_NONE at this point. :-P
+       WriteLog("FILE: Failed to load headerless file.\n");
        return false;
 }
 
 
 //
 // "Alpine" file loading
-// Since the developers were coming after us with torches and pitchforks, we decided to
-// allow this kind of thing. ;-) But ONLY FOR THE DEVS, DAMMIT! >:-U O_O
+// Since the developers were coming after us with torches and pitchforks, we
+// decided to allow this kind of thing. ;-) But ONLY FOR THE DEVS, DAMMIT! >:-U
+// O_O
 //
 bool AlpineLoadFile(char * path)
 {

diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index 67702d19cc7a0bdad3c7d74740fc50f1a3d95f01..75b07cb0fb2fa610ec82fcdf754feb1015603e2e 100644 (file)
--- a/virtualjaguar.pro
+++ b/virtualjaguar.pro
@@ -36,7 +36,7 @@ else { LIBS += `$(CROSS)sdl-config --libs` }
 
 # Icon on Win32, Mac
 win32 { LIBS += res/vj-ico.o }
-macx  { ICON = vj-icon.icns }
+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