Mercurial > hg > openttd

changeset 18092:b00399731529 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22913) -Fix [OSX]: make splash work again and make it work without needing to bundle it first
author rubidium <rubidium@openttd.org>
date Fri, 09 Sep 2011 20:28:48 +0000
parents 3fae8f4b9820
children c7d6994d52cc
files Makefile.src.in src/os/macosx/splash.cpp src/os/macosx/splash.h
diffstat 3 files changed, 6 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -253,6 +253,9 @@
 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 $@'
--- a/src/os/macosx/splash.cpp
+++ b/src/os/macosx/splash.cpp
@@ -51,7 +51,7 @@
  */
 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];
--- a/src/os/macosx/splash.h
+++ b/src/os/macosx/splash.h
@@ -12,16 +12,8 @@
 #ifndef SPLASH_H
 #define SPLASH_H
 
-#define SPLASH_IMAGE_FILE		"splash.png"
-
-#ifdef __cplusplus
-extern "C" {
-#endif //__cplusplus
+#define SPLASH_IMAGE_FILE "splash.png"
 
-	void DisplaySplashImage();
-
-#ifdef __cplusplus
-}
-#endif //__cplusplus
+void DisplaySplashImage();
 
 #endif /* SPLASH_H */