qt: Fix windows clang & vcpkg build
This commit is contained in:
@@ -107,6 +107,11 @@ add_library(ui STATIC
|
|||||||
../qt_resources.qrc
|
../qt_resources.qrc
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(NOT MINGW)
|
||||||
|
target_sources(plat PRIVATE ../win/win_opendir.c)
|
||||||
|
target_sources(plat PRIVATE ../nvr.c)
|
||||||
|
endif()
|
||||||
|
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
target_sources(ui PRIVATE macos_event_filter.mm)
|
target_sources(ui PRIVATE macos_event_filter.mm)
|
||||||
endif()
|
endif()
|
||||||
|
@@ -2,8 +2,9 @@
|
|||||||
* C functionality for Qt platform, where the C equivalent is not easily
|
* C functionality for Qt platform, where the C equivalent is not easily
|
||||||
* implemented in Qt
|
* implemented in Qt
|
||||||
*/
|
*/
|
||||||
|
#ifdef __MINGW32__
|
||||||
#include <strings.h>
|
#include <strings.h>
|
||||||
|
#endif
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <wchar.h>
|
#include <wchar.h>
|
||||||
|
|
||||||
|
@@ -33,10 +33,13 @@ Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin)
|
|||||||
#define VC(x) const_cast<wchar_t*>(x)
|
#define VC(x) const_cast<wchar_t*>(x)
|
||||||
|
|
||||||
extern QElapsedTimer elapsed_timer;
|
extern QElapsedTimer elapsed_timer;
|
||||||
extern int nvr_dosave;
|
|
||||||
extern MainWindow* main_window;
|
extern MainWindow* main_window;
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
#define new not_new
|
||||||
|
#include <86box/timer.h>
|
||||||
|
#include <86box/nvr.h>
|
||||||
|
#undef new
|
||||||
extern int qt_nvr_save(void);
|
extern int qt_nvr_save(void);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -48,6 +48,7 @@ private:
|
|||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#ifdef Q_OS_WINDOWS
|
#ifdef Q_OS_WINDOWS
|
||||||
|
#define NOMINMAX
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif
|
#endif
|
||||||
#include <86box/86box.h>
|
#include <86box/86box.h>
|
||||||
|
@@ -9,6 +9,7 @@
|
|||||||
"libpng",
|
"libpng",
|
||||||
"openal-soft",
|
"openal-soft",
|
||||||
"sdl2",
|
"sdl2",
|
||||||
"rtmidi"
|
"rtmidi",
|
||||||
|
"qt5"
|
||||||
]
|
]
|
||||||
}
|
}
|
Reference in New Issue
Block a user