diff --git a/engine/common/input.c b/engine/common/input.c index d4073239e..69c345827 100644 --- a/engine/common/input.c +++ b/engine/common/input.c @@ -479,6 +479,7 @@ void IN_MouseEvent( int mstate ) { SDL_SetRelativeMouseMode( SDL_FALSE ); SDL_ShowCursor( SDL_TRUE ); + } else SDL_SetRelativeMouseMode( SDL_TRUE ); } diff --git a/engine/engine.vcxproj b/engine/engine.vcxproj index 1b00afec2..e5d0fd7b5 100644 --- a/engine/engine.vcxproj +++ b/engine/engine.vcxproj @@ -42,13 +42,13 @@ $(ProjectDir);common\sdl;client;common;server;client/imagelib;client/vgui;client/soundlib;..\..\SDL2\include;..\common;../pm_shared;../../halflife/utils/vgui/include;../../halflife/public;$(WindowsSDK_IncludePath);$(VC_IncludePath) common\soundlib;..\..\SDL2\lib\x86;..\..\halflife\utils\vgui\lib\win32_vc6;$(LibraryPath) .dll - xash + xash_sdl $(ProjectDir);common\sdl;client;common;server;client/imagelib;client/vgui;client/soundlib;..\..\SDL2\include;..\common;../pm_shared;../../halflife/utils/vgui/include;../../halflife/public;$(WindowsSDK_IncludePath);$(VC_IncludePath) common\soundlib;..\..\SDL2\lib\x86;..\..\halflife\utils\vgui\lib\win32_vc6;$(LibraryPath) .dll - xash + xash_sdl diff --git a/game_launch/xash.c b/game_launch/xash.c index 66b7bbb95..8ecb66062 100644 --- a/game_launch/xash.c +++ b/game_launch/xash.c @@ -45,7 +45,11 @@ GNU General Public License for more details. #define dlmount(x) LoadLibraryA(x) #define dlclose(x) FreeLibrary(x) #define dlsym(x,y) GetProcAddress(x,y) - #define XASHLIB "xash.dll" +#ifdef XASH_SDL + #define XASHLIB "xash_sdl.dll" +#else + #define XASHLIB "xash_dedicated.dll" +#endif #include "windows.h" #endif diff --git a/msvc6/build.bat b/msvc6/build.bat index 8479e3bf4..ed01aa16c 100644 --- a/msvc6/build.bat +++ b/msvc6/build.bat @@ -1,3 +1,3 @@ ren common\common.c common\host_common.c ren common\soundlib\libmpg\common.c common\soundlib\libmpg\mpg_common.c -cl -o xash.dll /DEBUG /Zi /DLL /W3 /Gm /GD /G6 /LD /O2 /MD /O2 /D_USRDLL /D_WINDLL *\*.c client\vgui\*.c common\soundlib\*.c common\soundlib\libmpg\*.c common\imagelib\*.c common\sdl\events.c -I ../msvc6/ -I ../SDL2-2.0.3/include/ -Icommon -I../common -I. -I../pm_shared -Iclient -Iserver -Iclient/vgui -Icommon/sdl -DXASH_VGUI -DXASH_SDL /link /DLL user32.lib shell32.lib gdi32.lib msvcrt.lib winmm.lib /nodefaultlib:"libc.lib" /subsystem:windows ../SDL2-2.0.3/lib/x86/SDL2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /DEBUG +cl -o xash_sdl.dll /DEBUG /Zi /DLL /W3 /Gm /GD /G6 /LD /O2 /MD /O2 /D_USRDLL /D_WINDLL *\*.c client\vgui\*.c common\soundlib\*.c common\soundlib\libmpg\*.c common\imagelib\*.c common\sdl\events.c -I ../msvc6/ -I ../SDL2-2.0.3/include/ -Icommon -I../common -I. -I../pm_shared -Iclient -Iserver -Iclient/vgui -Icommon/sdl -DXASH_VGUI -DXASH_SDL /link /DLL user32.lib shell32.lib gdi32.lib msvcrt.lib winmm.lib /nodefaultlib:"libc.lib" /subsystem:windows ../SDL2-2.0.3/lib/x86/SDL2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /DEBUG