80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed compile-breaking mistakes in nv_riva128.c (just in case someone wants to compile it);

Browse Source 
Removed Cirrus and NVidia stuff from the makefile.
This commit is contained in:
OBattler
2017-05-05 02:15:28 +02:00
parent aef6bdf9a1
commit 2262ad3ba0
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.mingw
View File

@@ -113,13 +113,10 @@ VIDOBJ = video.o \
vid_ati_eeprom.o vid_ati18800.o vid_ati28800.o \
vid_ati68860_ramdac.o vid_ati_mach64.o \
vid_ics2595.o \
vid_cl_gd.o vid_cl_gd_blit.o vid_cl_ramdac.o \
vid_bt485_ramdac.o \
vid_sdac_ramdac.o \
vid_stg_ramdac.o \
vid_unk_ramdac.o \
vid_wy700.o \
vid_nv_riva128.o \
vid_voodoo.o \
vid_pcjr.o vid_ps1_svga.o \
vid_olivetti_m24.o \

3
src/Makefile.mingw64
View File

@@ -113,13 +113,10 @@ VIDOBJ = video.o \
vid_ati_eeprom.o vid_ati18800.o vid_ati28800.o \
vid_ati68860_ramdac.o vid_ati_mach64.o \
vid_ics2595.o \
vid_cl_gd.o vid_cl_gd_blit.o vid_cl_ramdac.o \
vid_bt485_ramdac.o \
vid_sdac_ramdac.o \
vid_stg_ramdac.o \
vid_unk_ramdac.o \
vid_wy700.o \
vid_nv_riva128.o \
vid_voodoo.o \
vid_pcjr.o vid_ps1_svga.o \
vid_olivetti_m24.o \

6
src/vid_nv_riva128.c
View File

@@ -3335,7 +3335,7 @@ static void rivatnt2_add_status_info(char *s, int max_len, void *p)
static device_config_t rivatnt2_config[] =
{
{
"model", "Card model", CONFIG_SELECTION, 0,
"model", "Card model", CONFIG_SELECTION, "", 0,
{
{
"Vanilla TNT2", 0,
@@ -3349,7 +3349,7 @@ static device_config_t rivatnt2_config[] =
},
},
{
"memory", "Memory size", CONFIG_SELECTION, 32,
"memory", "Memory size", CONFIG_SELECTION, "", 32,
{
{
"4 MB", 4
@@ -3407,7 +3407,7 @@ static device_config_t rivatnt2_config[] =
},
},
{
-1
"", "", -1
}
};