From d0a049d994728e6142a2a1f6f9bdae72da9509c2 Mon Sep 17 00:00:00 2001
From: Stephen Toth <stephentoth.st@gmail.com>
Date: Sat, 23 Sep 2023 10:57:51 -0400
Subject: [PATCH] fixed up toolchain and build options

---
 .vscode/launch.json   |   3 ++-
 .vscode/settings.json |   9 +++++++++
 .vscode/tasks.json    |  17 ++++++++++++++++-
 Makefile              |  11 +++--------
 src/main              | Bin 28272 -> 28272 bytes
 src/main.c            |   4 ----
 6 files changed, 30 insertions(+), 14 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 6a353b6..7a2403b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,9 +6,10 @@
     "configurations": [
     {
          "name": "colorwrap",
+         "type": "cppdbg",
          "request": "launch",
          "program": "${workspaceFolder}/bin/cterm",
-         "args": ["cterm", "/bin/sh"],
+         "args": ["/bin/sh"],
          "cwd": "${workspaceFolder}/"
     }]
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..2130696
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,9 @@
+{
+    "makefile.launchConfigurations": [
+        {
+            "cwd": "/home/icaema/Documents/tools/colorwrap/bin",
+            "binaryPath": "/home/icaema/Documents/tools/colorwrap/bin/cterm",
+            "binaryArgs": []
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index d915286..63b0ad0 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,5 +1,20 @@
 {
     "tasks": [
+        {
+            "type": "cppbuild",
+            "label": "Make Build",
+            "command": "make",
+            "args": [
+                "--directory=${workspaceFolder}"
+            ],
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
         {
             "type": "cppbuild",
             "label": "C/C++: gcc build active file",
@@ -19,7 +34,7 @@
             ],
             "group": {
                 "kind": "build",
-                "isDefault": true
+                "isDefault": false
             },
             "detail": "Task generated by Debugger."
         }
diff --git a/Makefile b/Makefile
index 9114944..72868fe 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ TARGET := bin/cterm
 SRCEXT := c
 SOURCES := $(shell find $(SRCDIR) -type f -name *.$(SRCEXT))
 OBJECTS := $(patsubst $(SRCDIR)/%,$(BUILDDIR)/%,$(SOURCES:.$(SRCEXT)=.o))
-CFLAGS := 
+CFLAGS := -Wall
 LIB := -L lib
 INC := -I include
 
@@ -22,12 +22,7 @@ clean:
 	@echo " Cleaning..."; 
 	@echo " $(RM) -r $(BUILDDIR) $(TARGET)"; $(RM) -r $(BUILDDIR) $(TARGET)
 
-# Tests
-tester:
-	$(CC) $(CFLAGS) test/tester.cpp $(INC) $(LIB) -o bin/tester
-
-# Spikes
-ticket:
-	$(CC) $(CFLAGS) spikes/ticket.cpp $(INC) $(LIB) -o bin/ticket
+test:
+	$(TARGET) /bin/shxi
 
 .PHONY: clean
diff --git a/src/main b/src/main
index 81b41dca9c99ae1e1cde544cea85c9dbb48191fe..bd3e47245755973ba64f9a0c642f1f39ccaa277a 100755
GIT binary patch
delta 119
zcmexxhw;N5#tj|JBD)3MyDnEBGtl43e%bD<^1Jf&Zc8`MVLs`}C^I?DSHW6_FO7kL
zfqCMYc>Xj-1_l|aS4<%8fq0H^AXk<RB+E20hGQ>~mgBexlw_Ki!?6rV8&5vyE6ixO
Q`Ks?iCPw?s<pDos0m7LjDF6Tf

delta 119
zcmexxhw;N5#tj|JA~6yFCa!!Sy{6q^!Xy`)3n$mlTBEpm4)aM*Muo{~z6#a~d}#~}
z49pYH#Pg>yGB7Aey<!4!55#kX1G$Q9AX%n~F&uk=v=YZfpd{189FAo`+I;dsUtvb4
R%~yRFGBG-DE)V!A3jiVeCL{m=

diff --git a/src/main.c b/src/main.c
index aa79cab..1e27e83 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,10 +25,6 @@ void child_process(char *argv[]){
 }
 
 
-
-
-
-
 int main(int argc, char *argv[]) {
 	int master;
 	pid_t child_pid;