zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macOS build fix 

git-svn-id: https://svn.eduke32.com/eduke32@6855 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-04-23 06:36:14 +00:00
parent e682986e69
commit b932485a1d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/build/src/startosx.editor.mm
View File

@ -424,7 +424,7 @@ static struct {
} }
mode2d = checkvideomode(&xdim2d, &ydim2d, bpp2d, fullscreen, 1); mode2d = videoCheckMode(&xdim2d, &ydim2d, bpp2d, fullscreen, 1);
[modeslist2d release]; [modeslist2d release];
[videoMode2DPUButton removeAllItems]; [videoMode2DPUButton removeAllItems];
@ -443,12 +443,12 @@ static struct {
if (idx2d >= 0) [videoMode2DPUButton selectItemAtIndex:idx2d]; if (idx2d >= 0) [videoMode2DPUButton selectItemAtIndex:idx2d];
mode3d = checkvideomode(&xdim, &ydim, bpp, fullscreen, 1); mode3d = videoCheckMode(&xdim, &ydim, bpp, fullscreen, 1);
if (mode3d < 0) { if (mode3d < 0) {
int i, cd[] = { 32, 24, 16, 15, 8, 0 }; int i, cd[] = { 32, 24, 16, 15, 8, 0 };
for (i=0; cd[i]; ) { if (cd[i] >= bpp) i++; else break; } for (i=0; cd[i]; ) { if (cd[i] >= bpp) i++; else break; }
for ( ; cd[i]; i++) { for ( ; cd[i]; i++) {
mode3d = checkvideomode(&xdim, &ydim, cd[i], fullscreen, 1); mode3d = videoCheckMode(&xdim, &ydim, cd[i], fullscreen, 1);
if (mode3d < 0) continue; if (mode3d < 0) continue;
break; break;
} }
@ -511,7 +511,7 @@ static struct {
- (void)setupRunMode - (void)setupRunMode
{ {
getvalidmodes(); videoGetModes();
[fullscreenButton setState: (settings.fullscreen ? NSOnState : NSOffState)]; [fullscreenButton setState: (settings.fullscreen ? NSOnState : NSOffState)];
[alwaysShowButton setState: (settings.forcesetup ? NSOnState : NSOffState)]; [alwaysShowButton setState: (settings.forcesetup ? NSOnState : NSOffState)];

6
source/duke3d/src/startosx.game.mm
View File

@ -442,12 +442,12 @@ static struct {
} }
} }
mode3d = checkvideomode(&xdim, &ydim, bpp, fullscreen, 1); mode3d = videoCheckMode(&xdim, &ydim, bpp, fullscreen, 1);
if (mode3d < 0) { if (mode3d < 0) {
int i, cd[] = { 32, 24, 16, 15, 8, 0 }; int i, cd[] = { 32, 24, 16, 15, 8, 0 };
for (i=0; cd[i]; ) { if (cd[i] >= bpp) i++; else break; } for (i=0; cd[i]; ) { if (cd[i] >= bpp) i++; else break; }
for ( ; cd[i]; i++) { for ( ; cd[i]; i++) {
mode3d = checkvideomode(&xdim, &ydim, cd[i], fullscreen, 1); mode3d = videoCheckMode(&xdim, &ydim, cd[i], fullscreen, 1);
if (mode3d < 0) continue; if (mode3d < 0) continue;
break; break;
} }
@ -508,7 +508,7 @@ static struct {
- (void)setupRunMode - (void)setupRunMode
{ {
getvalidmodes(); videoGetModes();
[fullscreenButton setState: (settings.fullscreen ? NSOnState : NSOffState)]; [fullscreenButton setState: (settings.fullscreen ? NSOnState : NSOffState)];
[alwaysShowButton setState: (settings.forcesetup ? NSOnState : NSOffState)]; [alwaysShowButton setState: (settings.forcesetup ? NSOnState : NSOffState)];