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

forgot to port over some parts

Browse Source
This commit is contained in:
starfrost013
2025-01-12 15:31:54 +00:00
parent 204b24022f
commit 6eaec5b756
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/timer.c
View File

@@ -4,6 +4,7 @@
#include <wchar.h> #include <wchar.h>
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/timer.h> #include <86box/timer.h>
#include <86Box/nv/vid_nv_rivatimer.h>
uint64_t TIMER_USEC; uint64_t TIMER_USEC;
uint32_t timer_target; uint32_t timer_target;
@@ -168,6 +169,9 @@ timer_init(void)
timer_target = 0ULL; timer_target = 0ULL;
tsc = 0; tsc = 0;
/* Initialise the CPU-independent timer */
rivatimer_init();
timer_inited = 1; timer_inited = 1;
} }

4
src/video/CMakeLists.txt
View File

@@ -27,7 +27,9 @@ add_library(vid OBJECT agpgart.c video.c vid_table.c vid_cga.c vid_cga_comp.c
vid_tkd8001_ramdac.c vid_att20c49x_ramdac.c vid_s3.c vid_s3_virge.c vid_tkd8001_ramdac.c vid_att20c49x_ramdac.c vid_s3.c vid_s3_virge.c
vid_ibm_rgb528_ramdac.c vid_sdac_ramdac.c vid_ogc.c vid_mga.c vid_nga.c vid_ibm_rgb528_ramdac.c vid_sdac_ramdac.c vid_ogc.c vid_mga.c vid_nga.c
vid_tvp3026_ramdac.c vid_att2xc498_ramdac.c vid_xga.c vid_tvp3026_ramdac.c vid_att2xc498_ramdac.c vid_xga.c
vid_bochs_vbe.c) vid_bochs_vbe.c
nv/nv_rivatimer.c
)
if(G100) if(G100)
target_compile_definitions(vid PRIVATE USE_G100) target_compile_definitions(vid PRIVATE USE_G100)