Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fix Ryzom client compile under MinGW

Browse source
This commit is contained in:
kaetemi 2014-06-19 01:17:35 +02:00
parent 7adf98e8a7
commit 2e096a9b36
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/client/src/commands.cpp
View file

@ -3921,11 +3921,11 @@ NLMISC_COMMAND (url, "launch a browser to the specified url", "<url>")
return false; return false;
HINSTANCE result = ShellExecute(NULL, "open", args[0].c_str(), NULL,NULL, SW_SHOW); HINSTANCE result = ShellExecute(NULL, "open", args[0].c_str(), NULL,NULL, SW_SHOW);
if ((sint32)result > 32) if ((intptr_t)result > 32)
return true; return true;
else else
{ {
log.displayNL ("ShellExecute failed %d", (uint32)result); log.displayNL ("ShellExecute failed %d", (uint32)(intptr_t)result);
return false; return false;
} }
} }

4
code/ryzom/client/src/init.cpp
View file

@ -882,9 +882,9 @@ void prelogInit()
UDriver::TDriver driver = UDriver::OpenGl; UDriver::TDriver driver = UDriver::OpenGl;
#ifdef NL_OS_WINDOWS #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 #else
uint icon = 0; uintptr_t icon = 0;
#endif // NL_OS_WINDOWS #endif // NL_OS_WINDOWS
switch(ClientCfg.Driver3D) switch(ClientCfg.Driver3D)

8
code/ryzom/client/src/stdpch.h
View file

@ -120,7 +120,9 @@
// Foutez pas d'include du client ici svp ! Grrr ! Hulud // Foutez pas d'include du client ici svp ! Grrr ! Hulud
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
#define NOMINMAX # ifndef NL_COMP_MINGW
#include <WinSock2.h> # define NOMINMAX
#include <windows.h> # endif
# include <WinSock2.h>
# include <windows.h>
#endif // NL_OS_WINDOWS #endif // NL_OS_WINDOWS

2
code/ryzom/common/src/game_share/stdpch.h
View file

@ -67,7 +67,9 @@
#include <nel/georges/load_form.h> #include <nel/georges/load_form.h>
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
# ifndef NL_COMP_MINGW
# define NOMINMAX # define NOMINMAX
# endif
# include <WinSock2.h> # include <WinSock2.h>
# include <Windows.h> # include <Windows.h>
#endif #endif