R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler error + rename debug dll's

Browse Source 
Rename for easier debugging and config separation
This commit is contained in:
Amos 2022-01-09 16:29:36 +01:00
parent c292d8ad46
commit 19f5010bd2
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/dedicated.vcxproj
View File

@ -374,7 +374,7 @@
<ClCompile Include="engine\sys_utils.cpp" />
<ClCompile Include="launcher\IApplication.cpp" />
<ClCompile Include="mathlib\adler32.cpp" />
<ClCompile Include="mathlib\bits.c" />
<ClCompile Include="mathlib\bits.cpp" />
<ClCompile Include="mathlib\crc32.cpp" />
<ClCompile Include="mathlib\IceKey.cpp" />
<ClCompile Include="networksystem\r5net.cpp" />

2
r5dev/dedicated.vcxproj.filters
View File

@ -860,7 +860,7 @@
<ClCompile Include="thirdparty\lzham\lzhamdecomp\lzham_lzdecompbase.cpp">
<Filter>thirdparty\lzham\lzhamdecomp</Filter>
</ClCompile>
<ClCompile Include="mathlib\bits.c">
<ClCompile Include="mathlib\bits.cpp">
<Filter>sdk\mathlib</Filter>
</ClCompile>
</ItemGroup>

4
r5dev/r5dev.vcxproj
View File

@ -497,7 +497,7 @@
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);$(DXSDK_DIR)Include</IncludePath>
<LibraryPath>$(SolutionDir)r5dev\thirdparty\detours\libs;$(SolutionDir)r5dev\thirdparty\lzham\libs;$(LibraryPath);$(DXSDK_DIR)Lib\x64</LibraryPath>
<TargetName>r5apexvtxd</TargetName>
<TargetName>r5apexsdkd</TargetName>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<ReferencePath>$(VC_ReferencesPath_x64);</ReferencePath>
@ -568,7 +568,7 @@
<AdditionalDependencies>d3d11.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy /Y "$(TargetPath)" "..\..\..\bin\$(TargetFileName)"</Command>
<Command>copy /Y "$(TargetPath)" "..\..\..\$(TargetFileName)" &amp;&amp; del "..\..\..\r5apexsdkd64.dll" &amp;&amp; rename "..\..\..\$(TargetFileName)" "r5apexsdkd64.dll"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

4
r5dev/sdklauncher/sdklauncher.cpp
View File

@ -56,7 +56,7 @@ bool LaunchR5Apex(LAUNCHMODE lMode, LAUNCHSTATE lState)
}
cfgFile.close(); // Close cfg file.
WorkerDll = currentDirectory + "\\bin\\r5apexvtxd.dll"; // Get path to worker dll.
WorkerDll = currentDirectory + "\\r5apexsdkd64.dll"; // Get path to worker dll.
GameDirectory = currentDirectory + "\\r5apex.exe"; // Get path to game executeable.
StartupCommandLine = currentDirectory + "\\r5apex.exe " + CommandLineArguments; // Setup startup command line string.
@ -106,7 +106,7 @@ bool LaunchR5Apex(LAUNCHMODE lMode, LAUNCHSTATE lState)
}
cfgFile.close(); // Close cfg file.
WorkerDll = currentDirectory + "\\dedicated.dll"; // Get path to worker dll.
WorkerDll = currentDirectory + "\\dedicated.dll"; // Get path to worker dll.
GameDirectory = currentDirectory + "\\r5apex_ds.exe"; // Get path to game executeable.
StartupCommandLine = currentDirectory + "\\r5apex_ds.exe " + CommandLineArguments; // Setup startup command line string.

2
r5dev/tier0/IConVar.cpp
View File

@ -417,7 +417,7 @@ void ConVar::SetDefault(const char* pszDefault)
//-----------------------------------------------------------------------------
void ConVar::ChangeStringValue(const char* pszTempVal, float flOldValue)
{
assert(!(m_nFlags & FCVAR_NEVER_AS_STRING));
assert(!(m_ConCommandBase.m_nFlags & FCVAR_NEVER_AS_STRING));
char* pszOldValue = (char*)_malloca(m_iStringLength);
if (pszOldValue != NULL)