mirror of
https://github.com/Detanup01/gbe_fork.git
synced 2024-11-27 05:04:01 +08:00
output protoc generated in a subfolder in dll/ for easier code reference
This commit is contained in:
parent
851142071d
commit
9fafde917e
2
.gitignore
vendored
2
.gitignore
vendored
@ -3,6 +3,8 @@
|
|||||||
|
|
||||||
build/
|
build/
|
||||||
|
|
||||||
|
dll/proto_gen/
|
||||||
|
|
||||||
tools/generate_emu_config/.py*/
|
tools/generate_emu_config/.py*/
|
||||||
tools/generate_emu_config/.venv*/
|
tools/generate_emu_config/.venv*/
|
||||||
tools/generate_emu_config/.env*/
|
tools/generate_emu_config/.env*/
|
||||||
|
@ -113,7 +113,7 @@ deps_dir="build/deps/linux"
|
|||||||
libs_dir="libs"
|
libs_dir="libs"
|
||||||
tools_dir='tools'
|
tools_dir='tools'
|
||||||
build_temp_dir="build/tmp/linux"
|
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_dir="third-party"
|
||||||
third_party_build_dir="$third_party_dir/build/linux"
|
third_party_build_dir="$third_party_dir/build/linux"
|
||||||
|
|
||||||
@ -356,8 +356,6 @@ function build_for () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function cleanup () {
|
function cleanup () {
|
||||||
rm -f dll/net.pb.cc
|
|
||||||
rm -f dll/net.pb.h
|
|
||||||
rm -f -r "$build_temp_dir"
|
rm -f -r "$build_temp_dir"
|
||||||
rm -f -r "$protoc_out_dir"
|
rm -f -r "$protoc_out_dir"
|
||||||
}
|
}
|
||||||
|
@ -138,7 +138,7 @@ set "deps_dir=build\deps\win"
|
|||||||
set "libs_dir=libs"
|
set "libs_dir=libs"
|
||||||
set "tools_src_dir=tools"
|
set "tools_src_dir=tools"
|
||||||
set "build_temp_dir=build\tmp\win"
|
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_32=%deps_dir%\protobuf\install32\bin\protoc.exe"
|
||||||
set "protoc_exe_64=%deps_dir%\protobuf\install64\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 *.obj >nul 2>&1
|
||||||
del /f /q *.pdb >nul 2>&1
|
del /f /q *.pdb >nul 2>&1
|
||||||
del /f /q *.ilk >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 "%build_temp_dir%" >nul 2>&1
|
||||||
rmdir /s /q "%protoc_out_dir%" >nul 2>&1
|
rmdir /s /q "%protoc_out_dir%" >nul 2>&1
|
||||||
for %%A in ("ilk" "lib" "exp") do (
|
for %%A in ("ilk" "lib" "exp") do (
|
||||||
|
Loading…
Reference in New Issue
Block a user