From 6eaec5b756fab78c94fcb861155acb7ed2c576fe Mon Sep 17 00:00:00 2001
From: starfrost013 <mario64crashed@gmail.com>
Date: Sun, 12 Jan 2025 15:31:54 +0000
Subject: [PATCH] forgot to port over some parts

---
 src/timer.c              | 4 ++++
 src/video/CMakeLists.txt | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/timer.c b/src/timer.c
index 6ddf8ebb5..2b92a1958 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -4,6 +4,7 @@
 #include <wchar.h>
 #include <86box/86box.h>
 #include <86box/timer.h>
+#include <86Box/nv/vid_nv_rivatimer.h>
 
 uint64_t TIMER_USEC;
 uint32_t timer_target;
@@ -168,6 +169,9 @@ timer_init(void)
     timer_target = 0ULL;
     tsc          = 0;
 
+    /* Initialise the CPU-independent timer */
+    rivatimer_init();
+
     timer_inited = 1;
 }
 
diff --git a/src/video/CMakeLists.txt b/src/video/CMakeLists.txt
index bbd329b7e..3d8e14c5e 100644
--- a/src/video/CMakeLists.txt
+++ b/src/video/CMakeLists.txt
@@ -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_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_bochs_vbe.c)
+    vid_bochs_vbe.c
+    nv/nv_rivatimer.c
+    )
 
 if(G100)
     target_compile_definitions(vid PRIVATE USE_G100)