diff --git a/r5dev/dedicated.vcxproj b/r5dev/dedicated.vcxproj index b507483a..05babb6f 100644 --- a/r5dev/dedicated.vcxproj +++ b/r5dev/dedicated.vcxproj @@ -135,11 +135,17 @@ Console true - User32.lib;bcrypt.lib;%(AdditionalDependencies) + User32.lib;bcrypt.lib;protobuf.lib;%(AdditionalDependencies) + $(SolutionDir)bin\$(Configuration)\ - del "..\..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "..\..\..\ + IF EXIST "$(SolutionDir)..\..\r5apex_ds.exe" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ + + if not EXIST $(SolutionDir)bin\$(Configuration)\protobuf.lib ( +"$(DevEnvDir)devenv" "$(SolutionDir)detours.sln" /Rebuild $(Configuration) /project "$(SolutionDir)r5dev\protobuf.vcxproj" +); + @@ -162,11 +168,17 @@ true true true - User32.lib;bcrypt.lib;%(AdditionalDependencies) + User32.lib;bcrypt.lib;protobuf.lib;%(AdditionalDependencies) + $(SolutionDir)bin\$(Configuration)\ - del "..\..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "..\..\..\ + IF EXIST "$(SolutionDir)..\..\r5apex_ds.exe" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ + + if not EXIST $(SolutionDir)bin\$(Configuration)\protobuf.lib ( +"$(DevEnvDir)devenv" "$(SolutionDir)detours.sln" /Rebuild $(Configuration) /project "$(SolutionDir)r5dev\protobuf.vcxproj" +); + @@ -207,6 +219,8 @@ + + @@ -398,6 +412,14 @@ + + NotUsing + NotUsing + + + NotUsing + NotUsing + diff --git a/r5dev/dedicated.vcxproj.filters b/r5dev/dedicated.vcxproj.filters index 6569c9d2..e47064ea 100644 --- a/r5dev/dedicated.vcxproj.filters +++ b/r5dev/dedicated.vcxproj.filters @@ -115,6 +115,9 @@ {efae8c5b-e29e-497f-8bbb-af3b213f6c79} + + {9d1e327b-f385-4d84-82e0-918bc0bde704} + @@ -705,6 +708,12 @@ sdk\engine + + thirdparty\protobuf + + + thirdparty\protobuf + @@ -941,6 +950,12 @@ sdk\engine + + thirdparty\protobuf + + + thirdparty\protobuf + diff --git a/r5dev/gamesdk.vcxproj b/r5dev/gamesdk.vcxproj index cdb16cb5..378e84c0 100644 --- a/r5dev/gamesdk.vcxproj +++ b/r5dev/gamesdk.vcxproj @@ -55,6 +55,14 @@ + + NotUsing + NotUsing + + + NotUsing + NotUsing + @@ -267,6 +275,8 @@ + + @@ -520,7 +530,7 @@ true $(SolutionDir)r5dev\;$(IncludePath);$(DXSDK_DIR)Include $(SolutionDir)r5dev\thirdparty\detours\libs;$(SolutionDir)r5dev\thirdparty\lzham\libs;$(LibraryPath);$(DXSDK_DIR)Lib\x64 - r5apexsdkd + r5apexsdkd64 $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)build\$(ProjectName)\$(Configuration)\ $(VC_ReferencesPath_x64); @@ -529,7 +539,7 @@ false $(SolutionDir)r5dev\;$(IncludePath);$(DXSDK_DIR)Include $(SolutionDir)r5dev\thirdparty\detours\libs;$(SolutionDir)r5dev\thirdparty\lzham\libs;$(LibraryPath);$(DXSDK_DIR)Lib\x64 - r5apexsdkd + r5apexsdkd64 $(VC_ReferencesPath_x64); $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)build\$(ProjectName)\$(Configuration)\ @@ -588,11 +598,18 @@ true false r5dev.def - d3d11.lib;bcrypt.lib;%(AdditionalDependencies) + d3d11.lib;bcrypt.lib;protobuf.lib;%(AdditionalDependencies) + $(SolutionDir)bin\$(Configuration)\ - copy /Y "$(TargetPath)" "..\..\..\$(TargetFileName)" && del "..\..\..\r5apexsdkd64.dll" && rename "..\..\..\$(TargetFileName)" "r5apexsdkd64.dll" + IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ + + if not EXIST $(SolutionDir)bin\$(Configuration)\protobuf.lib ( +"$(DevEnvDir)devenv" "$(SolutionDir)detours.sln" /Rebuild $(Configuration) /project "$(SolutionDir)r5dev\protobuf.vcxproj" +); + + @@ -624,11 +641,18 @@ true false r5dev.def - d3d11.lib;bcrypt.lib;%(AdditionalDependencies) + d3d11.lib;bcrypt.lib;protobuf.lib;%(AdditionalDependencies) + $(SolutionDir)bin\$(Configuration)\ - copy /Y "$(TargetPath)" "..\..\..\$(TargetFileName)" && del "..\..\..\r5apexsdkd64.dll" && rename "..\..\..\$(TargetFileName)" "r5apexsdkd64.dll" + IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ + + if not EXIST $(SolutionDir)bin\$(Configuration)\protobuf.lib ( +"$(DevEnvDir)devenv" "$(SolutionDir)detours.sln" /Rebuild $(Configuration) /project "$(SolutionDir)r5dev\protobuf.vcxproj" +); + + diff --git a/r5dev/gamesdk.vcxproj.filters b/r5dev/gamesdk.vcxproj.filters index 16ae7d76..ca708ad1 100644 --- a/r5dev/gamesdk.vcxproj.filters +++ b/r5dev/gamesdk.vcxproj.filters @@ -145,6 +145,9 @@ {9da19829-c065-4584-9cf2-af751fb0d060} + + {69f89031-0a48-4c3c-9ca8-c9a46f420e67} + @@ -438,6 +441,12 @@ sdk\engine + + thirdparty\protobuf + + + thirdparty\protobuf + @@ -1109,6 +1118,12 @@ sdk\engine + + thirdparty\protobuf + + + thirdparty\protobuf + diff --git a/r5dev/netconsole.vcxproj b/r5dev/netconsole.vcxproj index f3d7e9ca..7a4a14ff 100644 --- a/r5dev/netconsole.vcxproj +++ b/r5dev/netconsole.vcxproj @@ -28,6 +28,14 @@ + + NotUsing + NotUsing + + + NotUsing + NotUsing + @@ -37,6 +45,8 @@ + + @@ -100,14 +110,14 @@ true $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)build\$(ProjectName)\$(Configuration)\ - netcon86 + netcon32 $(SolutionDir)r5dev\;$(IncludePath); false $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)build\$(ProjectName)\$(Configuration)\ - netcon86 + netcon32 $(SolutionDir)r5dev\;$(IncludePath); @@ -138,8 +148,14 @@ Console true - User32.lib;Bcrypt.lib;Ws2_32.lib;%(AdditionalDependencies) + User32.lib;Bcrypt.lib;Ws2_32.lib;protobuf.lib;%(AdditionalDependencies) + $(SolutionDir)bin\$(Configuration)\ + + if not EXIST $(SolutionDir)bin\$(Configuration)\protobuf.lib ( +"$(DevEnvDir)devenv" "$(SolutionDir)detours.sln" /Rebuild $(Configuration) /project "$(SolutionDir)r5dev\protobuf.vcxproj" +); + @@ -159,8 +175,17 @@ true true true - User32.lib;Bcrypt.lib;Ws2_32.lib;%(AdditionalDependencies) + User32.lib;Bcrypt.lib;Ws2_32.lib;protobuf.lib;%(AdditionalDependencies) + $(SolutionDir)bin\$(Configuration)\ + + if not EXIST $(SolutionDir)bin\$(Configuration)\protobuf.lib ( +"$(DevEnvDir)devenv" "$(SolutionDir)detours.sln" /Rebuild $(Configuration) /project "$(SolutionDir)r5dev\protobuf.vcxproj" +); + + + IF EXIST "$(SolutionDir)..\..\r5apexdata.bin" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ + @@ -176,8 +201,17 @@ Console true - User32.lib;Bcrypt.lib;Ws2_32.lib;%(AdditionalDependencies) + User32.lib;Bcrypt.lib;Ws2_32.lib;protobuf.lib;%(AdditionalDependencies) + $(SolutionDir)bin\$(Configuration)\ + + IF EXIST "$(SolutionDir)..\..\r5apexdata.bin" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ + + + if not EXIST $(SolutionDir)bin\$(Configuration)\protobuf.lib ( +"$(DevEnvDir)devenv" "$(SolutionDir)detours.sln" /Rebuild $(Configuration) /project "$(SolutionDir)r5dev\protobuf.vcxproj" +); + @@ -197,8 +231,17 @@ true true true - User32.lib;Bcrypt.lib;Ws2_32.lib;%(AdditionalDependencies) + User32.lib;Bcrypt.lib;Ws2_32.lib;protobuf.lib;%(AdditionalDependencies) + $(SolutionDir)bin\$(Configuration)\ + + IF EXIST "$(SolutionDir)..\..\r5apexdata.bin" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ + + + if not EXIST $(SolutionDir)bin\$(Configuration)\protobuf.lib ( +"$(DevEnvDir)devenv" "$(SolutionDir)detours.sln" /Rebuild $(Configuration) /project "$(SolutionDir)r5dev\protobuf.vcxproj" +); + diff --git a/r5dev/netconsole.vcxproj.filters b/r5dev/netconsole.vcxproj.filters index 46fef736..bb7b06d0 100644 --- a/r5dev/netconsole.vcxproj.filters +++ b/r5dev/netconsole.vcxproj.filters @@ -20,6 +20,12 @@ {99b7ba90-bc5d-4f07-a299-b68322c5ca63} + + {8459ce10-e58c-4fb4-9ec7-e2503f4014e5} + + + {7c7da8dd-043a-46b7-9413-832924e4574e} + @@ -43,6 +49,12 @@ core + + thirdparty\protobuf + + + thirdparty\protobuf + @@ -63,5 +75,11 @@ core + + thirdparty\protobuf + + + thirdparty\protobuf + \ No newline at end of file diff --git a/r5dev/sdklauncher.vcxproj b/r5dev/sdklauncher.vcxproj index 5145521a..afc9838f 100644 --- a/r5dev/sdklauncher.vcxproj +++ b/r5dev/sdklauncher.vcxproj @@ -143,7 +143,7 @@ %(AdditionalDependencies) - del "..\..\..\r5reloaded.exe" && copy /Y "$(TargetPath)" "..\..\..\$(TargetFileName)" + IF EXIST "$(SolutionDir)..\..\r5apexdata.bin" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ @@ -176,7 +176,7 @@ %(AdditionalDependencies) - del "..\..\..\r5reloaded.exe" && copy /Y "$(TargetPath)" "..\..\..\$(TargetFileName)" + IF EXIST "$(SolutionDir)..\..\r5apexdata.bin" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\