From 9fafde917e420b9a57a8e57619f7c0fac39fa05c Mon Sep 17 00:00:00 2001
From: otavepto <153766569+otavepto@users.noreply.github.com>
Date: Thu, 28 Dec 2023 22:10:55 +0200
Subject: [PATCH] output protoc generated in a subfolder in dll/ for easier
 code reference

---
 .gitignore     | 2 ++
 build_linux.sh | 8 +++-----
 build_win.bat  | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1d4a77b3..7d29cb7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
 
 build/
 
+dll/proto_gen/
+
 tools/generate_emu_config/.py*/
 tools/generate_emu_config/.venv*/
 tools/generate_emu_config/.env*/
diff --git a/build_linux.sh b/build_linux.sh
index 7206643e..b745d090 100644
--- a/build_linux.sh
+++ b/build_linux.sh
@@ -113,7 +113,7 @@ deps_dir="build/deps/linux"
 libs_dir="libs"
 tools_dir='tools'
 build_temp_dir="build/tmp/linux"
-protoc_out_dir="$build_temp_dir/proto_gen"
+protoc_out_dir="dll/proto_gen/linux"
 third_party_dir="third-party"
 third_party_build_dir="$third_party_dir/build/linux"
 
@@ -325,7 +325,7 @@ function build_for () {
   printf '%s\n' "${build_cmds[@]}" | "$parallel_exe" -j$build_threads -d '<>' -k "$build_cmd"
   exit_code=$?
   echo "  -- Exit code = $exit_code"
-  echo ; echo ;
+  echo; echo;
   sleep 1
   [[ $exit_code = 0 ]] || {
     rm -f -r "$tmp_work_dir";
@@ -348,7 +348,7 @@ function build_for () {
   clang++ $common_compiler_args $cpiler_pic_pie $cpiler_m32 $optimize_level $dbg_level $linker_pic_pie $linker_strip_dbg_symbols -o "$out_filepath" "${obj_files[@]}" "${target_libs_dirs[@]/#/-L}" -Wl,--whole-archive -Wl,-Bstatic "${release_libs[@]/#/-l}" -Wl,-Bdynamic -Wl,--no-whole-archive -Wl,--exclude-libs,ALL
   exit_code=$?
   echo "  -- Exit code = $exit_code"
-  echo ; echo ;
+  echo; echo;
   rm -f -r "$tmp_work_dir"
   sleep 1
   return $exit_code
@@ -356,8 +356,6 @@ function build_for () {
 }
 
 function cleanup () {
-  rm -f dll/net.pb.cc
-  rm -f dll/net.pb.h
   rm -f -r "$build_temp_dir"
   rm -f -r "$protoc_out_dir"
 }
diff --git a/build_win.bat b/build_win.bat
index 5ed7705c..76c5932a 100644
--- a/build_win.bat
+++ b/build_win.bat
@@ -138,7 +138,7 @@ set "deps_dir=build\deps\win"
 set "libs_dir=libs"
 set "tools_src_dir=tools"
 set "build_temp_dir=build\tmp\win"
-set "protoc_out_dir=%build_temp_dir%\proto_gen"
+set "protoc_out_dir=dll\proto_gen\win"
 
 set "protoc_exe_32=%deps_dir%\protobuf\install32\bin\protoc.exe"
 set "protoc_exe_64=%deps_dir%\protobuf\install64\bin\protoc.exe"
@@ -566,8 +566,6 @@ exit /b 1
   del /f /q *.obj >nul 2>&1
   del /f /q *.pdb >nul 2>&1
   del /f /q *.ilk >nul 2>&1
-  del /f /q dll\net.pb.cc >nul 2>&1
-  del /f /q dll\net.pb.h >nul 2>&1
   rmdir /s /q "%build_temp_dir%" >nul 2>&1
   rmdir /s /q "%protoc_out_dir%" >nul 2>&1
   for %%A in ("ilk" "lib" "exp") do (