[OSD][Qt][LOGGER] Fix linkage error for LLD 10.x and Win32 cross.

diff --git a/source/src/qt/CMakeLists.txt b/source/src/qt/CMakeLists.txt
index 6f73fc0..218a97a 100644 (file)
--- a/source/src/qt/CMakeLists.txt
+++ b/source/src/qt/CMakeLists.txt
@@ -1,5 +1,5 @@
 message("* qt/osd")
-SET(THIS_LIB_VERSION 2.25.2)
+SET(THIS_LIB_VERSION 2.25.3)
 
 set(s_qt_osd_headers
        osd_base.h

diff --git a/source/src/qt/gui/csp_logger.cpp b/source/src/qt/gui/csp_logger.cpp
index 93dbc56..a0c3728 100644 (file)
--- a/source/src/qt/gui/csp_logger.cpp
+++ b/source/src/qt/gui/csp_logger.cpp
@@ -14,7 +14,7 @@
 #include "emu.h"
 #include "vm/vm.h"
 #include "menu_flags.h"
-#include "../osd.h"
+#include "../osd_base.h"
 
 CSP_LoggerLine::CSP_LoggerLine(int64_t line, int _level, QString _domain, QString time_s, QString s, double us)
 {

diff --git a/source/src/qt/osd.h b/source/src/qt/osd.h
index 0b0c9db..53bd60a 100644 (file)
--- a/source/src/qt/osd.h
+++ b/source/src/qt/osd.h
@@ -146,6 +146,9 @@ public:
        void free_sound_file(int id, int16_t **data);
 #endif
        void debug_log(int level, int domain_num, char *strbuf);
+       double get_vm_current_usec();
+       uint64_t get_vm_current_clock_uint64();
+   
 public slots:
        void do_decode_movie(int frames);
        void do_run_movie_audio_callback(uint8_t *data, long len);

diff --git a/source/src/qt/osd_base.cpp b/source/src/qt/osd_base.cpp
index 38e45a7..0928deb 100644 (file)
--- a/source/src/qt/osd_base.cpp
+++ b/source/src/qt/osd_base.cpp
@@ -615,14 +615,3 @@ void OSD_BASE::set_hdd_image_name(int drv, _TCHAR *filename)
        emit sig_change_virtual_media(CSP_DockDisks_Domain_HD, drv, _n);
 }
 
-double OSD_BASE::get_vm_current_usec()
-{
-       if(vm == NULL) return 0.0;
-       return vm->get_current_usec();
-}
-
-uint64_t OSD_BASE::get_vm_current_clock_uint64()
-{
-       if(vm == NULL) return (uint64_t)0;
-       return vm->get_current_clock_uint64();
-}

diff --git a/source/src/qt/osd_base.h b/source/src/qt/osd_base.h
index a96eded..06b55ea 100644 (file)
--- a/source/src/qt/osd_base.h
+++ b/source/src/qt/osd_base.h
@@ -639,8 +639,8 @@ public:
 
        void debug_log(int level, const char *fmt, ...);
        void debug_log(int level, int domain_num, const char *fmt, ...);
-       double get_vm_current_usec();
-       uint64_t get_vm_current_clock_uint64();
+       virtual double get_vm_current_usec() { return 0.0; }
+       virtual uint64_t get_vm_current_clock_uint64() { return 0; }
        
        virtual void debug_log(int level, int domain_num, char *strbuf);
 

diff --git a/source/src/qt/osd_wrapper.cpp b/source/src/qt/osd_wrapper.cpp
index 49c4548..0464a4f 100644 (file)
--- a/source/src/qt/osd_wrapper.cpp
+++ b/source/src/qt/osd_wrapper.cpp
@@ -1131,3 +1131,15 @@ int OSD::add_video_frames()
        }
        return counter;
 }
+
+double OSD::get_vm_current_usec()
+{
+       if(vm == NULL) return 0.0;
+       return vm->get_current_usec();
+}
+
+uint64_t OSD::get_vm_current_clock_uint64()
+{
+       if(vm == NULL) return (uint64_t)0;
+       return vm->get_current_clock_uint64();
+}