8000 Fix headless build on Linux by penguin359 · Pull Request #8 · TheCherno/Walnut-Chat · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix headless build on Linux #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
+14 −6
Draft

Fix headless build on Linux #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36f780c
Fixed executability of shell script
penguin359 Nov 27, 2023
fc8f603
Make setup scripts executable from any directory
penguin359 Nov 27, 2023
adb8985
Ignore auto-generated files from build script
penguin359 Nov 27, 2023
e6f8578
Fixed headless build on Linux
penguin359 Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Temporary files
*~
*.swp

# Directories
.vs/
bin/
Expand All @@ -9,6 +13,10 @@ bin-int/
*.vcxproj.filters
*.sln
*.log
Makefile
ConnectionDetails.yaml
MessageHistory.yaml
imgui.ini

# Exclude
!vendor/bin
!vendor/bin
4 changes: 2 additions & 2 deletions App-Server/Build-App-Server-Headless.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -74,4 +74,4 @@ project "App-Server-Headless"
defines { "WL_DIST" }
runtime "Release"
optimize "On"
symbols "Off"
symbols "Off"
4 changes: 2 additions & 2 deletions scripts/Setup.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
pause
2 changes: 1 addition & 1 deletion scripts/Setup.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash

pushd ..
pushd "$(dirname "$0")"/..
Walnut/vendor/bin/premake/Linux/premake5 --cc=clang --file=Build-Headless.lua gmake2
popd
0