forked from bartvdbraak/blender
fix mingw compile
- seems to have been conflicting #defines for INT, solved by moving #include up
This commit is contained in:
parent
ea183b58d3
commit
c468f94f53
@ -37,6 +37,14 @@
|
||||
#include "GHOST_SystemWin32.h"
|
||||
#include "GHOST_EventDragnDrop.h"
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#ifdef _WIN32_IE
|
||||
#undef _WIN32_IE
|
||||
#endif
|
||||
#define _WIN32_IE 0x0501
|
||||
#include <windows.h>
|
||||
#include <shlobj.h>
|
||||
|
||||
// win64 doesn't define GWL_USERDATA
|
||||
#ifdef WIN32
|
||||
#ifndef GWL_USERDATA
|
||||
@ -88,8 +96,6 @@
|
||||
#include "GHOST_WindowWin32.h"
|
||||
#include "GHOST_NDOFManager.h"
|
||||
|
||||
#include <shlobj.h>
|
||||
|
||||
// Key code values not found in winuser.h
|
||||
#ifndef VK_MINUS
|
||||
#define VK_MINUS 0xBD
|
||||
@ -1129,4 +1135,4 @@ const GHOST_TUns8* GHOST_SystemWin32::getBinaryDir() const
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user