• R/O
  • R/O (HTTP)
  • R/W (SSH)
  • R/W (HTTPS)

common_source_project-fm7: Commit

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


Commit MetaInfo

Revisionba4f434b6a5e0addd21346fe7297f8f1ed71f4f2 (tree)
Zeit2017-02-12 17:57:46
AutorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[Qt][BUILD] Fix some FTBFSs.

Ändern Zusammenfassung

Diff

--- a/source/build-cmake/buildvars_mingw_cross_win32.dat
+++ b/source/build-cmake/buildvars_mingw_cross_win32.dat
@@ -1,14 +1,14 @@
11 #CMAKE=/usr/bin/cmake
22 BUILD_TOOLCHAIN="GCC"
33
4-BUILD_TYPE="Debug"
4+BUILD_TYPE="Release"
55 # "No" or "Yes".
66 CSP_DEBUG="NO"
77 # "No" or "Yes".
88 USE_LTO="Yes"
99
1010 # No" or "Yes"
11-STRIP_SYMBOLS="NO"
11+STRIP_SYMBOLS="Yes"
1212 # "No" or "Yes"
1313 USE_RADICAL_OPTIMIZE="No"
1414
--- a/source/build-cmake/params/buildvars_mingw_params_gcc.dat
+++ b/source/build-cmake/params/buildvars_mingw_params_gcc.dat
@@ -31,6 +31,8 @@ case ${USE_LTO} in
3131 ;;
3232 esac
3333
34+#CMAKE_APPENDFLAG="-DUSE_QT5_4_APIS=ON -DUSE_MOVIE_LOADER=ON \
35+
3436 CMAKE_APPENDFLAG="-DUSE_QT5_4_APIS=ON -DUSE_MOVIE_LOADER=ON \
3537 -DUSE_MOVIE_SAVER=ON \
3638 -DCMAKE_AR:STRING=i686-w64-mingw32-gcc-ar \
--- a/source/src/common.cpp
+++ b/source/src/common.cpp
@@ -716,7 +716,7 @@ void DLL_PREFIX get_host_time(cur_time_t* cur_time)
716716
717717
718718
719-void cur_time_t::increment()
719+void DLL_PREFIX cur_time_t::increment()
720720 {
721721 if(++second >= 60) {
722722 second = 0;
@@ -746,7 +746,7 @@ void cur_time_t::increment()
746746 }
747747 }
748748
749-void cur_time_t::update_year()
749+void DLL_PREFIX cur_time_t::update_year()
750750 {
751751 // 1970-2069
752752 if(year < 70) {
@@ -756,7 +756,7 @@ void cur_time_t::update_year()
756756 }
757757 }
758758
759-void cur_time_t::update_day_of_week()
759+void DLL_PREFIX cur_time_t::update_day_of_week()
760760 {
761761 static const int t[] = {0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4};
762762 int y = year - (month < 3);
@@ -765,7 +765,7 @@ void cur_time_t::update_day_of_week()
765765
766766 #define STATE_VERSION 1
767767
768-void cur_time_t::save_state(void *f)
768+void DLL_PREFIX cur_time_t::save_state(void *f)
769769 {
770770 FILEIO *state_fio = (FILEIO *)f;
771771
@@ -781,7 +781,7 @@ void cur_time_t::save_state(void *f)
781781 state_fio->FputBool(initialized);
782782 }
783783
784-bool cur_time_t::load_state(void *f)
784+bool DLL_PREFIX cur_time_t::load_state(void *f)
785785 {
786786 FILEIO *state_fio = (FILEIO *)f;
787787
--- a/source/src/common.h
+++ b/source/src/common.h
@@ -504,7 +504,7 @@ int32_t DLL_PREFIX apply_volume(int32_t sample, int volume);
504504
505505 #define LEAP_YEAR(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
506506
507-typedef struct cur_time_s {
507+typedef DLL_PREFIX struct cur_time_s {
508508 int year, month, day, day_of_week, hour, minute, second;
509509 bool initialized;
510510 cur_time_s()
--- a/source/src/qt/common/qt_utils.cpp
+++ b/source/src/qt/common/qt_utils.cpp
@@ -267,11 +267,13 @@ void Ui_MainWindow::LaunchEmuThread(void)
267267 #endif
268268 csp_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_GENERAL, "DrawThread : Start.");
269269 connect(hDrawEmu, SIGNAL(sig_draw_frames(int)), hRunEmu, SLOT(print_framerate(int)));
270+ //connect(emu->get_osd(), SIGNAL(sig_draw_frames(int)), hRunEmu, SLOT(print_framerate(int)));
270271 connect(hRunEmu, SIGNAL(window_title_changed(QString)), this, SLOT(do_set_window_title(QString)));
271272 connect(hDrawEmu, SIGNAL(message_changed(QString)), this, SLOT(message_status_bar(QString)));
272273 connect(actionCapture_Screen, SIGNAL(triggered()), glv, SLOT(do_save_frame_screen()));
273274
274275 connect(hRunEmu, SIGNAL(sig_draw_thread(bool)), hDrawEmu, SLOT(doDraw(bool)), Qt::QueuedConnection);
276+ //connect(hRunEmu, SIGNAL(sig_draw_thread(bool)), emu->get_osd(), SLOT(do_draw(bool)));
275277 //connect(hRunEmu, SIGNAL(quit_draw_thread()), hDrawEmu, SLOT(doExit()));
276278 connect(this, SIGNAL(quit_draw_thread()), hDrawEmu, SLOT(doExit()));
277279
--- a/source/src/qt/machines/fmr30/MainWindow.cpp
+++ b/source/src/qt/machines/fmr30/MainWindow.cpp
@@ -41,7 +41,7 @@ void META_MainWindow::setupUI_Emu(void)
4141 }
4242
4343
44-META_MainWindow::META_MainWindow(USING_FLAGS *p, QWidget *parent) : Ui_MainWindow(p, parent)
44+META_MainWindow::META_MainWindow(USING_FLAGS *p, CSP_Logger *logger, QWidget *parent) : Ui_MainWindow(p, logger, parent)
4545 {
4646 setupUI_Emu();
4747 retranslateUi();
--- a/source/src/qt/machines/fmr30/menuclasses.h
+++ b/source/src/qt/machines/fmr30/menuclasses.h
@@ -9,6 +9,7 @@ QT_BEGIN_NAMESPACE
99
1010 class Ui_MainWindow;
1111 class USING_FLAGS;
12+class CSP_Logger;
1213 // wrote of Specific menu.
1314 class META_MainWindow : public Ui_MainWindow {
1415 Q_OBJECT
@@ -16,7 +17,7 @@ protected:
1617 void setupUI_Emu(void);
1718 void retranslateUi(void);
1819 public:
19- META_MainWindow(USING_FLAGS *p, QWidget *parent = 0);
20+ META_MainWindow(USING_FLAGS *p, CSP_Logger *logger, QWidget *parent = 0);
2021 ~META_MainWindow();
2122 public slots:
2223
Show on old repository browser