Skip to content

Commit 44ad95e

Browse files
committed
lmu2png: Fix Windows build by changing the header include order (FreeImage include conflicts with WinApi Header)
1 parent 1cc4f8a commit 44ad95e

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

lmu2png/src/main.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,21 @@
2323
#include <map>
2424
#include <algorithm>
2525
#include <argparse.hpp>
26-
#include <FreeImage.h>
2726
#include <lcf/reader_lcf.h>
2827
#include <lcf/ldb/reader.h>
2928
#include <lcf/lmu/reader.h>
29+
30+
// Must be before FreeImage because of Windows header conflicts
31+
#ifdef WITH_GUI
32+
# include "gui.h"
33+
#endif
34+
35+
#include <FreeImage.h>
36+
3037
#include "chipset.h"
3138
#include "xyzplugin.h"
3239
#include "main.h"
3340
#include "utils.h"
34-
#ifdef WITH_GUI
35-
#include "gui.h"
36-
#endif
3741

3842
void MyFreeImageMessageHandler(FREE_IMAGE_FORMAT /* fif */, const char *message) {
3943
std::cout << "FreeImage error: " << message << "\n";

0 commit comments

Comments
 (0)