zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 14:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed compile on Linux and (maybe?) Mac

Browse source
This commit is contained in:
raa-eruanna 2017-11-01 04:13:10 -04:00
parent d313ef4b61
commit 7d4f8af245
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/posix/cocoa/i_video.mm
View file

@ -1523,10 +1523,16 @@ void I_SetMainWindowVisible(bool visible)
// each platform has its own specific version of this function. // each platform has its own specific version of this function.
void I_SetWindowTitle(const char* title) void I_SetWindowTitle(const char* title)
{ {
static NSString* const TITLE_STRING;
if (title) if (title)
TITLE_STRING = [NSString stringWithFormat:@"%s", title]; {
static NSString* const TITLE_STRING =
[NSString stringWithFormat:@"%s", title];
[m_window setTitle:TITLE_STRING];
}
else else
TITLE_STRING = [NSString stringWithFormat:@"%s %s", GAMESIG, GetVersionString()]; {
[m_window setTitle:TITLE_STRING]; static NSString* const TITLE_STRING =
} [NSString stringWithFormat:@"%s %s", GAMESIG, GetVersionString()];
[m_window setTitle:TITLE_STRING];
}
}

5
src/posix/sdl/sdlvideo.cpp
View file

@ -556,11 +556,12 @@ ADD_STAT (blit)
void I_SetWindowTitle(const char* caption) void I_SetWindowTitle(const char* caption)
{ {
if (caption) if (caption)
SDL_SetWindowTitle(Screen, caption); SDL_SetWindowTitle(static_cast<SDLFB *>(screen)->GetSDLWindow(), caption);
else else
{ {
FString default_caption; FString default_caption;
default_caption.Format(GAMESIG " %s (%s)", GetVersionString(), GetGitTime()); default_caption.Format(GAMESIG " %s (%s)", GetVersionString(), GetGitTime());
SDL_SetWindowTitle(Screen, default_caption); SDL_SetWindowTitle(static_cast<SDLFB *>(screen)->GetSDLWindow(), default_caption);
} }
} }