RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-10 14:12:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix MinGW build

Browse Source
This commit is contained in:
lewa_j
2018-05-13 23:25:51 +03:00
parent 42b4e456a2
commit 43b746d2f8
6 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/platform/sdl/vid_sdl.c
+2 -1
View File
@@ -302,7 +302,7 @@ static void WIN_SetDPIAwareness( void )
MsgDev( D_NOTE, "SetDPIAwareness: Success\n" );
bSuccess = TRUE;
}
else if( hResult = E_INVALIDARG ) MsgDev( D_NOTE, "SetDPIAwareness: Invalid argument\n" );
else if( hResult == E_INVALIDARG ) MsgDev( D_NOTE, "SetDPIAwareness: Invalid argument\n" );
else if( hResult == E_ACCESSDENIED ) MsgDev( D_NOTE, "SetDPIAwareness: Access Denied\n" );
}
else MsgDev( D_NOTE, "SetDPIAwareness: Can't get SetProcessDpiAwareness\n" );
@@ -540,6 +540,7 @@ void VID_RestoreScreenResolution( void )
}
#if defined(_WIN32) && !defined(XASH_64BIT) // ICO support only for Win32
#include "SDL_syswm.h"
static void WIN_SetWindowIcon( HICON ico )
{
SDL_SysWMinfo wminfo;
engine/platform/win32/win_con.c
+2 -2
View File
@@ -270,7 +270,7 @@ void Wcon_CreateConsole( void )
string FontName;
wc.style = 0;
wc.lpfnWndProc = (WNDPROC)Con_WndProc;
wc.lpfnWndProc = (WNDPROC)Wcon_WndProc;
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
wc.hInstance = host.hInst;
@@ -384,7 +384,7 @@ register console commands (dedicated only)
void Wcon_InitConsoleCommands( void )
{
if( host.type != HOST_DEDICATED ) return;
Cmd_AddCommand( "clear", Con_Clear_f, "clear console history" );
Cmd_AddCommand( "clear", Wcon_Clear_f, "clear console history" );
}
/*
engine/platform/win32/win_lib.c
+2 -2
View File
@@ -915,7 +915,7 @@ void COM_FreeLibrary( void *hInstance )
Mem_Free( hInst ); // done
}
dword COM_FunctionFromName( void *hInstance, const char *pName )
void *COM_FunctionFromName( void *hInstance, const char *pName )
{
dll_user_t *hInst = (dll_user_t *)hInstance;
int i, index;
@@ -938,7 +938,7 @@ dword COM_FunctionFromName( void *hInstance, const char *pName )
return 0;
}
const char *COM_NameForFunction( void *hInstance, dword function )
const char *COM_NameForFunction( void *hInstance, void *function )
{
dll_user_t *hInst = (dll_user_t *)hInstance;
int i, index;