Rename xash.dll to xash_sdl.dll

FWGS · Dec 8, 2015 · 94d29ea · 94d29ea
1 parent 04ffac8
commit 94d29ea
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -42,13 +42,13 @@
     <IncludePath>$(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)</IncludePath>
     <LibraryPath>common\soundlib;..\..\SDL2\lib\x86;..\..\halflife\utils\vgui\lib\win32_vc6;$(LibraryPath)</LibraryPath>
     <TargetExt>.dll</TargetExt>
-    <TargetName>xash</TargetName>
+    <TargetName>xash_sdl</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <IncludePath>$(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)</IncludePath>
     <LibraryPath>common\soundlib;..\..\SDL2\lib\x86;..\..\halflife\utils\vgui\lib\win32_vc6;$(LibraryPath)</LibraryPath>
     <TargetExt>.dll</TargetExt>
-    <TargetName>xash</TargetName>
+    <TargetName>xash_sdl</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git 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
@@ -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