claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/OBattler/86Box

Browse Source
This commit is contained in:
OBattler
2017-08-17 23:16:53 +02:00
parent 6dbdc0483f f076d4fcff
commit 14c2e15c25
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.mingw
View File

@@ -148,6 +148,9 @@ else
DBFLAGS = DBFLAGS =
endif endif
ifeq ($(DEV_BRANCH), y)
CFLAGS += -DDEV_BRANCH
endif
ifeq ($(WALTJE), y) ifeq ($(WALTJE), y)
OPENDIR = win_opendir.o OPENDIR = win_opendir.o

2
src/VIDEO/vid_nv_riva128.c
View File

@@ -2200,7 +2200,7 @@ void rivatnt_pgraph_ctx_switch(void *p)
ret = (riva128->i2c.sda << 3) | (riva128->i2c.scl << 2); ret = (riva128->i2c.sda << 3) | (riva128->i2c.scl << 2);
break; break;
case 0x28: case 0x28:
ret = svga->crtc[0x28] & 3; ret = svga->crtc[0x28] & 0x3f;
break; break;
default: default:
ret = svga->crtc[svga->crtcreg]; ret = svga->crtc[svga->crtcreg];