From 29177bc94d28430d3e81f8dced14b4f73bc74dfa Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Sat, 22 Mar 2025 10:02:35 +0100 Subject: [PATCH 1/2] refactor xmake.lua --- README.md | 7 ------- xmake.lua | 21 ++++++++++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 8514106..3762672 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,6 @@ You need to install xmake and have a compiler with c++20 compatibility -### Install the necessary dependencies - -``xrepo install sfml`` - -Package location (on Linux) for IntelliSense: -``home//.xmake/packages/**`` - ### Build the project ``cd jminos`` diff --git a/xmake.lua b/xmake.lua index d889008..d534d59 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,19 +1,26 @@ +add_rules("mode.debug", "mode.release") + +add_requires("sfml 3.0.0") + set_languages("c++20") -set_optimize("fastest") + set_rundir(".") -add_requires("sfml") + +target("core") + set_kind("$(kind)") + add_files("src/Pieces/*.cpp") + add_files("src/Core/*.cpp") target("text") set_kind("binary") - add_files("./src/Pieces/*.cpp") - add_files("./src/Core/*.cpp") + set_default(false) add_files("./src/TextUI/*.cpp") + add_deps("core") target("graph") set_kind("binary") - add_files("./src/Pieces/*.cpp") - add_files("./src/Core/*.cpp") - add_files("./src/GraphicalUI/*.cpp") + add_files("./src/GraphicalUI/**.cpp") + add_deps("core") add_packages("sfml") -- From ea8478275bd61ab8883988d09d435ee0b1338300 Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Sat, 22 Mar 2025 10:02:46 +0100 Subject: [PATCH 2/2] add vscode Intellisense --- .vscode/c_cpp_properties.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .vscode/c_cpp_properties.json diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..79b93da --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,10 @@ +{ + "configurations": [ + { + "name": "JMinos", + "cppStandard": "c++20", + "compileCommands": ".vscode/compile_commands.json" + } + ], + "version": 4 +} \ No newline at end of file