mirror of
				https://github.com/davidgiven/fluxengine.git
				synced 2025-10-24 11:11:02 -07:00 
			
		
		
		
	Adjust header order so that things build on Windows.
This commit is contained in:
		| @@ -1,6 +1,8 @@ | ||||
| #ifndef RENDEZVOUS_H | ||||
| #define RENDEZVOUS_H | ||||
|  | ||||
| #include <wx/wx.h> | ||||
|  | ||||
| extern void runOnUiThread(std::function<void()> callback); | ||||
| extern void runOnWorkerThread(std::function<void()> callback); | ||||
|  | ||||
|   | ||||
| @@ -1,7 +1,6 @@ | ||||
| #include "globals.h" | ||||
| #include <wx/wx.h> | ||||
| #include "mainwindow.h" | ||||
| #include "gui.h" | ||||
| #include "mainwindow.h" | ||||
| #include "utils.h" | ||||
|  | ||||
| class MyApp; | ||||
|   | ||||
| @@ -8,11 +8,9 @@ | ||||
| #include "lib/usb/usbfinder.h" | ||||
| #include "fmt/format.h" | ||||
| #include "utils.h" | ||||
| #include <wx/wx.h> | ||||
| #include "mainwindow.h" | ||||
| #include <google/protobuf/text_format.h> | ||||
|  | ||||
|  | ||||
| extern const std::map<std::string, std::string> formats; | ||||
|  | ||||
| MainWindow::MainWindow(): MainWindowGen(nullptr) | ||||
|   | ||||
| @@ -1,10 +1,10 @@ | ||||
| #include "globals.h" | ||||
| #include "gui.h" | ||||
| #include "visualisation.h" | ||||
| #include "fluxmap.h" | ||||
| #include "flux.h" | ||||
| #include "sector.h" | ||||
| #include "fmt/format.h" | ||||
| #include <wx/wx.h> | ||||
|  | ||||
| #define BORDER 20 | ||||
| #define TICK 3 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user