OSDN > Find Software > Software Development > csp-qt > SCM > git > common_source_project-fm7 > Commit

csp-qt
Fork

R/O
HTTP
SSH
HTTPS

common_source_project-fm7: Commit

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

Commit MetaInfo

Revision	e1c30a8dc1c91e1025f3c460a33d90409da4f46a (tree)
Time	2017-02-13 02:01:36
Author	K.Ohta <whatisthis.sowhat@gmai...>
Commiter	K.Ohta

Log Message

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

Change Summary

modified: source/src/vm/fmr30/rtc.cpp (diff)
modified: source/src/vm/hc40/io.cpp (diff)
modified: source/src/vm/hc80/io.cpp (diff)
modified: source/src/vm/hd146818p.cpp (diff)
modified: source/src/vm/libcpu_newdev/rp5c01.cpp (diff)
modified: source/src/vm/msm58321.cpp (diff)
modified: source/src/vm/rp5c01.cpp (diff)
modified: source/src/vm/upd1990a.cpp (diff)
modified: source/src/vm/x07/io.cpp (diff)
modified: source/src/vm/x1/psub.cpp (diff)
modified: source/src/vm/x1/x1.cpp (diff)

Incremental Difference

--- a/source/src/vm/fmr30/rtc.cpp

+++ b/source/src/vm/fmr30/rtc.cpp

		@@ -22,6 +22,9 @@
22	22	#define POFMI 37
23	23	#define POFH 38
24	24	#define POFD 39
	25	+#if defined(Q_OS_WIN)
	26	+DLL_PREFIX_I struct cur_time_s cur_time;
	27	+#endif
25	28
26	29	void RTC::initialize()
27	30	{

--- a/source/src/vm/hc40/io.cpp

+++ b/source/src/vm/hc40/io.cpp

		@@ -54,6 +54,9 @@ static const int key_tbl[256] = {
54	54	0xff,0xff,0x72,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
55	55	0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff
56	56	};
	57	+#if defined(Q_OS_WIN)
	58	+DLL_PREFIX_I struct cur_time_s cur_time;
	59	+#endif
57	60
58	61	void IO::initialize()
59	62	{

--- a/source/src/vm/hc80/io.cpp

+++ b/source/src/vm/hc80/io.cpp

		@@ -83,6 +83,9 @@ static const int key_tbl[256] = {
83	83	static const uint8_t dot_tbl[8] = {
84	84	0x80, 0x40, 0x20, 0x10, 8, 4, 2, 1
85	85	};
	86	+#if defined(Q_OS_WIN)
	87	+DLL_PREFIX_I struct cur_time_s cur_time;
	88	+#endif
86	89
87	90	void IO::initialize()
88	91	{

--- a/source/src/vm/hd146818p.cpp

+++ b/source/src/vm/hd146818p.cpp

		@@ -18,6 +18,9 @@ static const int periodic_intr_rate[3][16] = {
18	18	{0, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384}, // 1.048576 MHz
19	19	{0, 128, 256, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384} // 32.768kHz
20	20	};
	21	+#if defined(Q_OS_WIN)
	22	+DLL_PREFIX_I struct cur_time_s cur_time;
	23	+#endif
21	24
22	25	void HD146818P::initialize()
23	26	{

--- a/source/src/vm/libcpu_newdev/rp5c01.cpp

+++ b/source/src/vm/libcpu_newdev/rp5c01.cpp

		@@ -11,6 +11,9 @@
11	11
12	12	#define EVENT_1SEC 0
13	13	#define EVENT_16HZ 1
	14	+#if defined(Q_OS_WIN)
	15	+DLL_PREFIX_I struct cur_time_s cur_time;
	16	+#endif
14	17
15	18	void RP5C01::initialize()
16	19	{

--- a/source/src/vm/msm58321.cpp

+++ b/source/src/vm/msm58321.cpp

		@@ -19,6 +19,9 @@
19	19	#ifndef MSM58321_START_YEAR
20	20	#define MSM58321_START_YEAR 0
21	21	#endif
	22	+#if defined(Q_OS_WIN)
	23	+DLL_PREFIX_I struct cur_time_s cur_time;
	24	+#endif
22	25
23	26	void MSM58321::initialize()
24	27	{

--- a/source/src/vm/rp5c01.cpp

+++ b/source/src/vm/rp5c01.cpp

		@@ -11,6 +11,9 @@
11	11
12	12	#define EVENT_1SEC 0
13	13	#define EVENT_16HZ 1
	14	+#if defined(Q_OS_WIN)
	15	+DLL_PREFIX_I struct cur_time_s cur_time;
	16	+#endif
14	17
15	18	void RP5C01::initialize()
16	19	{

--- a/source/src/vm/upd1990a.cpp

+++ b/source/src/vm/upd1990a.cpp

		@@ -11,6 +11,9 @@
11	11
12	12	#define EVENT_1SEC 0
13	13	#define EVENT_TP 1
	14	+#if defined(Q_OS_WIN)
	15	+DLL_PREFIX_I struct cur_time_s cur_time;
	16	+#endif
14	17
15	18	void UPD1990A::initialize()
16	19	{

--- a/source/src/vm/x07/io.cpp

+++ b/source/src/vm/x07/io.cpp

		@@ -21,6 +21,9 @@
21	21	#define EVENT_BEEP 0
22	22	#define EVENT_CMT 1
23	23	#define EVENT_1SEC 2
	24	+#if defined(Q_OS_WIN)
	25	+DLL_PREFIX_I struct cur_time_s cur_time;
	26	+#endif
24	27
25	28	static const uint8_t sub_cmd_len[0x47] = {
26	29	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()
274	274	d_cpu->set_intr_line(false, true, intr_bit);
275	275	}
276	276	}
	277	+#if defined(Q_OS_WIN)
	278	+DLL_PREFIX_I struct cur_time_s cur_time;
	279	+#endif
277	280
278	281	void PSUB::event_callback(int event_id, int err)
279	282	{

--- a/source/src/vm/x1/x1.cpp

+++ b/source/src/vm/x1/x1.cpp

		@@ -55,6 +55,9 @@
55	55	#include "../huc6280.h"
56	56	#include "../pcengine/pce.h"
57	57	#endif
	58	+#if defined(Q_OS_WIN)
	59	+DLL_PREFIX_I struct cur_time_s cur_time;
	60	+#endif
58	61
59	62	// ----------------------------------------------------------------------------
60	63	// initialize

Show on old repository browser