build: fix a shitload of build errors introduced by the Image refactoring

and the OS X port.

build/lol-build

@@ -16,6 +16,7 @@
 #  - linux-i386
 #  - linux-amd64
 #  - ios-arm
+#  - osx-amd64
 #  - android-arm
 #  - ps3-ppu
 #  - windows-i386

src/image/codec/android-image.cpp

@@ -20,7 +20,7 @@
 #include <android/log.h>
 
 #include "core.h"
-#include "image-private.h"
+#include "image/image-private.h"
 
 using namespace std;
 

src/image/codec/ios-image.cpp

@@ -18,6 +18,7 @@
 #import <UIKit/UIKit.h>
 
 #include "core.h"
+#include "image/image-private.h"
 
 using namespace std;
 

src/image/codec/ps3-image.cpp

@@ -20,6 +20,7 @@
 #include <cell/codec/pngdec.h>
 
 #include "core.h"
+#include "image/image-private.h"
 
 using namespace std;
 

test/benchsuite.cpp

@@ -14,7 +14,7 @@
 
 #include <cstdio>
 
-#if USE_SDL
+#if USE_SDL && defined __APPLE__
 #   include <SDL_main.h>
 #endif
 

test/debug/quad.cpp

@@ -28,7 +28,7 @@ using namespace lol;
 #   include "platform/sdl/sdlinput.h"
 #endif
 
-#if USE_SDL
+#if USE_SDL && defined __APPLE__
 #   include <SDL_main.h>
 #endif
 

test/debug/sandbox.cpp

@@ -12,7 +12,7 @@
 #   include "config.h"
 #endif
 
-#if USE_SDL
+#if USE_SDL && defined __APPLE__
 #   include <SDL_main.h>
 #endif
 

test/testsuite.cpp

@@ -15,7 +15,7 @@
 #include <cstdio>
 #include <cstdlib>
 
-#if USE_SDL
+#if USE_SDL && defined __APPLE__
 #   include <SDL_main.h>
 #endif