From 36adbce8fbe9647eb15f1d87e77b94c01efdc9d3 Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 02:40:46 +0000 Subject: [PATCH 01/15] Update .gitlab-ci.yml file Try disabling the DLL_FILES sed commands. (The BATs should handle this anyway....) --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35113e2..29679e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,8 +69,8 @@ build_windows: - 7za x protobuf_x86-windows-static.7z -oprotobuf_x86-windows-static - 7za x protobuf_x64-windows-static.7z -oprotobuf_x64-windows-static - 7za x sdk_standalone.7z -osdk_standalone - - DLL_FILES="$(ls dll/*.cpp | tr "\n" " ")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat - - DLL_FILES="$(ls dll/*.proto | tr "\n" " " | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat + #- DLL_FILES="$(ls dll/*.cpp | tr "\n" " ")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat + #- DLL_FILES="$(ls dll/*.proto | tr "\n" " " | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat - sed "s| /MP12 | /MP4 |g" -i *.bat # CI can't produce PDBs. Throws a bunch of errors, and skips building the PEs. - sed "s| /DDEBUG\:FULL | |g" -i *.bat From 86084d7c6e7fcd8dc13f96446ec3c969f320e651 Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 03:12:12 +0000 Subject: [PATCH 02/15] Update .gitlab-ci.yml file Try building lobby_connect win release using the bat file in the repo. --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29679e7..e7b252c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,6 +77,7 @@ build_windows: - python generate_build_win_bat.py - export WINEDEBUG=-all - wine cmd /c build_win_release_test.bat + - wine cmd /c build_win_lobby_connect.bat artifacts: paths: - release/ From 0276fa99da3853c5df886f918a3807b9d3871f15 Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 03:13:59 +0000 Subject: [PATCH 03/15] Update .gitlab-ci.yml file Dump the built bat file. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7b252c..9ee6af6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,7 +77,7 @@ build_windows: - python generate_build_win_bat.py - export WINEDEBUG=-all - wine cmd /c build_win_release_test.bat - - wine cmd /c build_win_lobby_connect.bat + - cp build_win_release_test.bat release/build_win_release_test.bat artifacts: paths: - release/ From 9f4c48cdc617785cabde2fd5dbff392a500529eb Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 03:32:05 +0000 Subject: [PATCH 04/15] Update .gitlab-ci.yml file Re-enable sed commands. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ee6af6..35c08fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,8 +69,8 @@ build_windows: - 7za x protobuf_x86-windows-static.7z -oprotobuf_x86-windows-static - 7za x protobuf_x64-windows-static.7z -oprotobuf_x64-windows-static - 7za x sdk_standalone.7z -osdk_standalone - #- DLL_FILES="$(ls dll/*.cpp | tr "\n" " ")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat - #- DLL_FILES="$(ls dll/*.proto | tr "\n" " " | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat + - DLL_FILES="$(ls dll/*.cpp | tr "\n" " ")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat + - DLL_FILES="$(ls dll/*.proto | tr "\n" " " | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat - sed "s| /MP12 | /MP4 |g" -i *.bat # CI can't produce PDBs. Throws a bunch of errors, and skips building the PEs. - sed "s| /DDEBUG\:FULL | |g" -i *.bat From 01e9208d883c17805be5293b1656181d591c2331 Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 03:35:51 +0000 Subject: [PATCH 05/15] Update .gitlab-ci.yml file Try fixing translate cmds. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35c08fe..1b5029b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,7 +69,7 @@ build_windows: - 7za x protobuf_x86-windows-static.7z -oprotobuf_x86-windows-static - 7za x protobuf_x64-windows-static.7z -oprotobuf_x64-windows-static - 7za x sdk_standalone.7z -osdk_standalone - - DLL_FILES="$(ls dll/*.cpp | tr "\n" " ")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat + - DLL_FILES="$(ls dll/*.cpp | tr "\n" " " | tr "/" "\\")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat - DLL_FILES="$(ls dll/*.proto | tr "\n" " " | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat - sed "s| /MP12 | /MP4 |g" -i *.bat # CI can't produce PDBs. Throws a bunch of errors, and skips building the PEs. From 60aac21320b4774527640377ac312e0159baeff4 Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 03:38:05 +0000 Subject: [PATCH 06/15] Update .gitlab-ci.yml file Try fixing translate cmds. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b5029b..3911821 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,7 +70,7 @@ build_windows: - 7za x protobuf_x64-windows-static.7z -oprotobuf_x64-windows-static - 7za x sdk_standalone.7z -osdk_standalone - DLL_FILES="$(ls dll/*.cpp | tr "\n" " " | tr "/" "\\")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat - - DLL_FILES="$(ls dll/*.proto | tr "\n" " " | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat + - DLL_FILES="$(ls dll/*.proto | tr "\n" " " | tr "/" "\\" | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat - sed "s| /MP12 | /MP4 |g" -i *.bat # CI can't produce PDBs. Throws a bunch of errors, and skips building the PEs. - sed "s| /DDEBUG\:FULL | |g" -i *.bat From fcf1ea94a420c0ba49dcc45d21a4d84421d8b5c4 Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 07:13:09 +0000 Subject: [PATCH 07/15] Update .gitlab-ci.yml file Try fixing translate cmds. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3911821..826a91a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,8 +69,8 @@ build_windows: - 7za x protobuf_x86-windows-static.7z -oprotobuf_x86-windows-static - 7za x protobuf_x64-windows-static.7z -oprotobuf_x64-windows-static - 7za x sdk_standalone.7z -osdk_standalone - - DLL_FILES="$(ls dll/*.cpp | tr "\n" " " | tr "/" "\\")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat - - DLL_FILES="$(ls dll/*.proto | tr "\n" " " | tr "/" "\\" | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat + - DLL_FILES="$(ls dll/*.cpp | tr "\n" " " | tr "/" "\\\\")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat + - DLL_FILES="$(ls dll/*.proto | tr "\n" " " | tr "/" "\\\\" | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat - sed "s| /MP12 | /MP4 |g" -i *.bat # CI can't produce PDBs. Throws a bunch of errors, and skips building the PEs. - sed "s| /DDEBUG\:FULL | |g" -i *.bat From 117ad9ec75f5f93dd2ee21cc5cfaff4485e9447b Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 07:15:41 +0000 Subject: [PATCH 08/15] Update .gitlab-ci.yml file Try fixing translate cmds. --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 826a91a..98989b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,6 +74,8 @@ build_windows: - sed "s| /MP12 | /MP4 |g" -i *.bat # CI can't produce PDBs. Throws a bunch of errors, and skips building the PEs. - sed "s| /DDEBUG\:FULL | |g" -i *.bat + # Turn on echo. + - sed "s|echo off|echo on|g" -i *.bat - python generate_build_win_bat.py - export WINEDEBUG=-all - wine cmd /c build_win_release_test.bat From 3ff16f75f421ff0518b16f2614f57a039f7fe4ca Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 07:58:04 +0000 Subject: [PATCH 09/15] Edit generate_build_win_bat.py Add lobby_connect.exe --- generate_build_win_bat.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/generate_build_win_bat.py b/generate_build_win_bat.py index f24b6bc..efbcc52 100644 --- a/generate_build_win_bat.py +++ b/generate_build_win_bat.py @@ -32,6 +32,7 @@ includes_64 = list(map(lambda a: '/I{}'.format(a), ["%PROTOBUF_X64_DIRECTORY%\\i debug_build_args = [] release_build_args = ["/DEMU_RELEASE_BUILD", "/DNDEBUG"] steamclient_build_args = ["/DSTEAMCLIENT_DLL"] +lobby_connect_args = ["/DNO_DISK_WRITES" "/DLOBBY_CONNECT"] experimental_build_args = ["/DEMU_EXPERIMENTAL_BUILD", "/DCONTROLLER_SUPPORT", "/DEMU_OVERLAY"] steamclient_experimental_build_args = experimental_build_args + steamclient_build_args @@ -81,7 +82,7 @@ xcopy /s files_example\* release\\ copy Readme_experimental.txt release\experimental\Readme.txt copy Readme_debug.txt release\debug_experimental\Readme.txt copy steamclient_loader\ColdClientLoader.ini release\experimental_steamclient\\ -call build_win_lobby_connect.bat +REM call build_win_lobby_connect.bat call build_win_find_interfaces.bat """ @@ -116,6 +117,8 @@ out += generate_common(includes_32, linker_32, "steam_api.dll", "steamclient.dll out += cl_line_exe(files_from_dir("steamclient_loader", ".cpp") + ["advapi32.lib", "user32.lib"] + normal_build_args, ["/debug:none", "/OUT:release\experimental_steamclient\steamclient_loader.exe"]) +out += cl_line_exe(files_from_dir("./", "lobby_connect.cpp") + lobby_connect_args + normal_build_args + release_build_args + includes_32 + proto_deps + steam_deps + normal_linker_libs + ["Comdlg32.lib", "user32.lib"], ["/debug:none", "/OUT:release\lobby_connect\lobby_connect.exe"] + linker_32) + out += head_64bit out += generate_common(includes_64, linker_64, "steam_api64.dll", "steamclient64.dll") From fec0391a7e5103d1da3898a300eb63c83e3c45f9 Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 08:21:16 +0000 Subject: [PATCH 10/15] Edit generate_build_win_bat.py Fix up lobby_connect. --- generate_build_win_bat.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generate_build_win_bat.py b/generate_build_win_bat.py index efbcc52..cefd286 100644 --- a/generate_build_win_bat.py +++ b/generate_build_win_bat.py @@ -63,6 +63,7 @@ mkdir release\experimental mkdir release\experimental_steamclient mkdir release\debug_experimental mkdir release\debug_experimental_steamclient +mkdir release\lobby_connect call build_set_protobuf_directories.bat """ @@ -83,6 +84,7 @@ copy Readme_experimental.txt release\experimental\Readme.txt copy Readme_debug.txt release\debug_experimental\Readme.txt copy steamclient_loader\ColdClientLoader.ini release\experimental_steamclient\\ REM call build_win_lobby_connect.bat +copy Readme_lobby_connect.txt release\lobby_connect\Readme.txt call build_win_find_interfaces.bat """ From 0bf68ab25f300ca3f63b90b202bd0b52423a97b1 Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 08:41:12 +0000 Subject: [PATCH 11/15] Edit generate_build_win_bat.py --- generate_build_win_bat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate_build_win_bat.py b/generate_build_win_bat.py index cefd286..404b910 100644 --- a/generate_build_win_bat.py +++ b/generate_build_win_bat.py @@ -117,9 +117,9 @@ def generate_common(include_arch, linker_arch, steam_api_name, steamclient_name) out += generate_common(includes_32, linker_32, "steam_api.dll", "steamclient.dll") -out += cl_line_exe(files_from_dir("steamclient_loader", ".cpp") + ["advapi32.lib", "user32.lib"] + normal_build_args, ["/debug:none", "/OUT:release\experimental_steamclient\steamclient_loader.exe"]) +out += cl_line_exe(files_from_dir("./", "lobby_connect.cpp") + lobby_connect_args + normal_build_args + release_build_args + includes_32 + proto_deps + steam_deps + sc_different_deps + normal_linker_libs + ["Comdlg32.lib", "user32.lib"], ["/debug:none", "/OUT:release\lobby_connect\lobby_connect.exe"] + linker_32) -out += cl_line_exe(files_from_dir("./", "lobby_connect.cpp") + lobby_connect_args + normal_build_args + release_build_args + includes_32 + proto_deps + steam_deps + normal_linker_libs + ["Comdlg32.lib", "user32.lib"], ["/debug:none", "/OUT:release\lobby_connect\lobby_connect.exe"] + linker_32) +out += cl_line_exe(files_from_dir("steamclient_loader", ".cpp") + ["advapi32.lib", "user32.lib"] + normal_build_args, ["/debug:none", "/OUT:release\experimental_steamclient\steamclient_loader.exe"]) out += head_64bit out += generate_common(includes_64, linker_64, "steam_api64.dll", "steamclient64.dll") From 005c22440887169685f713cdfb1c4a683d822d37 Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 04:10:45 -0500 Subject: [PATCH 12/15] More fixes. --- generate_build_win_bat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate_build_win_bat.py b/generate_build_win_bat.py index 404b910..2a01944 100644 --- a/generate_build_win_bat.py +++ b/generate_build_win_bat.py @@ -32,7 +32,7 @@ includes_64 = list(map(lambda a: '/I{}'.format(a), ["%PROTOBUF_X64_DIRECTORY%\\i debug_build_args = [] release_build_args = ["/DEMU_RELEASE_BUILD", "/DNDEBUG"] steamclient_build_args = ["/DSTEAMCLIENT_DLL"] -lobby_connect_args = ["/DNO_DISK_WRITES" "/DLOBBY_CONNECT"] +lobby_connect_args = ["/DNO_DISK_WRITES", "/DLOBBY_CONNECT"] experimental_build_args = ["/DEMU_EXPERIMENTAL_BUILD", "/DCONTROLLER_SUPPORT", "/DEMU_OVERLAY"] steamclient_experimental_build_args = experimental_build_args + steamclient_build_args @@ -117,7 +117,7 @@ def generate_common(include_arch, linker_arch, steam_api_name, steamclient_name) out += generate_common(includes_32, linker_32, "steam_api.dll", "steamclient.dll") -out += cl_line_exe(files_from_dir("./", "lobby_connect.cpp") + lobby_connect_args + normal_build_args + release_build_args + includes_32 + proto_deps + steam_deps + sc_different_deps + normal_linker_libs + ["Comdlg32.lib", "user32.lib"], ["/debug:none", "/OUT:release\lobby_connect\lobby_connect.exe"] + linker_32) +out += cl_line_exe(files_from_dir("./", "lobby_connect.cpp") + lobby_connect_args + normal_build_args + release_build_args + includes_32 + proto_deps + steam_deps + files_from_dir("dll", ["flat.cpp", "dll.cpp"]) + normal_linker_libs + ["Comdlg32.lib", "user32.lib"], linker_32 + ["/debug:none", "/OUT:release\lobby_connect\lobby_connect.exe"]) out += cl_line_exe(files_from_dir("steamclient_loader", ".cpp") + ["advapi32.lib", "user32.lib"] + normal_build_args, ["/debug:none", "/OUT:release\experimental_steamclient\steamclient_loader.exe"]) From a0215595e3d2fe24b15d97d8f35ab004d3095209 Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 04:39:35 -0500 Subject: [PATCH 13/15] Just include them manually.... --- generate_build_win_bat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate_build_win_bat.py b/generate_build_win_bat.py index 2a01944..9e3ef47 100644 --- a/generate_build_win_bat.py +++ b/generate_build_win_bat.py @@ -117,7 +117,7 @@ def generate_common(include_arch, linker_arch, steam_api_name, steamclient_name) out += generate_common(includes_32, linker_32, "steam_api.dll", "steamclient.dll") -out += cl_line_exe(files_from_dir("./", "lobby_connect.cpp") + lobby_connect_args + normal_build_args + release_build_args + includes_32 + proto_deps + steam_deps + files_from_dir("dll", ["flat.cpp", "dll.cpp"]) + normal_linker_libs + ["Comdlg32.lib", "user32.lib"], linker_32 + ["/debug:none", "/OUT:release\lobby_connect\lobby_connect.exe"]) +out += cl_line_exe(files_from_dir("./", "lobby_connect.cpp") + files_from_dir("dll", "flat.cpp") + files_from_dir("dll", "dll.cpp") + lobby_connect_args + normal_build_args + release_build_args + includes_32 + proto_deps + steam_deps + normal_linker_libs + ["Comdlg32.lib", "user32.lib"], linker_32 + ["/debug:none", "/OUT:release\lobby_connect\lobby_connect.exe"]) out += cl_line_exe(files_from_dir("steamclient_loader", ".cpp") + ["advapi32.lib", "user32.lib"] + normal_build_args, ["/debug:none", "/OUT:release\experimental_steamclient\steamclient_loader.exe"]) From 127fddeae8562ab907a1656c1c2eacbe9912de71 Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 02:40:46 +0000 Subject: [PATCH 14/15] Update .gitlab-ci.yml file Try disabling the DLL_FILES sed commands. (The BATs should handle this anyway....) --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35113e2..98989b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,14 +69,17 @@ build_windows: - 7za x protobuf_x86-windows-static.7z -oprotobuf_x86-windows-static - 7za x protobuf_x64-windows-static.7z -oprotobuf_x64-windows-static - 7za x sdk_standalone.7z -osdk_standalone - - DLL_FILES="$(ls dll/*.cpp | tr "\n" " ")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat - - DLL_FILES="$(ls dll/*.proto | tr "\n" " " | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat + - DLL_FILES="$(ls dll/*.cpp | tr "\n" " " | tr "/" "\\\\")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat + - DLL_FILES="$(ls dll/*.proto | tr "\n" " " | tr "/" "\\\\" | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat - sed "s| /MP12 | /MP4 |g" -i *.bat # CI can't produce PDBs. Throws a bunch of errors, and skips building the PEs. - sed "s| /DDEBUG\:FULL | |g" -i *.bat + # Turn on echo. + - sed "s|echo off|echo on|g" -i *.bat - python generate_build_win_bat.py - export WINEDEBUG=-all - wine cmd /c build_win_release_test.bat + - cp build_win_release_test.bat release/build_win_release_test.bat artifacts: paths: - release/ From 80819bd559c742fda48dc88cceed7f5675015d1b Mon Sep 17 00:00:00 2001 From: redpolline <11156324-redpolline@users.noreply.gitlab.com> Date: Fri, 31 Jan 2025 07:58:04 +0000 Subject: [PATCH 15/15] Edit generate_build_win_bat.py Add lobby_connect.exe --- generate_build_win_bat.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/generate_build_win_bat.py b/generate_build_win_bat.py index f24b6bc..9e3ef47 100644 --- a/generate_build_win_bat.py +++ b/generate_build_win_bat.py @@ -32,6 +32,7 @@ includes_64 = list(map(lambda a: '/I{}'.format(a), ["%PROTOBUF_X64_DIRECTORY%\\i debug_build_args = [] release_build_args = ["/DEMU_RELEASE_BUILD", "/DNDEBUG"] steamclient_build_args = ["/DSTEAMCLIENT_DLL"] +lobby_connect_args = ["/DNO_DISK_WRITES", "/DLOBBY_CONNECT"] experimental_build_args = ["/DEMU_EXPERIMENTAL_BUILD", "/DCONTROLLER_SUPPORT", "/DEMU_OVERLAY"] steamclient_experimental_build_args = experimental_build_args + steamclient_build_args @@ -62,6 +63,7 @@ mkdir release\experimental mkdir release\experimental_steamclient mkdir release\debug_experimental mkdir release\debug_experimental_steamclient +mkdir release\lobby_connect call build_set_protobuf_directories.bat """ @@ -81,7 +83,8 @@ xcopy /s files_example\* release\\ copy Readme_experimental.txt release\experimental\Readme.txt copy Readme_debug.txt release\debug_experimental\Readme.txt copy steamclient_loader\ColdClientLoader.ini release\experimental_steamclient\\ -call build_win_lobby_connect.bat +REM call build_win_lobby_connect.bat +copy Readme_lobby_connect.txt release\lobby_connect\Readme.txt call build_win_find_interfaces.bat """ @@ -114,6 +117,8 @@ def generate_common(include_arch, linker_arch, steam_api_name, steamclient_name) out += generate_common(includes_32, linker_32, "steam_api.dll", "steamclient.dll") +out += cl_line_exe(files_from_dir("./", "lobby_connect.cpp") + files_from_dir("dll", "flat.cpp") + files_from_dir("dll", "dll.cpp") + lobby_connect_args + normal_build_args + release_build_args + includes_32 + proto_deps + steam_deps + normal_linker_libs + ["Comdlg32.lib", "user32.lib"], linker_32 + ["/debug:none", "/OUT:release\lobby_connect\lobby_connect.exe"]) + out += cl_line_exe(files_from_dir("steamclient_loader", ".cpp") + ["advapi32.lib", "user32.lib"] + normal_build_args, ["/debug:none", "/OUT:release\experimental_steamclient\steamclient_loader.exe"]) out += head_64bit