mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/1.2
rubidium 2011-09-09 20:28:48 +00:00
parent d78a4850a6
commit 39eaf0e10d
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.src.in
View File

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

2
src/os/macosx/splash.cpp
View File

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

12
src/os/macosx/splash.h
View File

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