May 25, 2018 updates: Privacy Policy
  • R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: Commit

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


Commit MetaInfo

Revision8b43d026a08188a84ec80efca0672736d31d0d50 (tree)
Time2018-05-10 21:02:33
AuthorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[Qt][VM][FM7] Fix FTBFS with MinGW32.

Change Summary

Incremental Difference

--- a/source/src/qt/gui/draw_thread.cpp
+++ b/source/src/qt/gui/draw_thread.cpp
@@ -137,23 +137,6 @@ void DrawThreadClass::doWork(const QString &param)
137137 bDrawReq = false;
138138 if(renderSemaphore == NULL) goto __exit;
139139 do {
140-#if 0
141- _rate = (wait_refresh < emu_frame_rate) ? emu_frame_rate : wait_refresh;
142- do_draw_one_turn(bDrawReq);
143- if((bDrawReq) && (draw_screen_buffer != NULL)) {
144- bDrawReq = false;
145- }
146- if(wait_count <= 0.0f) {
147- wait_count = wait_count + _rate;
148- } else if(wait_count < 8.0) {
149- msleep(8);
150- wait_count = wait_count + _rate - 8.0;
151- } else {
152- wait_factor = (int)wait_count;
153- msleep(wait_factor);
154- wait_count -= (qreal)wait_factor;
155- }
156-#else
157140 _rate = (wait_refresh < emu_frame_rate) ? emu_frame_rate : wait_refresh;
158141 if(_rate < 2.0) {
159142 wait_factor = 2.0;
@@ -171,8 +154,6 @@ void DrawThreadClass::doWork(const QString &param)
171154 if(draw_screen_buffer == NULL) _d = false;
172155 if((_d) && (draw_screen_buffer != NULL)) bDrawReq = false;
173156 do_draw_one_turn(_d);
174-#endif
175-
176157 } while(bRunThread);
177158 __exit:
178159 csp_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_GENERAL,
--- a/source/src/qt/osd.h
+++ b/source/src/qt/osd.h
@@ -11,6 +11,7 @@
1111 #define _QT_OSD_H_
1212
1313 #include "osd_base.h"
14+#include "gui/qt_input.h" // Key code table (VK_foo).
1415
1516 class GLDrawClass;
1617 class EmuThreadClass;
--- a/source/src/vm/fm7/keyboard_tables.h
+++ b/source/src/vm/fm7/keyboard_tables.h
@@ -10,6 +10,10 @@
1010 #define _FM7_KEYBOARD_TABLES_H
1111
1212 #include "fm7_keyboard.h"
13+#if !defined(VK_OEM_CSP_KPRET)
14+# define VK_OEM_CSP_KPRET 0x9f
15+#endif
16+
1317
1418 const uint16_t vk_matrix_106[0x68] = { // VK
1519 // +0, +1, +2, +3, +4, +5, +6, +7
Show on old repository browser