diff --git a/.gitignore b/.gitignore index 3d54c885..1c41493e 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ x86/ bld/ [Bb]in/ [Oo]bj/ +[Ll]ib/ [Ll]og/ [Ll]ogs/ diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj index 719cd873..f0dd01ec 100644 --- a/r5dev/vproj/dedicated.vcxproj +++ b/r5dev/vproj/dedicated.vcxproj @@ -81,14 +81,14 @@ true $(SolutionDir)r5dev\;$(IncludePath); - $(SolutionDir)r5dev\thirdparty\detours\libs;$(SolutionDir)r5dev\thirdparty\lzham\libs;$(LibraryPath); + $(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)build\$(ProjectName)\$(Configuration)\ false $(SolutionDir)r5dev\;$(IncludePath); - $(SolutionDir)r5dev\thirdparty\detours\libs;$(SolutionDir)r5dev\thirdparty\lzham\libs;$(LibraryPath); + $(LibraryPath) $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)build\$(ProjectName)\$(Configuration)\ @@ -135,8 +135,8 @@ Console true - User32.lib;bcrypt.lib;libprotobuf_x64.lib;liblzham_x64.lib;%(AdditionalDependencies) - $(SolutionDir)bin\$(Configuration)\ + bcrypt.lib;user32.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies) + $(SolutionDir)lib\$(Configuration)\ ..\Dedicated.def @@ -168,8 +168,8 @@ true true true - User32.lib;bcrypt.lib;libprotobuf_x64.lib;liblzham_x64.lib;%(AdditionalDependencies) - $(SolutionDir)bin\$(Configuration)\ + bcrypt.lib;user32.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies) + $(SolutionDir)lib\$(Configuration)\ ..\Dedicated.def @@ -252,6 +252,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/r5dev/vproj/dedicated.vcxproj.filters b/r5dev/vproj/dedicated.vcxproj.filters index adf3b069..36e6c40a 100644 --- a/r5dev/vproj/dedicated.vcxproj.filters +++ b/r5dev/vproj/dedicated.vcxproj.filters @@ -112,6 +112,24 @@ {888e265d-d431-4c9c-8d1a-e8a3639c9fbd} + + {5648c1a1-99dd-4532-af6d-0ce6132a10ef} + + + {9faa91f6-4a34-4a90-b956-eb482f38617d} + + + {ffe79a0d-71dd-46aa-9a1c-6d87dc441f05} + + + {ed2f5f72-7ef5-49ff-bed2-13e2b5d6eabe} + + + {6139087a-fe2d-4a77-aab9-64fcb8c4e472} + + + {40c41a94-4e9d-439f-9b16-68531ecc03a8} + @@ -660,6 +678,93 @@ sdk\appframework + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\lzhamcomp\include + + + thirdparty\lzham\lzhamcomp\include + + + thirdparty\lzham\lzhamdecomp\include + + + thirdparty\lzham\lzhamdecomp\include + diff --git a/r5dev/vproj/gamesdk.vcxproj b/r5dev/vproj/gamesdk.vcxproj index 5c8d229a..89f0c30c 100644 --- a/r5dev/vproj/gamesdk.vcxproj +++ b/r5dev/vproj/gamesdk.vcxproj @@ -243,6 +243,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -437,7 +466,7 @@ true $(SolutionDir)r5dev\;$(IncludePath);$(DXSDK_DIR)Include - $(SolutionDir)r5dev\thirdparty\detours\libs;$(SolutionDir)r5dev\thirdparty\lzham\libs;$(LibraryPath);$(DXSDK_DIR)Lib\x64 + $(LibraryPath);$(DXSDK_DIR)Lib\x64 r5apexsdkd64 $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)build\$(ProjectName)\$(Configuration)\ @@ -446,7 +475,7 @@ false $(SolutionDir)r5dev\;$(IncludePath);$(DXSDK_DIR)Include - $(SolutionDir)r5dev\thirdparty\detours\libs;$(SolutionDir)r5dev\thirdparty\lzham\libs;$(LibraryPath);$(DXSDK_DIR)Lib\x64 + $(LibraryPath);$(DXSDK_DIR)Lib\x64 r5apexsdkd64 $(VC_ReferencesPath_x64); $(SolutionDir)bin\$(Configuration)\ @@ -506,8 +535,8 @@ true false ..\GameSDK.def - d3d11.lib;bcrypt.lib;libprotobuf_x64.lib;liblzham_x64.lib;%(AdditionalDependencies) - $(SolutionDir)bin\$(Configuration)\ + d3d11.lib;bcrypt.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies) + $(SolutionDir)lib\$(Configuration)\ IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ @@ -547,8 +576,8 @@ true false ..\GameSDK.def - d3d11.lib;bcrypt.lib;libprotobuf_x64.lib;liblzham_x64.lib;%(AdditionalDependencies) - $(SolutionDir)bin\$(Configuration)\ + d3d11.lib;bcrypt.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies) + $(SolutionDir)lib\$(Configuration)\ IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ diff --git a/r5dev/vproj/gamesdk.vcxproj.filters b/r5dev/vproj/gamesdk.vcxproj.filters index 569a6485..55b73184 100644 --- a/r5dev/vproj/gamesdk.vcxproj.filters +++ b/r5dev/vproj/gamesdk.vcxproj.filters @@ -142,6 +142,24 @@ {cd141b6d-58a2-4b7d-afc9-32195cd9aa3c} + + {75f3cdf7-cbe5-4138-90b1-24492f570abb} + + + {7fdf29d5-bc3d-41f4-8788-7ad63e4f9a13} + + + {9432e37b-2460-491e-96cb-ac0cfb477581} + + + {d82555e7-9f83-444b-ba0d-7e309e08ce73} + + + {5f9f0e7f-9bfb-4303-9bb6-fdce3bd23f23} + + + {3446634c-a632-4281-a500-459a56668a6b} + @@ -1022,6 +1040,93 @@ sdk\appframework + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\lzhamcomp\include + + + thirdparty\lzham\lzhamcomp\include + + + thirdparty\lzham\lzhamdecomp\include + + + thirdparty\lzham\lzhamdecomp\include + diff --git a/r5dev/vproj/libdetours.vcxproj b/r5dev/vproj/libdetours.vcxproj new file mode 100644 index 00000000..7a7ca32b --- /dev/null +++ b/r5dev/vproj/libdetours.vcxproj @@ -0,0 +1,204 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + NotUsing + NotUsing + NotUsing + NotUsing + + + + 16.0 + Win32Proj + {6DC4E2AF-1740-480B-A9E4-BA766BC6B58D} + libdetours + 10.0 + + + + StaticLibrary + true + v143 + Unicode + Static + + + StaticLibrary + false + v143 + true + Unicode + Static + + + StaticLibrary + true + v143 + Unicode + Static + + + StaticLibrary + false + v143 + true + Unicode + Static + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)r5dev\;$(IncludePath); + $(SolutionDir)build\$(ProjectName)\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ + libdetours_x86 + + + false + $(SolutionDir)r5dev\;$(IncludePath); + $(SolutionDir)build\$(ProjectName)\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ + libdetours_x86 + + + true + $(SolutionDir)r5dev\;$(IncludePath); + $(SolutionDir)build\$(ProjectName)\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ + libdetours_x64 + + + false + $(SolutionDir)r5dev\;$(IncludePath); + $(SolutionDir)build\$(ProjectName)\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ + libdetours_x64 + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions) + stdcpp17 + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions) + stdcpp17 + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions) + stdcpp17 + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions) + stdcpp17 + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/r5dev/vproj/libdetours.vcxproj.filters b/r5dev/vproj/libdetours.vcxproj.filters new file mode 100644 index 00000000..a30da7b2 --- /dev/null +++ b/r5dev/vproj/libdetours.vcxproj.filters @@ -0,0 +1,28 @@ + + + + + {50abaf44-bd51-4c7a-a050-949827ec8d0e} + + + + + include + + + include + + + include + + + include + + + + + + + + + \ No newline at end of file diff --git a/r5dev/vproj/liblzham.vcxproj b/r5dev/vproj/liblzham.vcxproj index 07b49b62..d1d783ca 100644 --- a/r5dev/vproj/liblzham.vcxproj +++ b/r5dev/vproj/liblzham.vcxproj @@ -231,28 +231,28 @@ true $(SolutionDir)r5dev\;$(IncludePath); $(SolutionDir)build\$(ProjectName)\$(Configuration)\ - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ liblzham_x86 false $(SolutionDir)r5dev\;$(IncludePath); $(SolutionDir)build\$(ProjectName)\$(Configuration)\ - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ liblzham_x86 true $(SolutionDir)r5dev\;$(IncludePath); $(SolutionDir)build\$(ProjectName)\$(Configuration)\ - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ liblzham_x64 false $(SolutionDir)r5dev\;$(IncludePath); $(SolutionDir)build\$(ProjectName)\$(Configuration)\ - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ liblzham_x64 diff --git a/r5dev/vproj/libprotobuf.vcxproj b/r5dev/vproj/libprotobuf.vcxproj index a70f4467..ce8d2ebf 100644 --- a/r5dev/vproj/libprotobuf.vcxproj +++ b/r5dev/vproj/libprotobuf.vcxproj @@ -78,28 +78,28 @@ true $(SolutionDir)r5dev\;$(IncludePath); $(SolutionDir)build\$(ProjectName)\$(Configuration)\ - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ libprotobuf_x86 false $(SolutionDir)r5dev\;$(IncludePath); $(SolutionDir)build\$(ProjectName)\$(Configuration)\ - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ libprotobuf_x86 true $(SolutionDir)r5dev\;$(IncludePath); $(SolutionDir)build\$(ProjectName)\$(Configuration)\ - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ libprotobuf_x64 false $(SolutionDir)r5dev\;$(IncludePath); $(SolutionDir)build\$(ProjectName)\$(Configuration)\ - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ libprotobuf_x64 diff --git a/r5dev/vproj/netconsole.vcxproj b/r5dev/vproj/netconsole.vcxproj index d52f48bf..3ac341a7 100644 --- a/r5dev/vproj/netconsole.vcxproj +++ b/r5dev/vproj/netconsole.vcxproj @@ -153,7 +153,7 @@ Console true User32.lib;Bcrypt.lib;Ws2_32.lib;libprotobuf_x86d.lib;%(AdditionalDependencies) - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ @@ -179,7 +179,7 @@ true true User32.lib;Bcrypt.lib;Ws2_32.lib;libprotobuf_x86.lib;%(AdditionalDependencies) - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ @@ -204,7 +204,7 @@ Console true User32.lib;Bcrypt.lib;Ws2_32.lib;libprotobuf_x64.lib;%(AdditionalDependencies) - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ IF EXIST "$(SolutionDir)..\..\r5apexdata.bin" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ @@ -233,7 +233,7 @@ true true User32.lib;Bcrypt.lib;Ws2_32.lib;libprotobuf_x64.lib;%(AdditionalDependencies) - $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)lib\$(Configuration)\ IF EXIST "$(SolutionDir)..\..\r5apexdata.bin" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ diff --git a/r5dev/vproj/sdklauncher.vcxproj b/r5dev/vproj/sdklauncher.vcxproj index c56a7eeb..c11618c9 100644 --- a/r5dev/vproj/sdklauncher.vcxproj +++ b/r5dev/vproj/sdklauncher.vcxproj @@ -83,7 +83,7 @@ true $(SolutionDir)r5dev\;$(IncludePath); - $(SolutionDir)r5dev\thirdparty\detours\libs;$(LibraryPath); + $(LibraryPath) launcher $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)build\$(ProjectName)\$(Configuration)\ @@ -91,7 +91,7 @@ false $(SolutionDir)r5dev\;$(IncludePath); - $(SolutionDir)r5dev\thirdparty\detours\libs;$(LibraryPath); + $(LibraryPath) launcher $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)build\$(ProjectName)\$(Configuration)\ @@ -140,7 +140,8 @@ Console true - %(AdditionalDependencies) + libdetours_x64.lib;%(AdditionalDependencies) + $(SolutionDir)lib\$(Configuration)\ IF EXIST "$(SolutionDir)..\..\r5apexdata.bin" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ @@ -173,7 +174,8 @@ true true true - %(AdditionalDependencies) + libdetours_x64.lib;%(AdditionalDependencies) + $(SolutionDir)lib\$(Configuration)\ IF EXIST "$(SolutionDir)..\..\r5apexdata.bin" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ @@ -186,22 +188,6 @@ - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - NotUsing - NotUsing - diff --git a/r5dev/vproj/sdklauncher.vcxproj.filters b/r5dev/vproj/sdklauncher.vcxproj.filters index fca0f1c8..2f5576c5 100644 --- a/r5dev/vproj/sdklauncher.vcxproj.filters +++ b/r5dev/vproj/sdklauncher.vcxproj.filters @@ -27,18 +27,6 @@ Source Files - - Detours Files - - - Detours Files - - - Detours Files - - - Detours Files - Source Files diff --git a/r5sdk.sln b/r5sdk.sln index 281b8c22..ba14a64e 100644 --- a/r5sdk.sln +++ b/r5sdk.sln @@ -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