[Qt][BUILD] Fix some FTBFSs.

diff --git a/source/build-cmake/buildvars_mingw_cross_win32.dat b/source/build-cmake/buildvars_mingw_cross_win32.dat
index fe89562..69bb0e4 100644 (file)
--- a/source/build-cmake/buildvars_mingw_cross_win32.dat
+++ b/source/build-cmake/buildvars_mingw_cross_win32.dat
@@ -1,14 +1,14 @@
 #CMAKE=/usr/bin/cmake
 BUILD_TOOLCHAIN="GCC"
 
-BUILD_TYPE="Debug"
+BUILD_TYPE="Release"
 # "No" or "Yes".
 CSP_DEBUG="NO"
 # "No" or "Yes".
 USE_LTO="Yes"
 
 # No" or "Yes"
-STRIP_SYMBOLS="NO"
+STRIP_SYMBOLS="Yes"
 # "No" or "Yes"
 USE_RADICAL_OPTIMIZE="No"
 

diff --git a/source/build-cmake/params/buildvars_mingw_params_gcc.dat b/source/build-cmake/params/buildvars_mingw_params_gcc.dat
index cd83ee4..5735c93 100644 (file)
--- 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
        ;;
 esac
 
+#CMAKE_APPENDFLAG="-DUSE_QT5_4_APIS=ON -DUSE_MOVIE_LOADER=ON \
+
 CMAKE_APPENDFLAG="-DUSE_QT5_4_APIS=ON -DUSE_MOVIE_LOADER=ON \
                    -DUSE_MOVIE_SAVER=ON \
                    -DCMAKE_AR:STRING=i686-w64-mingw32-gcc-ar \

diff --git a/source/src/common.cpp b/source/src/common.cpp
index 0765c31..e120875 100644 (file)
--- 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)
 
 
 
-void cur_time_t::increment()
+void DLL_PREFIX cur_time_t::increment()
 {
        if(++second >= 60) {
                second = 0;
@@ -746,7 +746,7 @@ void cur_time_t::increment()
        }
 }
 
-void cur_time_t::update_year()
+void DLL_PREFIX cur_time_t::update_year()
 {
        // 1970-2069
        if(year < 70) {
@@ -756,7 +756,7 @@ void cur_time_t::update_year()
        }
 }
 
-void cur_time_t::update_day_of_week()
+void DLL_PREFIX cur_time_t::update_day_of_week()
 {
        static const int t[] = {0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4};
        int y = year - (month < 3);
@@ -765,7 +765,7 @@ void cur_time_t::update_day_of_week()
 
 #define STATE_VERSION  1
 
-void cur_time_t::save_state(void *f)
+void DLL_PREFIX cur_time_t::save_state(void *f)
 {
        FILEIO *state_fio = (FILEIO *)f;
        
@@ -781,7 +781,7 @@ void cur_time_t::save_state(void *f)
        state_fio->FputBool(initialized);
 }
 
-bool cur_time_t::load_state(void *f)
+bool DLL_PREFIX cur_time_t::load_state(void *f)
 {
        FILEIO *state_fio = (FILEIO *)f;
        

diff --git a/source/src/common.h b/source/src/common.h
index b2a38ae..35ff5a4 100644 (file)
--- 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);
 
 #define LEAP_YEAR(y)   (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
 
-typedef struct cur_time_s {
+typedef DLL_PREFIX struct cur_time_s {
        int year, month, day, day_of_week, hour, minute, second;
        bool initialized;
        cur_time_s()

diff --git a/source/src/qt/common/qt_utils.cpp b/source/src/qt/common/qt_utils.cpp
index fe25174..3744ff3 100644 (file)
--- 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)
 #endif
        csp_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_GENERAL, "DrawThread : Start.");
        connect(hDrawEmu, SIGNAL(sig_draw_frames(int)), hRunEmu, SLOT(print_framerate(int)));
+       //connect(emu->get_osd(), SIGNAL(sig_draw_frames(int)), hRunEmu, SLOT(print_framerate(int)));
        connect(hRunEmu, SIGNAL(window_title_changed(QString)), this, SLOT(do_set_window_title(QString)));
        connect(hDrawEmu, SIGNAL(message_changed(QString)), this, SLOT(message_status_bar(QString)));
        connect(actionCapture_Screen, SIGNAL(triggered()), glv, SLOT(do_save_frame_screen()));
                
        connect(hRunEmu, SIGNAL(sig_draw_thread(bool)), hDrawEmu, SLOT(doDraw(bool)), Qt::QueuedConnection);
+       //connect(hRunEmu, SIGNAL(sig_draw_thread(bool)), emu->get_osd(), SLOT(do_draw(bool)));
        //connect(hRunEmu, SIGNAL(quit_draw_thread()), hDrawEmu, SLOT(doExit()));
        connect(this, SIGNAL(quit_draw_thread()), hDrawEmu, SLOT(doExit()));
 

diff --git a/source/src/qt/machines/fmr30/MainWindow.cpp b/source/src/qt/machines/fmr30/MainWindow.cpp
index a7bb245..082eab9 100644 (file)
--- 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)
 }
 
 
-META_MainWindow::META_MainWindow(USING_FLAGS *p, QWidget *parent) : Ui_MainWindow(p, parent)
+META_MainWindow::META_MainWindow(USING_FLAGS *p, CSP_Logger *logger, QWidget *parent) : Ui_MainWindow(p, logger, parent)
 {
        setupUI_Emu();
        retranslateUi();

diff --git a/source/src/qt/machines/fmr30/menuclasses.h b/source/src/qt/machines/fmr30/menuclasses.h
index f6a3f3d..c15eb48 100644 (file)
--- a/source/src/qt/machines/fmr30/menuclasses.h
+++ b/source/src/qt/machines/fmr30/menuclasses.h
@@ -9,6 +9,7 @@ QT_BEGIN_NAMESPACE
 
 class Ui_MainWindow;
 class USING_FLAGS;
+class CSP_Logger;
 //  wrote of Specific menu.
 class META_MainWindow : public Ui_MainWindow {
        Q_OBJECT
@@ -16,7 +17,7 @@ protected:
        void setupUI_Emu(void);
        void retranslateUi(void);
 public:
-       META_MainWindow(USING_FLAGS *p, QWidget *parent = 0);
+       META_MainWindow(USING_FLAGS *p, CSP_Logger *logger, QWidget *parent = 0);
        ~META_MainWindow();
 public slots: