AcessNative - Cleanup and slight fixes.

[tpg/acess2.git] / AcessNative / acesskernel_src / Makefile

diff --git a/AcessNative/acesskernel_src/Makefile b/AcessNative/acesskernel_src/Makefile
index 91bee8b..ec64b5f 100644 (file)
--- a/AcessNative/acesskernel_src/Makefile
+++ b/AcessNative/acesskernel_src/Makefile
@@ -1,6 +1,12 @@
 # AcessNative Server\r
 # Makefile\r
 \r
+-include ../../Makefile.Version.cfg\r
+-include Makefile.BuildNum\r
+ifeq ($(BUILD_NUM),)\r
+BUILD_NUM = 1\r
+endif\r
+\r
 ifeq ($(PLATFORM),)\r
        PLATFORM := lin\r
 endif\r
@@ -15,18 +21,21 @@ KERNEL_OBJ += drv/vterm.o drv/fifo.o drv/proc.o
 \r
 N_OBJ := main.o\r
 \r
+BUILDINFO_OBJ := obj-$(PLATFORM)/buildinfo.o\r
+BUILDINFO_SRC := $(BUILDINFO_OBJ:%.o=%.c)\r
+\r
 OBJ := helpers.o threads.o server.o syscalls.o\r
 OBJ += video.o keyboard.o mouse.o nativefs.o vfs_handle.o ui_sdl.o\r
 OBJ := $(addprefix obj-$(PLATFORM)/,$(OBJ))\r
 N_OBJ := $(addprefix obj-$(PLATFORM)/,$(N_OBJ))\r
-K_OBJ := $(addprefix $(KERNEL_SRC)obj-$(PLATFORM)/,$(KERNEL_OBJ))\r
+K_OBJ := $(addprefix $(KERNEL_SRC)obj-native-$(PLATFORM)/,$(KERNEL_OBJ))\r
 \r
 DEPFILES  = $(filter %.o,$(OBJ) $(N_OBJ) $(K_OBJ))\r
 DEPFILES := $(DEPFILES:%=%.dep)\r
 \r
 CPPFLAGS += -I include/ -I $(KERNEL_SRC)include/\r
 CFLAGS += -Wall -g\r
-LDFLAGS += -lSDL -lSDLmain -g\r
+LDFLAGS += -lSDL -lSDLmain -g -Wl,--defsym,__buildnum=$(BUILD_NUM)\r
 \r
 ifeq ($(PLATFORM),win)\r
        BIN := ../AcessKernel.exe\r
@@ -43,9 +52,10 @@ all: $(BIN)
 clean:\r
        $(RM) $(BIN) $(OBJ) $(N_OBJ) $(K_OBJ) $(DEPFILES)\r
 \r
-$(BIN): $(OBJ) $(N_OBJ) $(K_OBJ)\r
+$(BIN): $(OBJ) $(N_OBJ) $(K_OBJ) $(BUILDINFO_OBJ)\r
        @echo [LINK] -o $@\r
-       @$(CC) $(LDFLAGS) -o $@ $(N_OBJ) $(K_OBJ) $(OBJ)\r
+       @$(CC) -o $@ $(N_OBJ) $(K_OBJ) $(OBJ) $(BUILDINFO_OBJ) $(LDFLAGS)\r
+       @echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum\r
 \r
 $(OBJ): obj-$(PLATFORM)/%.o: %.c\r
        @mkdir -p $(dir $@)\r
@@ -53,7 +63,7 @@ $(OBJ): obj-$(PLATFORM)/%.o: %.c
        @$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)\r
        @$(CC) -M $(CPPFLAGS) -MT $@ -o [email protected] $<\r
 \r
-$(K_OBJ): $(KERNEL_SRC)obj-$(PLATFORM)/%.o: $(KERNEL_SRC)%.c\r
+$(K_OBJ): $(KERNEL_SRC)obj-native-$(PLATFORM)/%.o: $(KERNEL_SRC)%.c\r
        @mkdir -p $(dir $@)\r
        @echo [CC] -o $@\r
        @$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)\r
@@ -66,4 +76,13 @@ $(N_OBJ): obj-$(PLATFORM)/%.o: %.c
        @$(CC) -c $< -o $@ $(CFLAGS)\r
        @$(CC) -M -MT $@ -o [email protected] $<\r
 \r
+$(BUILDINFO_SRC): $(filter-out $(BUILDINFO_OBJ), $(OBJ)) Makefile\r
+       @echo "" > $@\r
+       @echo "const char gsKernelVersion[] = \"$(ACESS_VERSION)\";" >> $@\r
+       @echo "const char gsGitHash[] = \""`git log -n 1 | head -n 1 | awk '{print $$2}'`"\";" >> $@\r
+       @echo "const int giBuildNumber = $(BUILD_NUM);" >> $@\r
+$(BUILDINFO_OBJ): $(BUILDINFO_SRC)\r
+       @echo [CC] -o $@\r
+       @$(CC) -o $@ -c $< $(CFLAGS) $(CPPFLAGS)\r
+\r
 -include $(DEPFILES)\r