Remove fullspec/standard sub-folder

cpp/.vscode/launch.json

@@ -8,7 +8,7 @@
             "name": "rascsi (gdb) Launch",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/bin/fullspec/rascsi",
+            "program": "${workspaceFolder}/bin/rascsi",
             "args": [],
             "stopAtEntry": true,
             "cwd": "${workspaceFolder}",
@@ -29,7 +29,7 @@
             "name": "rascsi_test (gdb) Launch",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/bin/fullspec/rascsi_test",
+            "program": "${workspaceFolder}/bin/rascsi_test",
             "args": [],
             "stopAtEntry": true,
             "cwd": "${fileDirname}",
@@ -50,4 +50,4 @@
             ]
         },
     ]
-}
+}

cpp/Makefile

@@ -60,8 +60,8 @@ COVERAGE_DIR = coverage
 COVERAGE_FILE = piscsi.dat
 OS_FILES = ../os_integration
 
-OBJDIR := obj/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
-BINDIR := bin/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
+OBJDIR := obj
+BINDIR := bin
 
 BIN_ALL = \
 	$(BINDIR)/$(PISCSI) \