mirrors/gbe_fork
1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2025-04-21 21:52:06 +02:00
Code Activity

output protoc generated in a subfolder in dll/ for easier code reference

Browse source
This commit is contained in:
otavepto 2023-12-28 22:10:55 +02:00
parent 851142071d
commit 9fafde917e
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -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*/

8
build_linux.sh
View file

@ -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"
@ -325,7 +325,7 @@ function build_for () {
printf '%s\n' "${build_cmds[@]}" | "$parallel_exe" -j$build_threads -d '<>' -k "$build_cmd" printf '%s\n' "${build_cmds[@]}" | "$parallel_exe" -j$build_threads -d '<>' -k "$build_cmd"
exit_code=$? exit_code=$?
echo " -- Exit code = $exit_code" echo " -- Exit code = $exit_code"
echo ; echo ; echo; echo;
sleep 1 sleep 1
[[ $exit_code = 0 ]] || { [[ $exit_code = 0 ]] || {
rm -f -r "$tmp_work_dir"; 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 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=$? exit_code=$?
echo " -- Exit code = $exit_code" echo " -- Exit code = $exit_code"
echo ; echo ; echo; echo;
rm -f -r "$tmp_work_dir" rm -f -r "$tmp_work_dir"
sleep 1 sleep 1
return $exit_code return $exit_code
@ -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"
} }

4
build_win.bat
View file

@ -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 (