Build - Renamed $(CONFIG) to $(PLATFORM)

[tpg/acess2.git] / Kernel / Makefile

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 93ad6b6..c3fbc56 100644 (file)
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -15,37 +15,46 @@ BUILD_NUM = 0
 endif
 
 KERNEL_VERSION = $(ACESS_VERSION)
-
 MAKEDEP                = $(CC) -M
 
+ifeq ($(AS_SUFFIX),)
+       AS_SUFFIX = S
+endif
+
+ASFLAGS         += -D ARCHDIR_IS_$(ARCHDIR)=1 -D PLATFORM_is_$(PLATFORM)=1
 CPPFLAGS       += -I./include -I./arch/$(ARCHDIR)/include -D_MODULE_NAME_=\"Kernel\"
-CPPFLAGS       += -DARCH=$(ARCH) -DARCHDIR=$(ARCHDIR) -DARCHDIR_IS_$(ARCHDIR)=1
-CPPFLAGS       += -DKERNEL_VERSION=$(KERNEL_VERSION)
-CFLAGS         += -Wall -Werror -fno-stack-protector -Wstrict-prototypes -g
+CPPFLAGS       += -D ARCH=$(ARCH) -D ARCHDIR=$(ARCHDIR) -D ARCHDIR_IS_$(ARCHDIR)=1 -D PLATFORM_is_$(PLATFORM)=1
+CPPFLAGS       += -D KERNEL_VERSION=$(KERNEL_VERSION)
+CFLAGS         += -Wall -fno-stack-protector -Wstrict-prototypes -g
 CFLAGS         += -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wuninitialized
+CFLAGS          += -O3
 LDFLAGS                += -T arch/$(ARCHDIR)/link.ld -g
 
-OBJDIR := obj-$(ARCH)/
-#OBJSUFFIX := .$(ARCH)
+ifeq ($(PLATFORM),default)
+       OBJDIR := obj-$(ARCH)/
+       #OBJSUFFIX := .$(ARCH)
+       BIN := ../Acess2.$(ARCH).bin
+       GZBIN := ../Acess2.$(ARCH).gz
+else
+       OBJDIR := obj-$(ARCH)-$(PLATFORM)/
+       #OBJSUFFIX := .$(ARCH)-$(PLATFORM)
+       BIN := ../Acess2.$(ARCH)-$(PLATFORM).bin
+       GZBIN := ../Acess2.$(ARCH)-$(PLATFORM).gz
+endif
 
 ifeq ($(DEBUG_BUILD),yes)
        LDFLAGS += -g
        CFLAGS += -g
 endif
 
-ifeq ($(AS_SUFFIX),)
-       AS_SUFFIX = S
-endif
-
 BUILDINFO_OBJ := $(OBJDIR)buildinfo.o$(OBJSUFFIX)
 BUILDINFO_SRC := $(OBJDIR)buildinfo.c$(OBJSUFFIX)
 
 OBJ := $(addprefix arch/$(ARCHDIR)/,$(A_OBJ))
 OBJ += heap.o drvutil.o logging.o debug.o lib.o adt.o time.o
-OBJ += messages.o modules.o syscalls.o system.o threads.o
-OBJ += $(addprefix vfs/fs/, $(addsuffix .o,$(FILESYSTEMS)))
+OBJ += messages.o modules.o syscalls.o system.o
+OBJ += threads.o mutex.o semaphore.o workqueue.o
 OBJ += drv/vterm.o drv/proc.o drv/fifo.o drv/iocache.o drv/pci.o
-#OBJ += drv/kb.o drv/dma.o drv/vga.o
 OBJ += binary.o bin/elf.o bin/pe.o
 OBJ += vfs/main.o vfs/open.o vfs/acls.o vfs/dir.o vfs/io.o vfs/mount.o
 OBJ += vfs/memfile.o vfs/nodecache.o vfs/handle.o vfs/select.o vfs/mmap.o
@@ -56,8 +65,6 @@ OBJ := $(addsuffix $(OBJSUFFIX), $(OBJ))
 OBJ := $(addprefix $(OBJDIR), $(OBJ))
 
 MODS += $(addprefix ../Modules/, $(addsuffix .xo.$(ARCH),$(MODULES)))
-BIN = ../Acess2.$(ARCH).bin
-GZBIN = ../Acess2.$(ARCH).gz
 
 DEPFILES := $(OBJ:%$(OBJSUFFIX)=%.dep$(OBJSUFFIX))
 
@@ -77,9 +84,9 @@ clean:
 install: $(BIN) 
        cp $(BIN) $(BIN)_
        $(STRIP) $(BIN)_
-       gzip -c $(BIN)_ > ../Acess2.$(ARCH).gz
+       gzip -c $(BIN)_ > $(GZBIN)
        $(RM) $(BIN)_
-       $(xCP) ../Acess2.$(ARCH).gz $(DISTROOT)
+       $(xCP) $(GZBIN) $(DISTROOT)
 
 apidoc:
        doxygen Doxyfile.api