From 36f780c6944798961674e2f060d1bacc27d2c971 Mon Sep 17 00:00:00 2001 From: "Loren M. Lang" Date: Sun, 26 Nov 2023 16:11:46 -0800 Subject: [PATCH 1/4] Fixed executability of shell script --- scripts/Setup.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/Setup.sh diff --git a/scripts/Setup.sh b/scripts/Setup.sh old mode 100644 new mode 100755 From fc8f603049b3107949b7ecf54ff730a4ba650668 Mon Sep 17 00:00:00 2001 From: "Loren M. Lang" Date: Sun, 26 Nov 2023 16:14:44 -0800 Subject: [PATCH 2/4] Make setup scripts executable from any directory This allows the scripts to also be executed from the top-level as ./scripts/Setup.sh or .\scripts\Setup.bat --- scripts/Setup.bat | 4 ++-- scripts/Setup.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/Setup.bat b/scripts/Setup.bat index 76af845..cc3b05e 100644 --- a/scripts/Setup.bat +++ b/scripts/Setup.bat @@ -1,7 +1,7 @@ @echo off -pushd .. +pushd %~dp0\.. Walnut\vendor\bin\premake\Windows\premake5.exe --file=Build.lua vs2022 Walnut\vendor\bin\premake\Windows\premake5.exe --file=Build-Headless.lua vs2022 popd -pause \ No newline at end of file +pause diff --git a/scripts/Setup.sh b/scripts/Setup.sh index 5a037c7..664131d 100755 --- a/scripts/Setup.sh +++ b/scripts/Setup.sh @@ -1,5 +1,5 @@ #!/bin/bash -pushd .. +pushd "$(dirname "$0")"/.. Walnut/vendor/bin/premake/Linux/premake5 --cc=clang --file=Build-Headless.lua gmake2 popd From adb8985941df5032e0c4e10d879e9249dfc02582 Mon Sep 17 00:00:00 2001 From: "Loren M. Lang" Date: Sun, 26 Nov 2023 16:20:44 -0800 Subject: [PATCH 3/4] Ignore auto-generated files from build script --- .gitignore | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7ba8599..48cfc7c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# Temporary files +*~ +*.swp + # Directories .vs/ bin/ @@ -9,6 +13,10 @@ bin-int/ *.vcxproj.filters *.sln *.log +Makefile +ConnectionDetails.yaml +MessageHistory.yaml +imgui.ini # Exclude -!vendor/bin \ No newline at end of file +!vendor/bin From e6f85782d9c1984de92df5b64a4d2414b484aa86 Mon Sep 17 00:00:00 2001 From: "Loren M. Lang" Date: Sun, 26 Nov 2023 16:17:13 -0800 Subject: [PATCH 4/4] Fixed headless build on Linux --- App-Server/Build-App-Server-Headless.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/App-Server/Build-App-Server-Headless.lua b/App-Server/Build-App-Server-Headless.lua index 1ceb2ef..ca097df 100644 --- a/App-Server/Build-App-Server-Headless.lua +++ b/App-Server/Build-App-Server-Headless.lua @@ -54,7 +54,7 @@ project "App-Server-Headless" } filter "system:linux" - libdirs { "../Walnut/Walnut-Networking/vendor/GameNetworkingSockets/bin/Linux" } + libdirs { "../Walnut/Walnut-Modules/Walnut-Networking/vendor/GameNetworkingSockets/bin/Linux" } links { "GameNetworkingSockets" } defines { "WL_HEADLESS" } @@ -74,4 +74,4 @@ project "App-Server-Headless" defines { "WL_DIST" } runtime "Release" optimize "On" - symbols "Off" \ No newline at end of file + symbols "Off"