X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2FMakefile;h=11976045622715104c0af6c222de12ebcbb09751;hb=5f8480455a9e2172b15dfc7fb96480a68506c30d;hp=ad47c25a57b53654d7c981b744d5a6b4dd4e1edd;hpb=5a66c3a4a2019a7ddea8931c8476bb64f4d29079;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/Makefile b/AcessNative/acesskernel_src/Makefile
index ad47c25a..11976045 100644
--- a/AcessNative/acesskernel_src/Makefile
+++ b/AcessNative/acesskernel_src/Makefile
@@ -14,7 +14,9 @@ endif
 KERNEL_SRC = ../../KernelLand/Kernel/
 LDACESS_SRC = ../../Usermode/Libraries/ld-acess.so_src/
 
-KERNEL_OBJ := logging.o adt.o lib.o debug.o messages.o drvutil_disk.o drvutil_video.o
+# - Kernel objects (from KernelLand/Kernel)
+KERNEL_OBJ := logging.o adt.o lib.o debug.o messages.o drvutil_disk.o drvutil_video.o memfs_helpers.o
+KERNEL_OBJ += mutex.o semaphore.o rwlock.o workqueue.o events.o
 #KERNEL_OBJ += libc.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
@@ -23,14 +25,17 @@ KERNEL_OBJ += drv/fifo.o drv/proc.o drv/dgram_pipe.o
 KERNEL_OBJ += drv/vterm.o drv/vterm_font.o drv/vterm_output.o drv/vterm_input.o drv/vterm_termbuf.o
 KERNEL_OBJ += drv/vterm_vt100.o drv/vterm_2d.o
 KERNEL_OBJ += drv/pty.o
-
-N_OBJ := main.o
+# - Native (unsullied) objects
+N_OBJ := main.o net_wrap.o
+# - Local objects (use the kernel includes)
+OBJ := helpers.o threads.o threads_glue.o server.o syscalls.o time.o
+OBJ += video.o keyboard.o mouse.o nativefs.o vfs_handle.o ui_sdl.o
+#OBJ += shm.o
+OBJ += net.o syscall_getpath.o
 
 BUILDINFO_OBJ := obj-$(PLATFORM)/buildinfo.o
 BUILDINFO_SRC := $(BUILDINFO_OBJ:%.o=%.c)
 
-OBJ := helpers.o threads.o threads_glue.o server.o syscalls.o time.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-native-$(PLATFORM)/,$(KERNEL_OBJ))
@@ -42,6 +47,7 @@ KCPPFLAGS = -I include/ -I $(KERNEL_SRC)include/ -I$(LDACESS_SRC)include_exp/ -D
 CFLAGS += -Wall -g -std=gnu99
 CPPFLAGS += $(shell sdl-config --cflags) -I /usr/include/
 LDFLAGS += $(shell sdl-config --libs) -g -Wl,--defsym,__buildnum=$(BUILD_NUM)
+LDFLAGS += -Wl,-Map,obj-$(PLATFORM)/Map.txt
 
 ifeq ($(PLATFORM),win)
 	BIN := ../AcessKernel.exe
@@ -62,7 +68,7 @@ clean:
 
 $(BIN): $(OBJ) $(N_OBJ) $(K_OBJ) $(BUILDINFO_OBJ)
 	@echo [LINK] -o $@
-	@$(CC) -o $@ $(N_OBJ) $(K_OBJ) $(OBJ) $(BUILDINFO_OBJ) $(LDFLAGS)
+	@$(CC) -o $@ $(N_OBJ) $(LDFLAGS) $(K_OBJ) $(OBJ) $(BUILDINFO_OBJ)
 	@echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum
 
 $(OBJ): obj-$(PLATFORM)/%.o: %.c