Fix Ryzom client compile under MinGW
This commit is contained in:
parent
fa373017f8
commit
6fa7ddd5a4
4 changed files with 12 additions and 8 deletions
|
@ -3921,11 +3921,11 @@ NLMISC_COMMAND (url, "launch a browser to the specified url", "<url>")
|
|||
return false;
|
||||
|
||||
HINSTANCE result = ShellExecute(NULL, "open", args[0].c_str(), NULL,NULL, SW_SHOW);
|
||||
if ((sint32)result > 32)
|
||||
if ((intptr_t)result > 32)
|
||||
return true;
|
||||
else
|
||||
{
|
||||
log.displayNL ("ShellExecute failed %d", (uint32)result);
|
||||
log.displayNL ("ShellExecute failed %d", (uint32)(intptr_t)result);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -882,9 +882,9 @@ void prelogInit()
|
|||
UDriver::TDriver driver = UDriver::OpenGl;
|
||||
|
||||
#ifdef NL_OS_WINDOWS
|
||||
uint icon = (uint)LoadIcon(HInstance, MAKEINTRESOURCE(IDI_MAIN_ICON));
|
||||
uintptr_t icon = (uintptr_t)LoadIcon(HInstance, MAKEINTRESOURCE(IDI_MAIN_ICON));
|
||||
#else
|
||||
uint icon = 0;
|
||||
uintptr_t icon = 0;
|
||||
#endif // NL_OS_WINDOWS
|
||||
|
||||
switch(ClientCfg.Driver3D)
|
||||
|
|
|
@ -120,7 +120,9 @@
|
|||
// Foutez pas d'include du client ici svp ! Grrr ! Hulud
|
||||
|
||||
#ifdef NL_OS_WINDOWS
|
||||
#define NOMINMAX
|
||||
#include <WinSock2.h>
|
||||
#include <windows.h>
|
||||
# ifndef NL_COMP_MINGW
|
||||
# define NOMINMAX
|
||||
# endif
|
||||
# include <WinSock2.h>
|
||||
# include <windows.h>
|
||||
#endif // NL_OS_WINDOWS
|
||||
|
|
|
@ -67,7 +67,9 @@
|
|||
#include <nel/georges/load_form.h>
|
||||
|
||||
#ifdef NL_OS_WINDOWS
|
||||
# define NOMINMAX
|
||||
# ifndef NL_COMP_MINGW
|
||||
# define NOMINMAX
|
||||
# endif
|
||||
# include <WinSock2.h>
|
||||
# include <Windows.h>
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue