X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2FMakefile;h=4cc939ecf1808198b74d8e4e15e4a4a9f06d548b;hb=b3398bcfe17be9751d98a0dcd8ccd27bb1568039;hp=91bee8b317412af4ee4e70d837d75256e457d9ac;hpb=542d8ba58741acef4f373b8e4395e03136c5404c;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/Makefile b/AcessNative/acesskernel_src/Makefile
index 91bee8b3..4cc939ec 100644
--- a/AcessNative/acesskernel_src/Makefile
+++ b/AcessNative/acesskernel_src/Makefile
@@ -1,32 +1,42 @@
 # AcessNative Server
 # Makefile
 
+-include ../../Makefile.Version.cfg
+-include Makefile.BuildNum
+ifeq ($(BUILD_NUM),)
+BUILD_NUM = 1
+endif
+
 ifeq ($(PLATFORM),)
 	PLATFORM := lin
 endif
 
-KERNEL_SRC = ../../Kernel/
+KERNEL_SRC = ../../KernelLand/Kernel/
 
-KERNEL_OBJ := logging.o adt.o lib.o drvutil.o debug.o
+KERNEL_OBJ := logging.o adt.o lib.o drvutil.o debug.o messages.o
 KERNEL_OBJ += vfs/main.o vfs/open.o vfs/acls.o vfs/io.o vfs/dir.o
 KERNEL_OBJ += vfs/nodecache.o vfs/mount.o vfs/memfile.o vfs/select.o
 KERNEL_OBJ += vfs/fs/root.o vfs/fs/devfs.o
-KERNEL_OBJ += drv/vterm.o drv/fifo.o drv/proc.o
+KERNEL_OBJ += drv/fifo.o drv/proc.o
+KERNEL_OBJ += drv/vterm.o drv/vterm_font.o drv/vterm_vt100.o drv/vterm_output.o drv/vterm_input.o drv/vterm_termbuf.o
 
 N_OBJ := main.o
 
+BUILDINFO_OBJ := obj-$(PLATFORM)/buildinfo.o
+BUILDINFO_SRC := $(BUILDINFO_OBJ:%.o=%.c)
+
 OBJ := helpers.o threads.o server.o syscalls.o
 OBJ += video.o keyboard.o mouse.o nativefs.o vfs_handle.o ui_sdl.o
 OBJ := $(addprefix obj-$(PLATFORM)/,$(OBJ))
 N_OBJ := $(addprefix obj-$(PLATFORM)/,$(N_OBJ))
-K_OBJ := $(addprefix $(KERNEL_SRC)obj-$(PLATFORM)/,$(KERNEL_OBJ))
+K_OBJ := $(addprefix $(KERNEL_SRC)obj-native-$(PLATFORM)/,$(KERNEL_OBJ))
 
 DEPFILES  = $(filter %.o,$(OBJ) $(N_OBJ) $(K_OBJ))
 DEPFILES := $(DEPFILES:%=%.dep)
 
 CPPFLAGS += -I include/ -I $(KERNEL_SRC)include/
 CFLAGS += -Wall -g
-LDFLAGS += -lSDL -lSDLmain -g
+LDFLAGS += -lSDL -lSDLmain -g -Wl,--defsym,__buildnum=$(BUILD_NUM)
 
 ifeq ($(PLATFORM),win)
 	BIN := ../AcessKernel.exe
@@ -43,9 +53,10 @@ all: $(BIN)
 clean:
 	$(RM) $(BIN) $(OBJ) $(N_OBJ) $(K_OBJ) $(DEPFILES)
 
-$(BIN): $(OBJ) $(N_OBJ) $(K_OBJ)
+$(BIN): $(OBJ) $(N_OBJ) $(K_OBJ) $(BUILDINFO_OBJ)
 	@echo [LINK] -o $@
-	@$(CC) $(LDFLAGS) -o $@ $(N_OBJ) $(K_OBJ) $(OBJ)
+	@$(CC) -o $@ $(N_OBJ) $(K_OBJ) $(OBJ) $(BUILDINFO_OBJ) $(LDFLAGS)
+	@echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum
 
 $(OBJ): obj-$(PLATFORM)/%.o: %.c
 	@mkdir -p $(dir $@)
@@ -53,7 +64,7 @@ $(OBJ): obj-$(PLATFORM)/%.o: %.c
 	@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
 	@$(CC) -M $(CPPFLAGS) -MT $@ -o $@.dep $<
 
-$(K_OBJ): $(KERNEL_SRC)obj-$(PLATFORM)/%.o: $(KERNEL_SRC)%.c
+$(K_OBJ): $(KERNEL_SRC)obj-native-$(PLATFORM)/%.o: $(KERNEL_SRC)%.c
 	@mkdir -p $(dir $@)
 	@echo [CC] -o $@
 	@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
@@ -66,4 +77,13 @@ $(N_OBJ): obj-$(PLATFORM)/%.o: %.c
 	@$(CC) -c $< -o $@ $(CFLAGS)
 	@$(CC) -M -MT $@ -o $@.dep $<
 
+$(BUILDINFO_SRC): $(filter-out $(BUILDINFO_OBJ), $(OBJ)) Makefile
+	@echo "" > $@
+	@echo "const char gsKernelVersion[] = \"$(ACESS_VERSION)\";" >> $@
+	@echo "const char gsGitHash[] = \""`git log -n 1 | head -n 1 | awk '{print $$2}'`"\";" >> $@
+	@echo "const int giBuildNumber = $(BUILD_NUM);" >> $@
+$(BUILDINFO_OBJ): $(BUILDINFO_SRC)
+	@echo [CC] -o $@
+	@$(CC) -o $@ -c $< $(CFLAGS) $(CPPFLAGS)
+
 -include $(DEPFILES)