fixed some vscode settings

asinha94 · Jun 14, 2020 · 7bd866e · 7bd866e
1 parent e98b2f8
commit 7bd866e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,4 @@
-cc/
-cc-files/
 **/build
 **/bin
 **/*.o
-.vscode/ipch
-.gdb_history
+.vscode/ipch
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -6,7 +6,7 @@
                 "${workspaceFolder}/**"
             ],
             "defines": [],
-            "compilerPath": "${workspaceFolder}/cc/bin/i686-elf-gcc",
+            "compilerPath": "${workspaceFolder}/build/gcc-7.5.0/bin/i686-elf-gcc",
             "cStandard": "c11",
             "cppStandard": "c++17",
             "intelliSenseMode": "clang-x64"

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ DEST_DIR = $(PREFIX)/bin
 BUILD_DIR = $(PREFIX)/build
 SRC_DIR = $(PREFIX)/kernel
 CC_VERSION = gcc-7.5.0
-CROSS_CC_DIR = $(PREFIX)/../build/$(CC_VERSION)/bin
+CROSS_CC_DIR = $(BUILD_DIR)/$(CC_VERSION)/bin
 
 QEMU = /mnt/c/Program\ Files/qemu/qemu-system-i386.exe
 CC = $(CROSS_CC_DIR)/i686-elf-gcc
@@ -53,7 +53,7 @@ qemu: asos.bin
 	@$(QEMU) -kernel $(DEST_DIR)/asos.bin -no-reboot  -monitor stdio
 
 clean:
-	@rm -rf $(DEST_DIR) $(BUILD_DIR) $(ARCHOBJS) $(KERNOBJS) *.o */*.o */*/*.o */*/*/*.o
+	@rm -rf $(DEST_DIR) $(ARCHOBJS) $(KERNOBJS)  $(shell find $(SRC_DIR)/ -name *.o)
 
 print-%:
 	@echo $* = $($*)