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

Move static libraries to dedicated location

Browse Source 
Also compile Detours as static library instead
This commit is contained in:
Amos 2022-02-22 19:37:56 +01:00
parent c6cf40f539
commit 4cb1f7927b
13 changed files with 546 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -28,6 +28,7 @@ x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]ib/
[Ll]og/
[Ll]ogs/

41
r5dev/vproj/dedicated.vcxproj
View File

@ -81,14 +81,14 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<LibraryPath>$(SolutionDir)r5dev\thirdparty\detours\libs;$(SolutionDir)r5dev\thirdparty\lzham\libs;$(LibraryPath);</LibraryPath>
<LibraryPath>$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<LibraryPath>$(SolutionDir)r5dev\thirdparty\detours\libs;$(SolutionDir)r5dev\thirdparty\lzham\libs;$(LibraryPath);</LibraryPath>
<LibraryPath>$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
</PropertyGroup>
@ -135,8 +135,8 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>User32.lib;bcrypt.lib;libprotobuf_x64.lib;liblzham_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)bin\$(Configuration)\</AdditionalLibraryDirectories>
<AdditionalDependencies>bcrypt.lib;user32.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
<ModuleDefinitionFile>..\Dedicated.def</ModuleDefinitionFile>
</Link>
<PostBuildEvent>
@ -168,8 +168,8 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>User32.lib;bcrypt.lib;libprotobuf_x64.lib;liblzham_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)bin\$(Configuration)\</AdditionalLibraryDirectories>
<AdditionalDependencies>bcrypt.lib;user32.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
<ModuleDefinitionFile>..\Dedicated.def</ModuleDefinitionFile>
</Link>
<PostBuildEvent>
@ -252,6 +252,35 @@
<ClInclude Include="..\thirdparty\detours\include\detver.h" />
<ClInclude Include="..\thirdparty\detours\include\idetour.h" />
<ClInclude Include="..\thirdparty\detours\include\syelog.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_assert.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_checksum.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_config.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_core.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_helpers.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_huffman_codes.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_lzbase.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_match_accel.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_math.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_mem.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_null_threading.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_platform.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_polar_codes.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_prefix_coding.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_pthreads_threading.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_static_lib.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_symbol_codec.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_threading.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_timer.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_traits.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_types.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_utils.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_vector.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_win32_threading.h" />
<ClInclude Include="..\thirdparty\lzham\lzhamcomp\lzham_comp.h" />
<ClInclude Include="..\thirdparty\lzham\lzhamcomp\lzham_lzcomp_internal.h" />
<ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_decomp.h" />
<ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_lzdecompbase.h" />
<ClInclude Include="..\thirdparty\spdlog\include\async.h" />
<ClInclude Include="..\thirdparty\spdlog\include\async_logger-inl.h" />
<ClInclude Include="..\thirdparty\spdlog\include\async_logger.h" />

105
r5dev/vproj/dedicated.vcxproj.filters
View File

@ -112,6 +112,24 @@
<Filter Include="sdk\appframework">
<UniqueIdentifier>{888e265d-d431-4c9c-8d1a-e8a3639c9fbd}</UniqueIdentifier>
</Filter>
<Filter Include="thirdparty\lzham">
<UniqueIdentifier>{5648c1a1-99dd-4532-af6d-0ce6132a10ef}</UniqueIdentifier>
</Filter>
<Filter Include="thirdparty\lzham\include">
<UniqueIdentifier>{9faa91f6-4a34-4a90-b956-eb482f38617d}</UniqueIdentifier>
</Filter>
<Filter Include="thirdparty\lzham\lzhamcomp">
<UniqueIdentifier>{ffe79a0d-71dd-46aa-9a1c-6d87dc441f05}</UniqueIdentifier>
</Filter>
<Filter Include="thirdparty\lzham\lzhamcomp\include">
<UniqueIdentifier>{ed2f5f72-7ef5-49ff-bed2-13e2b5d6eabe}</UniqueIdentifier>
</Filter>
<Filter Include="thirdparty\lzham\lzhamdecomp">
<UniqueIdentifier>{6139087a-fe2d-4a77-aab9-64fcb8c4e472}</UniqueIdentifier>
</Filter>
<Filter Include="thirdparty\lzham\lzhamdecomp\include">
<UniqueIdentifier>{40c41a94-4e9d-439f-9b16-68531ecc03a8}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\client.h">
@ -660,6 +678,93 @@
<ClInclude Include="..\appframework\engine_launcher_api.h">
<Filter>sdk\appframework</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_assert.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_checksum.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_config.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_core.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_helpers.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_huffman_codes.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_lzbase.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_match_accel.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_math.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_mem.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_null_threading.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_platform.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_polar_codes.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_prefix_coding.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_pthreads_threading.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_static_lib.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_symbol_codec.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_threading.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_timer.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_traits.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_types.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_utils.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_vector.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_win32_threading.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\lzhamcomp\lzham_comp.h">
<Filter>thirdparty\lzham\lzhamcomp\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\lzhamcomp\lzham_lzcomp_internal.h">
<Filter>thirdparty\lzham\lzhamcomp\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_decomp.h">
<Filter>thirdparty\lzham\lzhamdecomp\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_lzdecompbase.h">
<Filter>thirdparty\lzham\lzhamdecomp\include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\client\IVEngineClient.cpp">

41
r5dev/vproj/gamesdk.vcxproj
View File

@ -243,6 +243,35 @@
<ClInclude Include="..\thirdparty\imgui\include\imstb_rectpack.h" />
<ClInclude Include="..\thirdparty\imgui\include\imstb_textedit.h" />
<ClInclude Include="..\thirdparty\imgui\include\imstb_truetype.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_assert.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_checksum.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_config.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_core.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_helpers.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_huffman_codes.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_lzbase.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_match_accel.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_math.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_mem.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_null_threading.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_platform.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_polar_codes.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_prefix_coding.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_pthreads_threading.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_static_lib.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_symbol_codec.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_threading.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_timer.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_traits.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_types.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_utils.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_vector.h" />
<ClInclude Include="..\thirdparty\lzham\include\lzham_win32_threading.h" />
<ClInclude Include="..\thirdparty\lzham\lzhamcomp\lzham_comp.h" />
<ClInclude Include="..\thirdparty\lzham\lzhamcomp\lzham_lzcomp_internal.h" />
<ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_decomp.h" />
<ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_lzdecompbase.h" />
<ClInclude Include="..\thirdparty\spdlog\include\async.h" />
<ClInclude Include="..\thirdparty\spdlog\include\async_logger-inl.h" />
<ClInclude Include="..\thirdparty\spdlog\include\async_logger.h" />
@ -437,7 +466,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<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>
<LibraryPath>$(LibraryPath);$(DXSDK_DIR)Lib\x64</LibraryPath>
<TargetName>r5apexsdkd64</TargetName>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
@ -446,7 +475,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</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>
<LibraryPath>$(LibraryPath);$(DXSDK_DIR)Lib\x64</LibraryPath>
<TargetName>r5apexsdkd64</TargetName>
<ReferencePath>$(VC_ReferencesPath_x64);</ReferencePath>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
@ -506,8 +535,8 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<ModuleDefinitionFile>..\GameSDK.def</ModuleDefinitionFile>
<AdditionalDependencies>d3d11.lib;bcrypt.lib;libprotobuf_x64.lib;liblzham_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)bin\$(Configuration)\</AdditionalLibraryDirectories>
<AdditionalDependencies>d3d11.lib;bcrypt.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\$(ProjectName)" &amp;&amp; copy /Y "$(TargetPath)" "$(SolutionDir)..\..\</Command>
@ -547,8 +576,8 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<ModuleDefinitionFile>..\GameSDK.def</ModuleDefinitionFile>
<AdditionalDependencies>d3d11.lib;bcrypt.lib;libprotobuf_x64.lib;liblzham_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)bin\$(Configuration)\</AdditionalLibraryDirectories>
<AdditionalDependencies>d3d11.lib;bcrypt.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\$(ProjectName)" &amp;&amp; copy /Y "$(TargetPath)" "$(SolutionDir)..\..\</Command>

105
r5dev/vproj/gamesdk.vcxproj.filters
View File

@ -142,6 +142,24 @@
<Filter Include="sdk\appframework">
<UniqueIdentifier>{cd141b6d-58a2-4b7d-afc9-32195cd9aa3c}</UniqueIdentifier>
</Filter>
<Filter Include="thirdparty\lzham">
<UniqueIdentifier>{75f3cdf7-cbe5-4138-90b1-24492f570abb}</UniqueIdentifier>
</Filter>
<Filter Include="thirdparty\lzham\include">
<UniqueIdentifier>{7fdf29d5-bc3d-41f4-8788-7ad63e4f9a13}</UniqueIdentifier>
</Filter>
<Filter Include="thirdparty\lzham\lzhamcomp">
<UniqueIdentifier>{9432e37b-2460-491e-96cb-ac0cfb477581}</UniqueIdentifier>
</Filter>
<Filter Include="thirdparty\lzham\lzhamcomp\include">
<UniqueIdentifier>{d82555e7-9f83-444b-ba0d-7e309e08ce73}</UniqueIdentifier>
</Filter>
<Filter Include="thirdparty\lzham\lzhamdecomp">
<UniqueIdentifier>{5f9f0e7f-9bfb-4303-9bb6-fdce3bd23f23}</UniqueIdentifier>
</Filter>
<Filter Include="thirdparty\lzham\lzhamdecomp\include">
<UniqueIdentifier>{3446634c-a632-4281-a500-459a56668a6b}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\client\client.cpp">
@ -1022,6 +1040,93 @@
<ClInclude Include="..\appframework\engine_launcher_api.h">
<Filter>sdk\appframework</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_assert.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_checksum.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_config.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_core.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_helpers.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_huffman_codes.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_lzbase.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_match_accel.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_math.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_mem.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_null_threading.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_platform.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_polar_codes.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_prefix_coding.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_pthreads_threading.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_static_lib.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_symbol_codec.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_threading.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_timer.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_traits.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_types.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_utils.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_vector.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\include\lzham_win32_threading.h">
<Filter>thirdparty\lzham\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\lzhamcomp\lzham_comp.h">
<Filter>thirdparty\lzham\lzhamcomp\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\lzhamcomp\lzham_lzcomp_internal.h">
<Filter>thirdparty\lzham\lzhamcomp\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_decomp.h">
<Filter>thirdparty\lzham\lzhamdecomp\include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_lzdecompbase.h">
<Filter>thirdparty\lzham\lzhamdecomp\include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">

204
r5dev/vproj/libdetours.vcxproj Normal file
View File

@ -0,0 +1,204 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\thirdparty\detours\include\detours.h" />
<ClInclude Include="..\thirdparty\detours\include\detver.h" />
<ClInclude Include="..\thirdparty\detours\include\idetour.h" />
<ClInclude Include="..\thirdparty\detours\include\syelog.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\thirdparty\detours\src\creatwth.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\thirdparty\detours\src\detours.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\thirdparty\detours\src\disasm.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\thirdparty\detours\src\modules.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}</ProjectGuid>
<RootNamespace>libdetours</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Static</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Static</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Static</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Static</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)lib\$(Configuration)\</OutDir>
<TargetName>libdetours_x86</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)lib\$(Configuration)\</OutDir>
<TargetName>libdetours_x86</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)lib\$(Configuration)\</OutDir>
<TargetName>libdetours_x64</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)lib\$(Configuration)\</OutDir>
<TargetName>libdetours_x64</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

28
r5dev/vproj/libdetours.vcxproj.filters Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
<UniqueIdentifier>{50abaf44-bd51-4c7a-a050-949827ec8d0e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\thirdparty\detours\include\detours.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\detours\include\detver.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\detours\include\idetour.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\thirdparty\detours\include\syelog.h">
<Filter>include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\thirdparty\detours\src\creatwth.cpp" />
<ClCompile Include="..\thirdparty\detours\src\detours.cpp" />
<ClCompile Include="..\thirdparty\detours\src\disasm.cpp" />
<ClCompile Include="..\thirdparty\detours\src\modules.cpp" />
</ItemGroup>
</Project>

8
r5dev/vproj/liblzham.vcxproj
View File

@ -231,28 +231,28 @@
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)lib\$(Configuration)\</OutDir>
<TargetName>liblzham_x86</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)lib\$(Configuration)\</OutDir>
<TargetName>liblzham_x86</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)lib\$(Configuration)\</OutDir>
<TargetName>liblzham_x64</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)lib\$(Configuration)\</OutDir>
<TargetName>liblzham_x64</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

8
r5dev/vproj/libprotobuf.vcxproj
View File

@ -78,28 +78,28 @@
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)lib\$(Configuration)\</OutDir>
<TargetName>libprotobuf_x86</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)lib\$(Configuration)\</OutDir>
<TargetName>libprotobuf_x86</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)lib\$(Configuration)\</OutDir>
<TargetName>libprotobuf_x64</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)lib\$(Configuration)\</OutDir>
<TargetName>libprotobuf_x64</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

8
r5dev/vproj/netconsole.vcxproj
View File

@ -153,7 +153,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>User32.lib;Bcrypt.lib;Ws2_32.lib;libprotobuf_x86d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)bin\$(Configuration)\</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
</Link>
<PreBuildEvent>
<Command>
@ -179,7 +179,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>User32.lib;Bcrypt.lib;Ws2_32.lib;libprotobuf_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)bin\$(Configuration)\</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
</Link>
<PreBuildEvent>
<Command>
@ -204,7 +204,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>User32.lib;Bcrypt.lib;Ws2_32.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)bin\$(Configuration)\</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>IF EXIST "$(SolutionDir)..\..\r5apexdata.bin" del "$(SolutionDir)..\..\$(ProjectName)" &amp;&amp; copy /Y "$(TargetPath)" "$(SolutionDir)..\..\</Command>
@ -233,7 +233,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>User32.lib;Bcrypt.lib;Ws2_32.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)bin\$(Configuration)\</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>IF EXIST "$(SolutionDir)..\..\r5apexdata.bin" del "$(SolutionDir)..\..\$(ProjectName)" &amp;&amp; copy /Y "$(TargetPath)" "$(SolutionDir)..\..\</Command>

26
r5dev/vproj/sdklauncher.vcxproj
View File

@ -83,7 +83,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<LibraryPath>$(SolutionDir)r5dev\thirdparty\detours\libs;$(LibraryPath);</LibraryPath>
<LibraryPath>$(LibraryPath)</LibraryPath>
<TargetName>launcher</TargetName>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
@ -91,7 +91,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)r5dev\;$(IncludePath);</IncludePath>
<LibraryPath>$(SolutionDir)r5dev\thirdparty\detours\libs;$(LibraryPath);</LibraryPath>
<LibraryPath>$(LibraryPath)</LibraryPath>
<TargetName>launcher</TargetName>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
@ -140,7 +140,8 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libdetours_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>IF EXIST "$(SolutionDir)..\..\r5apexdata.bin" del "$(SolutionDir)..\..\$(ProjectName)" &amp;&amp; copy /Y "$(TargetPath)" "$(SolutionDir)..\..\</Command>
@ -173,7 +174,8 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libdetours_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>IF EXIST "$(SolutionDir)..\..\r5apexdata.bin" del "$(SolutionDir)..\..\$(ProjectName)" &amp;&amp; copy /Y "$(TargetPath)" "$(SolutionDir)..\..\</Command>
@ -186,22 +188,6 @@
</ClCompile>
<ClCompile Include="..\public\utility.cpp" />
<ClCompile Include="..\sdklauncher\sdklauncher.cpp" />
<ClCompile Include="..\thirdparty\detours\src\creatwth.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\thirdparty\detours\src\detours.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\thirdparty\detours\src\disasm.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\thirdparty\detours\src\modules.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\resource\sdklauncher.rc" />

12
r5dev/vproj/sdklauncher.vcxproj.filters
View File

@ -27,18 +27,6 @@
<ClCompile Include="..\core\stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\thirdparty\detours\src\detours.cpp">
<Filter>Detours Files</Filter>
</ClCompile>
<ClCompile Include="..\thirdparty\detours\src\disasm.cpp">
<Filter>Detours Files</Filter>
</ClCompile>
<ClCompile Include="..\thirdparty\detours\src\modules.cpp">
<Filter>Detours Files</Filter>
</ClCompile>
<ClCompile Include="..\thirdparty\detours\src\creatwth.cpp">
<Filter>Detours Files</Filter>
</ClCompile>
<ClCompile Include="..\public\utility.cpp">
<Filter>Source Files</Filter>
</ClCompile>

15
r5sdk.sln
View File

@ -7,14 +7,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamesdk", "r5dev\vproj\game
ProjectSection(ProjectDependencies) = postProject
{1CC6BF42-D20F-4599-8619-290AF5FB4034} = {1CC6BF42-D20F-4599-8619-290AF5FB4034}
{B273A875-6618-49FE-8CA4-0B693BA264D5} = {B273A875-6618-49FE-8CA4-0B693BA264D5}
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D} = {6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdklauncher", "r5dev\vproj\sdklauncher.vcxproj", "{18F8C75E-3844-4AA6-AB93-980A08253519}"
ProjectSection(ProjectDependencies) = postProject
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D} = {6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dedicated", "r5dev\vproj\dedicated.vcxproj", "{ED2C50B3-7C2C-4E44-988E-DAA059F72B9C}"
ProjectSection(ProjectDependencies) = postProject
{1CC6BF42-D20F-4599-8619-290AF5FB4034} = {1CC6BF42-D20F-4599-8619-290AF5FB4034}
{B273A875-6618-49FE-8CA4-0B693BA264D5} = {B273A875-6618-49FE-8CA4-0B693BA264D5}
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D} = {6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netconsole", "r5dev\vproj\netconsole.vcxproj", "{9579B31F-CE24-4852-A941-CD1AD71E2248}"
@ -26,6 +31,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprotobuf", "r5dev\vproj\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblzham", "r5dev\vproj\liblzham.vcxproj", "{1CC6BF42-D20F-4599-8619-290AF5FB4034}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdetours", "r5dev\vproj\libdetours.vcxproj", "{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@ -82,6 +89,14 @@ Global
{1CC6BF42-D20F-4599-8619-290AF5FB4034}.Release|x64.Build.0 = Release|x64
{1CC6BF42-D20F-4599-8619-290AF5FB4034}.Release|x86.ActiveCfg = Release|Win32
{1CC6BF42-D20F-4599-8619-290AF5FB4034}.Release|x86.Build.0 = Release|Win32
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}.Debug|x64.ActiveCfg = Debug|x64
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}.Debug|x64.Build.0 = Debug|x64
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}.Debug|x86.ActiveCfg = Debug|Win32
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}.Debug|x86.Build.0 = Debug|Win32
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}.Release|x64.ActiveCfg = Release|x64
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}.Release|x64.Build.0 = Release|x64
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}.Release|x86.ActiveCfg = Release|Win32
{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE