(svn r22913) -Fix [OSX]: make splash work again and make it work without needing to bundle it first

Makefile.src.in

@@ -253,6 +253,9 @@ $(BIN_DIR)/$(TTD): $(TTD)
 ifeq ($(OS), UNIX)
 	$(Q)cp $(MEDIA_DIR)/openttd.32.bmp $(BIN_DIR)/data/
 endif
+ifeq ($(OS), OSX)
+	$(Q)cp $(ROOT_DIR)/os/macosx/splash.png $(BIN_DIR)/data/
+endif
 
 $(TTD): $(OBJS) $(CONFIG_CACHE_LINKER)
 	$(E) '$(STAGE) Linking $@'

src/os/macosx/splash.cpp

@@ -51,7 +51,7 @@ static void PNGAPI png_my_warning(png_structp png_ptr, png_const_charp message)
  */
 void DisplaySplashImage()
 {
-	FILE *f = FioFOpenFile(SPLASH_IMAGE_FILE, "r", BASE_DIR);
+	FILE *f = FioFOpenFile(SPLASH_IMAGE_FILE, "r", BASESET_DIR);
 	if (f == NULL) return;
 
 	png_byte header[8];

src/os/macosx/splash.h

@@ -12,16 +12,8 @@
 #ifndef SPLASH_H
 #define SPLASH_H
 
-#define SPLASH_IMAGE_FILE		"splash.png"
+#define SPLASH_IMAGE_FILE "splash.png"
 
-#ifdef __cplusplus
-extern "C" {
-#endif //__cplusplus
-
-	void DisplaySplashImage();
-
-#ifdef __cplusplus
-}
-#endif //__cplusplus
+void DisplaySplashImage();
 
 #endif /* SPLASH_H */