diff options
| author | Marvin Borner | 2020-01-03 22:14:55 +0100 |
|---|---|---|
| committer | Marvin Borner | 2020-01-03 22:14:55 +0100 |
| commit | fe74f33641696bc31022737ddf1d618dec20c87f (patch) | |
| tree | 01f45cfa7d4a717a8429c9bb36f37e50029dfaea /src | |
| parent | a67919783e4c69644b24a0ced0d5373bb8adf794 (diff) | |
I don't like CMake
I switched to basic shell scripts now
Diffstat (limited to 'src')
| -rw-r--r-- | src/userspace/graphics/graphics.h | 2 | ||||
| -rw-r--r-- | src/userspace/start.asm | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/userspace/graphics/graphics.h b/src/userspace/graphics/graphics.h index 6197020..a0dcaf5 100644 --- a/src/userspace/graphics/graphics.h +++ b/src/userspace/graphics/graphics.h @@ -1,6 +1,8 @@ #ifndef MELVIX_GRAPHICS_H #define MELVIX_GRAPHICS_H +#include <stdint.h> + struct font { uint16_t font_32[758][32]; uint16_t font_24[758][24]; diff --git a/src/userspace/start.asm b/src/userspace/start.asm index 488101c..8a7e015 100644 --- a/src/userspace/start.asm +++ b/src/userspace/start.asm @@ -1,9 +1,6 @@ bits 32 -section .start_section - dd _start section .text - global _start extern user_main _start: mov esp, ebp |