Fix Makefile & misc fixes

This commit is contained in:
m0th 2025-10-23 17:15:01 -04:00
parent 3d233c3250
commit ae9d22052f
4 changed files with 47 additions and 45 deletions

View File

@ -6,28 +6,6 @@
# in game, stop loot spam #logs set gmsay 69 0 # in game, stop loot spam #logs set gmsay 69 0
NAME := eqemu-server NAME := eqemu-server
is-vscode:
@if [ -z "$$REMOTE_CONTAINERS" ]; then \
echo "Not running in VS Code devcontainer"; \
exit 1; \
fi
.PHONY: build
build: is-vscode
@cd patch && make patch --no-print-directory
cd build$$BUILD_SUFFIX && cmake --build . --config Release --target all --
.PHONY: cmake
cmake: is-vscode
@echo "working directory: $$PWD"
mkdir -p build$$BUILD_SUFFIX
@cd build$$BUILD_SUFFIX && cmake -DEQEMU_BUILD_LOGIN=ON \
-DEQEMU_BUILD_TESTS=ON \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache -G Ninja ..
clean: is-vscode
rm -rf build
.PHONY: prep .PHONY: prep
prep: is-vscode prep: is-vscode
@echo "Preparing build/bin for usage..." @echo "Preparing build/bin for usage..."
@ -73,6 +51,15 @@ prep: is-vscode
@echo "Eqemu is prepared. Edit build/bin/eqemu_config.json to configure." @echo "Eqemu is prepared. Edit build/bin/eqemu_config.json to configure."
is-vscode:
@if [ -z "$$REMOTE_CONTAINERS" ]; then \
echo "Not running in VS Code devcontainer"; \
exit 1; \
fi
clean: is-vscode
rm -rf build
.PHONY: maps .PHONY: maps
maps: is-vscode maps: is-vscode
@echo "Downloading maps..." @echo "Downloading maps..."
@ -104,7 +91,7 @@ shared: is-vscode check-mariadb
# Runs zone binary # Runs zone binary
.PHONY: zone .PHONY: zone
zone: is-vscode check-mariadb zone: is-vscode check-mariadb
@-rm build/bin/logs/zone/zone*.log @find build/bin/logs/zone/ -type f -name 'zone*.log' -exec rm -f {} +
cd build/bin && ./zone cd build/bin && ./zone
check-mariadb: is-vscode check-mariadb: is-vscode
@ -115,19 +102,19 @@ check-mariadb: is-vscode
# Runs world binary # Runs world binary
.PHONY: world .PHONY: world
world: is-vscode check-mariadb world: is-vscode check-mariadb
@-rm build/bin/logs/world*.log @find build/bin/logs/ -type f -name 'world*.log' -exec rm -f {} +
cd build/bin && ./world cd build/bin && ./world
# Runs ucs binary # Runs ucs binary
.PHONY: ucs .PHONY: ucs
ucs: is-vscode check-mariadb ucs: is-vscode check-mariadb
@-rm build/bin/logs/ucs*.log @find build/bin/logs/ -type f -name 'ucs*.log' -exec rm -f {} +
cd build/bin && ./ucs cd build/bin && ./ucs
# Runs queryserv binary # Runs queryserv binary
.PHONY: queryserv .PHONY: queryserv
queryserv: is-vscode check-mariadb queryserv: is-vscode check-mariadb
@-rm build/bin/logs/query_server*.log @find build/bin/logs/ -type f -name 'query_server*.log' -exec rm -f {} +
cd build/bin && ./queryserv cd build/bin && ./queryserv
reset-content: reset-content:

View File

@ -40,10 +40,41 @@
"GitHub.copilot", "GitHub.copilot",
"xackery.make-magic", "xackery.make-magic",
"Gruntfuggly.todo-tree", "Gruntfuggly.todo-tree",
"ms-vscode.cmake-tools" "ms-vscode.cmake-tools",
] "sumneko.lua"
],
"settings": {
"Lua.runtime.version": "Lua 5.1",
"Lua.workspace.library": [
"/src/repo/eqemu-definitions"
],
"Lua.diagnostics.disable": [
"lowercase-global"
],
"cmake.statusbar.advanced": {
"kit": {
"visibility": "hidden"
},
"debug": {
"visibility": "hidden"
},
"buildTarget": {
"visibility": "compact"
},
"launch": {
"visibility": "hidden"
},
"ctest": {
"visibility": "icon"
}
}
}
} }
}, },
"mounts": [
"source=${localWorkspaceFolder}/.devcontainer/Makefile,target=/src/Makefile,type=bind,consistency=cached"
],
"workspaceFolder": "/src", "workspaceFolder": "/src",
"workspaceMount": "source=${localWorkspaceFolder},target=/src,type=bind,consistency=cached" "workspaceMount": "source=${localWorkspaceFolder},target=/src,type=bind,consistency=cached"
} }

1
.gitignore vendored
View File

@ -22,6 +22,7 @@
# CMake # CMake
CMakeCache.txt CMakeCache.txt
CMakeFiles CMakeFiles
Makefile
cmake_install.cmake cmake_install.cmake
install_manifest.txt install_manifest.txt
[Bb]uild*/ [Bb]uild*/

17
.vscode/settings.json vendored
View File

@ -107,22 +107,5 @@
"format": "cpp", "format": "cpp",
"ranges": "cpp", "ranges": "cpp",
"span": "cpp" "span": "cpp"
},
"cmake.statusbar.advanced": {
"kit": {
"visibility": "hidden",
},
"debug": {
"visibility": "hidden",
},
"buildTarget": {
"visibility": "hidden",
},
"launch": {
"visibility": "hidden",
},
"ctest": {
"visibility": "icon",
}
} }
} }