Got ClassicOS to build to 100% with some work to do left on isr and idt and gdt.

This commit is contained in:
Gregory Kenneth Bowne 2023-10-07 20:09:24 -07:00
parent 436ba162eb
commit 1630352383
3 changed files with 3 additions and 4 deletions

View File

@ -108,6 +108,5 @@
"*.asm": "default" "*.asm": "default"
}, },
"C_Cpp.default.intelliSenseMode": "linux-clang-x86", "C_Cpp.default.intelliSenseMode": "linux-clang-x86",
"cmake.cmakePath": "/usr/bin/cmake", "cmake.cmakePath": "/usr/bin/cmake"
"FSharp.suggestGitignore": false
} }

View File

@ -69,10 +69,11 @@ set(CMAKE_C_COMPILER gcc)
set(CMAKE_LINKER ld) set(CMAKE_LINKER ld)
set(CMAKE_EXE_LINKER_FLAGS "-g -s") set(CMAKE_EXE_LINKER_FLAGS "-g -s")
set(CMAKE_CXX_FLAGS "-g -Wall") set(CMAKE_CXX_FLAGS "-g -Wall")
set(CMAKE_C_FLAGS "-g -Wall") set(CMAKE_C_FLAGS "-g -Wall -m32")
set(CMAKE_BUILD_TYPE Debug) set(CMAKE_BUILD_TYPE Debug)
set(CMAKE_CXX_COMPILER g++) set(CMAKE_CXX_COMPILER g++)
set(CMAKE_ASM_COMPILER nasm) set(CMAKE_ASM_COMPILER nasm)
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --32")
set(CMAKE_SYSTEM_PROCESSOR i386) set(CMAKE_SYSTEM_PROCESSOR i386)
set(CMAKE_SYSTEM_NAME None) set(CMAKE_SYSTEM_NAME None)
set(CMAKE_ASM_NASM_COMPILER nasm) set(CMAKE_ASM_NASM_COMPILER nasm)

View File

@ -8,7 +8,6 @@
#include "../io/io.h" #include "../io/io.h"
#include "../keyboard/keyboard.h" #include "../keyboard/keyboard.h"
#include "../screen/screen.h" #include "../screen/screen.h"
#include "../string.h"
#include "./tty.h" #include "./tty.h"