Skip to content

Commit

Permalink
Setup Makefile graphics/textmode VGA
Browse files Browse the repository at this point in the history
  • Loading branch information
amanuel2 committed May 2, 2017
1 parent 5d1c565 commit a98e3ba
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 14 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ export MEMORY_USE_RAM

VIDEO_DRIVER := VGA
VIDEO_DRIVER_LOW := vga
VIDEO_DRIVER_MODE := textmode
VIDEO_DRIVER_RES_W := 80
VIDEO_DRIVER_RES_H := 25
VIDEO_DRIVER_MODE := graphics_mode
VIDEO_DRIVER_RES_W := 320
VIDEO_DRIVER_RES_H := 200
VIDEO_DRIVER_RES := $(VIDEO_DRIVER_RES_W)x$(VIDEO_DRIVER_RES_H)
export VIDEO_DRIVER
export VIDEO_DRIVER_LOW
Expand Down
26 changes: 15 additions & 11 deletions platform/pc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,23 @@ CSRCS = \
drv/pcspkr/pcspkr.c \
drv/serial/serialport.c \
drv/video/$(VIDEO_DRIVER)/$(VIDEO_DRIVER_LOW).c \
drv/video/VGA/graphics/graphics.c \
drv/video/VGA/graphics/vga_graphics.c

ifeq ($(VIDEO_DRIVER),VGA)
ifeq ($(VIDEO_DRIVER_MODE),textmode)
CSRCS += \
drv/video/$(VIDEO_DRIVER)/$(VIDEO_DRIVER_MODE)/utils.c \
drv/video/$(VIDEO_DRIVER)/$(VIDEO_DRIVER_MODE)/putch.c \
drv/video/$(VIDEO_DRIVER)/$(VIDEO_DRIVER_MODE)/clear.c \
drv/video/$(VIDEO_DRIVER)/$(VIDEO_DRIVER_MODE)/term_scroll.c \
drv/video/$(VIDEO_DRIVER)/$(VIDEO_DRIVER_MODE)/vga_textmode.c \
drv/video/$(VIDEO_DRIVER)/$(VIDEO_DRIVER_MODE)/update_cursor.c
endif
ifeq ($(VIDEO_DRIVER_MODE),textmode)
CSRCS += \
drv/video/$(VIDEO_DRIVER)/$(VIDEO_DRIVER_MODE)/utils.c \
drv/video/$(VIDEO_DRIVER)/$(VIDEO_DRIVER_MODE)/putch.c \
drv/video/$(VIDEO_DRIVER)/$(VIDEO_DRIVER_MODE)/clear.c \
drv/video/$(VIDEO_DRIVER)/$(VIDEO_DRIVER_MODE)/term_scroll.c \
drv/video/$(VIDEO_DRIVER)/$(VIDEO_DRIVER_MODE)/vga_textmode.c \
drv/video/$(VIDEO_DRIVER)/$(VIDEO_DRIVER_MODE)/update_cursor.c
else ifeq ($(VIDEO_DRIVER_MODE),graphics_mode)
CSRCS += \
drv/video/VGA/graphics/graphics.c \
drv/video/VGA/graphics/vga_graphics.c
else
CSRCS +=
endif
endif


Expand Down
1 change: 1 addition & 0 deletions platform/pc/drv/video/VGA/vga.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <drv/video/VGA/textmode/vga_textmode.h>
#include <drv/video/VGA/textmode/update_cursor.h>
#include <drv/video/VGA/textmode/putch.h>
#include <drv/video/VGA/graphics/graphics.h>
#include <string/string.h>

struct video_driver_t vga_driver =
Expand Down

0 comments on commit a98e3ba

Please sign in to comment.