From b4975cbd28c54b5a8f5d7a119375fe05b46f19a1 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Mon, 16 Sep 2013 10:12:44 -0500 Subject: [PATCH] Fix for bad icon path on OSX, also updated OSX compilation docs. --- docs/INSTALL | 12 +++++++----- src/file.cpp | 6 ++++-- virtualjaguar.pro | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/docs/INSTALL b/docs/INSTALL index 23a2ca2..3709f0d 100644 --- 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 06c6822..00ef5f3 100644 --- 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 67702d1..75b07cb 100644 --- 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 -- 2.37.2