• R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: Commit

Common Source Code Project for Qt (a.k.a for FM-7).


Commit MetaInfo

Revisione1c30a8dc1c91e1025f3c460a33d90409da4f46a (tree)
Zeit2017-02-13 02:01:36
AutorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[Build][Win32][VM] Prepare to fix FTBFS.

Ändern Zusammenfassung

Diff

--- a/source/src/vm/fmr30/rtc.cpp
+++ b/source/src/vm/fmr30/rtc.cpp
@@ -22,6 +22,9 @@
2222 #define POFMI 37
2323 #define POFH 38
2424 #define POFD 39
25+#if defined(Q_OS_WIN)
26+DLL_PREFIX_I struct cur_time_s cur_time;
27+#endif
2528
2629 void RTC::initialize()
2730 {
--- a/source/src/vm/hc40/io.cpp
+++ b/source/src/vm/hc40/io.cpp
@@ -54,6 +54,9 @@ static const int key_tbl[256] = {
5454 0xff,0xff,0x72,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
5555 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff
5656 };
57+#if defined(Q_OS_WIN)
58+DLL_PREFIX_I struct cur_time_s cur_time;
59+#endif
5760
5861 void IO::initialize()
5962 {
--- a/source/src/vm/hc80/io.cpp
+++ b/source/src/vm/hc80/io.cpp
@@ -83,6 +83,9 @@ static const int key_tbl[256] = {
8383 static const uint8_t dot_tbl[8] = {
8484 0x80, 0x40, 0x20, 0x10, 8, 4, 2, 1
8585 };
86+#if defined(Q_OS_WIN)
87+DLL_PREFIX_I struct cur_time_s cur_time;
88+#endif
8689
8790 void IO::initialize()
8891 {
--- a/source/src/vm/hd146818p.cpp
+++ b/source/src/vm/hd146818p.cpp
@@ -18,6 +18,9 @@ static const int periodic_intr_rate[3][16] = {
1818 {0, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384}, // 1.048576 MHz
1919 {0, 128, 256, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384} // 32.768kHz
2020 };
21+#if defined(Q_OS_WIN)
22+DLL_PREFIX_I struct cur_time_s cur_time;
23+#endif
2124
2225 void HD146818P::initialize()
2326 {
--- a/source/src/vm/libcpu_newdev/rp5c01.cpp
+++ b/source/src/vm/libcpu_newdev/rp5c01.cpp
@@ -11,6 +11,9 @@
1111
1212 #define EVENT_1SEC 0
1313 #define EVENT_16HZ 1
14+#if defined(Q_OS_WIN)
15+DLL_PREFIX_I struct cur_time_s cur_time;
16+#endif
1417
1518 void RP5C01::initialize()
1619 {
--- a/source/src/vm/msm58321.cpp
+++ b/source/src/vm/msm58321.cpp
@@ -19,6 +19,9 @@
1919 #ifndef MSM58321_START_YEAR
2020 #define MSM58321_START_YEAR 0
2121 #endif
22+#if defined(Q_OS_WIN)
23+DLL_PREFIX_I struct cur_time_s cur_time;
24+#endif
2225
2326 void MSM58321::initialize()
2427 {
--- a/source/src/vm/rp5c01.cpp
+++ b/source/src/vm/rp5c01.cpp
@@ -11,6 +11,9 @@
1111
1212 #define EVENT_1SEC 0
1313 #define EVENT_16HZ 1
14+#if defined(Q_OS_WIN)
15+DLL_PREFIX_I struct cur_time_s cur_time;
16+#endif
1417
1518 void RP5C01::initialize()
1619 {
--- a/source/src/vm/upd1990a.cpp
+++ b/source/src/vm/upd1990a.cpp
@@ -11,6 +11,9 @@
1111
1212 #define EVENT_1SEC 0
1313 #define EVENT_TP 1
14+#if defined(Q_OS_WIN)
15+DLL_PREFIX_I struct cur_time_s cur_time;
16+#endif
1417
1518 void UPD1990A::initialize()
1619 {
--- a/source/src/vm/x07/io.cpp
+++ b/source/src/vm/x07/io.cpp
@@ -21,6 +21,9 @@
2121 #define EVENT_BEEP 0
2222 #define EVENT_CMT 1
2323 #define EVENT_1SEC 2
24+#if defined(Q_OS_WIN)
25+DLL_PREFIX_I struct cur_time_s cur_time;
26+#endif
2427
2528 static const uint8_t sub_cmd_len[0x47] = {
2629 1, // 00 Unknown
--- a/source/src/vm/x1/psub.cpp
+++ b/source/src/vm/x1/psub.cpp
@@ -274,6 +274,9 @@ void PSUB::update_intr()
274274 d_cpu->set_intr_line(false, true, intr_bit);
275275 }
276276 }
277+#if defined(Q_OS_WIN)
278+DLL_PREFIX_I struct cur_time_s cur_time;
279+#endif
277280
278281 void PSUB::event_callback(int event_id, int err)
279282 {
--- a/source/src/vm/x1/x1.cpp
+++ b/source/src/vm/x1/x1.cpp
@@ -55,6 +55,9 @@
5555 #include "../huc6280.h"
5656 #include "../pcengine/pce.h"
5757 #endif
58+#if defined(Q_OS_WIN)
59+DLL_PREFIX_I struct cur_time_s cur_time;
60+#endif
5861
5962 // ----------------------------------------------------------------------------
6063 // initialize
Show on old repository browser