cpp/openttd-patchpack/source Changeset - r18082:511b09ab8219

Changeset - r18082:511b09ab8219

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 13 years ago 2011-09-09 20:28:48
rubidium@openttd.org

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

3 files changed with 6 insertions and 11 deletions:

Makefile.src.in

src/os/macosx/splash.cpp

src/os/macosx/splash.h

0 comments (0 inline, 0 general)

Makefile.src.in

➞

Show inline comments

@@ @@ -253,6 +253,9 @@ endif @@
 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

➞

Show inline comments

@@ @@ -51,7 +51,7 @@ static void PNGAPI png_my_warning(png_st @@
  */
 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

➞

Show inline comments

@@ @@ -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 */

0 comments (0 inline, 0 general)