Merge branch 'master' of [email protected]:acess2

[tpg/acess2.git] / Makefile.cfg

diff --git a/Makefile.cfg b/Makefile.cfg
index 8c5b59b..4155f5e 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -11,8 +11,8 @@ ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
 ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
 
 # Default build programs
-CC := gcc
-LD := ld
+#CC := gcc
+#LD := ld
 AS := nasm
 DISASM := objdump -d -S
 RM := @rm -f
@@ -29,7 +29,9 @@ endif
 ifeq ($(ARCHDIR),)
        ARCHDIR := x86
 endif
+ifneq ($(ARCH),host)
 -include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
+endif
 
 # Makefile.user.cfg is not part of the Acess git repo,
 # It is for overriding the options in this file
@@ -40,10 +42,12 @@ DRIVERS :=
 MODULES := Storage/ATA Storage/FDD
 MODULES += Network/NE2000
 MODULES += Display/VESA
-#MODULES += Display/BochsGA
+MODULES += Display/BochsGA
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
 MODULES += Filesystems/NTFS
 MODULES += IPStack
 DYNMODS := USB/Core
 MODULES += Interfaces/UDI
+MODULES += Input/PS2KbMouse
+MODULES += x86/ISADMA