Adjust header order so that things build on Windows.

This commit is contained in:
David Given
2022-02-26 13:33:00 +00:00
parent 1d7a75c7b3
commit f1c60b7177
4 changed files with 4 additions and 5 deletions

View File

@@ -1,6 +1,8 @@
#ifndef RENDEZVOUS_H #ifndef RENDEZVOUS_H
#define RENDEZVOUS_H #define RENDEZVOUS_H
#include <wx/wx.h>
extern void runOnUiThread(std::function<void()> callback); extern void runOnUiThread(std::function<void()> callback);
extern void runOnWorkerThread(std::function<void()> callback); extern void runOnWorkerThread(std::function<void()> callback);

View File

@@ -1,7 +1,6 @@
#include "globals.h" #include "globals.h"
#include <wx/wx.h>
#include "mainwindow.h"
#include "gui.h" #include "gui.h"
#include "mainwindow.h"
#include "utils.h" #include "utils.h"
class MyApp; class MyApp;

View File

@@ -8,11 +8,9 @@
#include "lib/usb/usbfinder.h" #include "lib/usb/usbfinder.h"
#include "fmt/format.h" #include "fmt/format.h"
#include "utils.h" #include "utils.h"
#include <wx/wx.h>
#include "mainwindow.h" #include "mainwindow.h"
#include <google/protobuf/text_format.h> #include <google/protobuf/text_format.h>
extern const std::map<std::string, std::string> formats; extern const std::map<std::string, std::string> formats;
MainWindow::MainWindow(): MainWindowGen(nullptr) MainWindow::MainWindow(): MainWindowGen(nullptr)

View File

@@ -1,10 +1,10 @@
#include "globals.h" #include "globals.h"
#include "gui.h"
#include "visualisation.h" #include "visualisation.h"
#include "fluxmap.h" #include "fluxmap.h"
#include "flux.h" #include "flux.h"
#include "sector.h" #include "sector.h"
#include "fmt/format.h" #include "fmt/format.h"
#include <wx/wx.h>
#define BORDER 20 #define BORDER 20
#define TICK 3 #define TICK 3