X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=b0de66284cc20ddcf234bae4ff2b555f4708371d;hb=e7d0a33cc9b8bf0005799ab2fb5151f78a255772;hp=0ccb74adca40febb9e79a42ba9c8f276c15acd49;hpb=4b59aea79be4992af2b1c38ea43f6dacf939d782;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index 0ccb74ad..b0de6628 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -5,14 +5,14 @@
 # Install destination configuration
 DISTROOT := a:/Acess2
 xCP := mcopy -D o
-xMKDIR := mmd
+xMKDIR := mmd -D s
 
 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
@@ -37,13 +39,20 @@ endif
 
 FILESYSTEMS := 
 DRIVERS := 
-MODULES := Storage/ATA Storage/FDD
-MODULES += Network/NE2000
-MODULES += Display/VESA
-#MODULES += Display/BochsGA
+MODULES :=
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
 MODULES += Filesystems/NTFS
-MODULES += IPStack
-DYNMODS := USB/Core
+
+ifeq ($(ARCHDIR),x86)
+MODULES += Storage/ATA Storage/FDD
+MODULES += Network/NE2000
+MODULES += Display/VESA
+MODULES += Display/BochsGA
 MODULES += Interfaces/UDI
+MODULES += Input/PS2KbMouse
+MODULES += x86/ISADMA x86/VGAText
+endif
+
+MODULES += IPStack	# So the other modules are loaded before it
+DYNMODS := USB/Core