Usermode/libaxwin4 - Handle demarshal failure

[tpg/acess2.git] / Makefile.cfg

diff --git a/Makefile.cfg b/Makefile.cfg
index 0df599c..1eedf8e 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,14 +2,16 @@
 # Acess2 Build Configuration
 #
 
+ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
+ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
+
 # Install destination configuration
-DISTROOT := a:/Acess2
+DISTROOT := -i $(ACESSDIR)/Acess2.img ::/Acess2
+NCC := $(CC)
+NCXX := $(CXX)
 xCP := mcopy -D o
 xMKDIR := mmd -D s
 
-ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
-ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
-
 -include $(ACESSDIR)/Makefile.Version.cfg
 
 # Default build programs
@@ -34,12 +36,23 @@ ifeq ($(ARCHDIR),)
        ARCHDIR := x86
 endif
 
+# Default compilers
+ifneq ($(ARCHDIR),native)
+CC  = $(COMPILERDIR)bin/$(TRIPLET)-gcc
+CXX = $(COMPILERDIR)bin/$(TRIPLET)-g++
+LD  = $(COMPILERDIR)bin/$(TRIPLET)-ld
+OBJDUMP = $(COMPILERDIR)bin/$(TRIPLET)-objdump
+endif
+
 ifneq ($(ARCH),host)
  ifneq ($(ARCHDIR),$(ARCH))
   include $(ACESSDIR)/BuildConf/$(ARCHDIR)/Makefile.cfg
  endif
 endif
 
+COMPILERDIR := $(ACESSDIR)/Externals/Output/$(ARCHDIR)-BUILD/
+PATH := $(COMPILERDIR)bin/ $(PATH)
+
 ifeq ($(PLATFORM),)
        PLATFORM := default
 endif
@@ -51,6 +64,7 @@ endif
 DRIVERS := 
 MODULES :=
 
+MODULES += Filesystems/RAMDisk
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
 MODULES += Filesystems/NTFS
@@ -58,7 +72,14 @@ MODULES += Storage/LVM
 
 include $(ACESSDIR)/BuildConf/$(ARCH)/$(PLATFORM).mk
 
-MODULES += Input/Keyboard
+MODULES += Input/Keyboard Input/Mouse
 MODULES += IPStack     # So the other modules are loaded before it
 #DYNMODS := USB/Core
 #DYNMODS += Filesystems/InitRD
+
+# BUILD_DIST=y - Install to ./Dist
+ifneq ($(BUILD_DIST),)
+       DISTROOT := $(ACESSDIR)/Dist
+       xCP := cp
+       xMKDIR := mkdir -p
+endif