reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-01-27 14:08:03 +03:00
Code Issues Projects Releases Wiki Activity

Add md5.cpp to project.

Browse Source 
Add dedicated project to solution.
Warnings fixes.
This commit is contained in:
Lev 2017-03-08 06:10:42 +05:00
parent f8e2b5004c
commit f3cc1943af
4 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
msvc/ReHLDS.sln
View File

@ -21,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gradle", "gradle", "{FFC337
..\shared.gradle = ..\shared.gradle
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dedicated", "..\rehlds\dedicated\msvc\dedicated.vcxproj", "{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Play|Win32 = Debug Play|Win32
@ -95,6 +97,26 @@ Global
{792DF067-9904-4579-99B9-46C17277ADE3}.Test Fixes|Win32.Build.0 = Debug|Win32
{792DF067-9904-4579-99B9-46C17277ADE3}.Tests|Win32.ActiveCfg = Debug|Win32
{792DF067-9904-4579-99B9-46C17277ADE3}.Tests|Win32.Build.0 = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Play|Win32.ActiveCfg = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Play|Win32.Build.0 = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Record|Win32.ActiveCfg = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Record|Win32.Build.0 = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Swds Play|Win32.ActiveCfg = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Swds Play|Win32.Build.0 = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Swds|Win32.ActiveCfg = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug Swds|Win32.Build.0 = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug|Win32.ActiveCfg = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Debug|Win32.Build.0 = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Release Play|Win32.ActiveCfg = Release|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Release Play|Win32.Build.0 = Release|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Release Swds Play|Win32.ActiveCfg = Release|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Release Swds Play|Win32.Build.0 = Release|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Release|Win32.ActiveCfg = Release|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Release|Win32.Build.0 = Release|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Test Fixes|Win32.ActiveCfg = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Test Fixes|Win32.Build.0 = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Tests|Win32.ActiveCfg = Debug|Win32
{D49883F3-5C5C-4B9F-B9C7-B31518F228D4}.Tests|Win32.Build.0 = Debug|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

8
rehlds/engine/net_ws.cpp
View File

@ -1085,7 +1085,7 @@ DLL_EXPORT int NET_Sleep_Timeout(void)
int res;
if (numFrames > 0 && numFrames % staggerFrames)
{
int number = 0;
SOCKET number = 0;
for (int sock = 0; sock < 3; sock++)
{
@ -1109,7 +1109,7 @@ DLL_EXPORT int NET_Sleep_Timeout(void)
}
#endif // _WIN32
}
res = select(number + 1, &fdset, 0, 0, &tv);
res = select((int)(number + 1), &fdset, 0, 0, &tv);
}
else
{
@ -1123,7 +1123,7 @@ int NET_Sleep(void)
{
fd_set fdset;
struct timeval tv;
int number;
SOCKET number;
FD_ZERO(&fdset);
number = 0;
@ -1154,7 +1154,7 @@ int NET_Sleep(void)
tv.tv_sec = 0;
tv.tv_usec = 20 * 1000;
return select(number + 1, &fdset, 0, 0, net_sleepforever == 0 ? &tv : NULL);
return select((int)(number + 1), &fdset, 0, 0, net_sleepforever == 0 ? &tv : NULL);
}
void NET_StartThread(void)

3
rehlds/msvc/ReHLDS.vcxproj
View File

@ -65,6 +65,7 @@
<ClCompile Include="..\engine\ipratelimitWrapper.cpp" />
<ClCompile Include="..\engine\l_studio.cpp" />
<ClCompile Include="..\engine\mathlib.cpp" />
<ClCompile Include="..\engine\md5.cpp" />
<ClCompile Include="..\engine\mem.cpp" />
<ClCompile Include="..\engine\model.cpp" />
<ClCompile Include="..\engine\module.cpp" />
@ -1103,4 +1104,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

5
rehlds/msvc/ReHLDS.vcxproj.filters
View File

@ -352,6 +352,9 @@
<ClCompile Include="..\unittests\security_tests.cpp">
<Filter>unittests</Filter>
</ClCompile>
<ClCompile Include="..\engine\md5.cpp">
<Filter>engine\common</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\hookers\memory.h">
@ -1086,4 +1089,4 @@
<Filter>linux</Filter>
</None>
</ItemGroup>
</Project>
</Project>