diff --git a/.vscode/settings.json b/.vscode/settings.json index be12ede..7ff079b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -108,6 +108,5 @@ "*.asm": "default" }, "C_Cpp.default.intelliSenseMode": "linux-clang-x86", - "cmake.cmakePath": "/usr/bin/cmake", - "FSharp.suggestGitignore": false + "cmake.cmakePath": "/usr/bin/cmake" } \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index e11aa88..40c9a84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,10 +69,11 @@ set(CMAKE_C_COMPILER gcc) set(CMAKE_LINKER ld) set(CMAKE_EXE_LINKER_FLAGS "-g -s") 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_CXX_COMPILER g++) set(CMAKE_ASM_COMPILER nasm) +set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --32") set(CMAKE_SYSTEM_PROCESSOR i386) set(CMAKE_SYSTEM_NAME None) set(CMAKE_ASM_NASM_COMPILER nasm) diff --git a/src/drivers/tty/tty.c b/src/drivers/tty/tty.c index a82948a..7287f00 100644 --- a/src/drivers/tty/tty.c +++ b/src/drivers/tty/tty.c @@ -8,7 +8,6 @@ #include "../io/io.h" #include "../keyboard/keyboard.h" #include "../screen/screen.h" -#include "../string.h" #include "./tty.h"