switched build scripts to make

kmicki · Jul 7, 2022 · 04af8ab · 04af8ab
1 parent 567fd5b
commit 04af8ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 41 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -10,26 +10,8 @@
 			"type": "cppbuild",
 			"label": "Build",
 			"dependsOn": "Prepare build",
-			"command": "/usr/bin/g++",
-			"args": [
-				"-std=c++2a",
-				"-O3",
-				"-fdiagnostics-color=always",
-				"-I",
-				"${workspaceFolder}/inc",
-				"$(find",
-				"${workspaceFolder}/src",
-				"-type",
-				"f",
-				"-iregex",
-				"'.*\\.cpp'",
-				"-printf",
-				"'%p\\n')",
-				"-pthread",
-				"-lncurses",
-				"-o",
-				"${workspaceFolder}/bin/release/sdgyrodsu"
-			],
+			"command": "/usr/sbin/make",
+			"args": [],
 			"options": {
 				"cwd": "${workspaceFolder}"
 			},
@@ -46,26 +28,8 @@
 			"type": "cppbuild",
 			"label": "Build Debug",
 			"dependsOn": "Prepare build",
-			"command": "/usr/bin/g++",
-			"args": [
-				"-std=c++2a",
-				"-fdiagnostics-color=always",
-				"-I",
-				"${workspaceFolder}/inc",
-				"-g",
-				"$(find",
-				"${workspaceFolder}/src",
-				"-type",
-				"f",
-				"-iregex",
-				"'.*\\.cpp'",
-				"-printf",
-				"'%p\\n')",
-				"-pthread",
-				"-lncurses",
-				"-o",
-				"${workspaceFolder}/bin/debug/sdgyrodsu"
-			],
+			"command": "/usr/sbin/make",
+			"args": [ "debug" ],
 			"options": {
 				"cwd": "${workspaceFolder}"
 			},

diff --git a/build.sh b/build.sh
@@ -1,7 +1,8 @@
 ./prepare.sh
 
 echo "Building source..."
-g++ -std=c++2a -O3 $(find inc -type d -printf '-I %p\n') $(find src -type f -iregex '.*\.cpp' -printf '%p\n') -pthread -lncurses -o bin/release/sdgyrodsu
+#g++ -std=c++2a -O3 $(find inc -type d -printf '-I %p\n') $(find src -type f -iregex '.*\.cpp' -printf '%p\n') -pthread -lncurses -o bin/release/sdgyrodsu
+make
 
 result=$?