zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-14 11:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed compilation of Cocoa backend

Browse source
This commit is contained in:
alexey.lysiuk 2020-05-05 10:55:35 +03:00
parent 68a0ead5f0
commit d8e3d60e85
4 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/common/utility/findfile.cpp
View file

@ -45,11 +45,7 @@
static const char *pattern; static const char *pattern;
#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED < 1080
static int matchfile(struct dirent *ent)
#else
static int matchfile(const struct dirent *ent) static int matchfile(const struct dirent *ent)
#endif
{ {
return fnmatch(pattern, ent->d_name, FNM_NOESCAPE) == 0; return fnmatch(pattern, ent->d_name, FNM_NOESCAPE) == 0;
} }

2
source/platform/posix/cocoa/i_main.mm
View file

@ -350,7 +350,7 @@ extern bool AppActive;
- (void)sendExitEvent:(id)sender - (void)sendExitEvent:(id)sender
{ {
throw ExitEvent(0); throw CExitEvent(0);
} }
@end @end

2
source/platform/posix/cocoa/st_console.mm
View file

@ -36,7 +36,6 @@
#include "st_console.h" #include "st_console.h"
#include "v_text.h" #include "v_text.h"
#include "version.h" #include "version.h"
#include "i_time.h"
#include "palentry.h" #include "palentry.h"
#include "v_video.h" #include "v_video.h"
#include "v_font.h" #include "v_font.h"
@ -195,6 +194,7 @@ struct TimedUpdater
{ {
explicit TimedUpdater(const Function& function) explicit TimedUpdater(const Function& function)
{ {
extern uint64_t I_msTime();
const unsigned int currentTime = I_msTime(); const unsigned int currentTime = I_msTime();
if (currentTime - m_previousTime > interval) if (currentTime - m_previousTime > interval)

2
source/platform/posix/osx/iwadpicker_cocoa.mm
View file

@ -360,7 +360,7 @@ static NSArray* GetKnownExtensions()
if ( @selector(terminate:) == [menuItem action] ) if ( @selector(terminate:) == [menuItem action] )
{ {
throw ExitEvent(0); throw CExitEvent(0);
} }
} }