AcessNative - Fix compile errors from API changes (and from compiler upgrade)
[tpg/acess2.git] / AcessNative / acesskernel_src / Makefile
index f831a43..d2a22c6 100644 (file)
@@ -14,7 +14,8 @@ endif
 KERNEL_SRC = ../../KernelLand/Kernel/\r
 LDACESS_SRC = ../../Usermode/Libraries/ld-acess.so_src/\r
 \r
-KERNEL_OBJ := logging.o adt.o lib.o debug.o messages.o drvutil_disk.o drvutil_video.o\r
+# - Kernel objects (from KernelLand/Kernel)\r
+KERNEL_OBJ := logging.o adt.o lib.o debug.o messages.o drvutil_disk.o drvutil_video.o memfs_helpers.o\r
 KERNEL_OBJ += mutex.o semaphore.o rwlock.o workqueue.o events.o\r
 #KERNEL_OBJ += libc.o\r
 KERNEL_OBJ += vfs/main.o vfs/open.o vfs/acls.o vfs/io.o vfs/dir.o\r
@@ -24,16 +25,16 @@ 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\r
 KERNEL_OBJ += drv/vterm_vt100.o drv/vterm_2d.o\r
 KERNEL_OBJ += drv/pty.o\r
-\r
-N_OBJ := main.o\r
+# - Native (unsullied) objects\r
+N_OBJ := main.o net_wrap.o\r
+# - Local objects (use the kernel includes)\r
+OBJ := helpers.o threads.o threads_glue.o server.o syscalls.o time.o\r
+OBJ += video.o keyboard.o mouse.o nativefs.o vfs_handle.o ui_sdl.o\r
+OBJ += net.o syscall_getpath.o\r
 \r
 BUILDINFO_OBJ := obj-$(PLATFORM)/buildinfo.o\r
 BUILDINFO_SRC := $(BUILDINFO_OBJ:%.o=%.c)\r
 \r
-OBJ := helpers.o threads.o threads_glue.o server.o syscalls.o time.o\r
-OBJ += video.o keyboard.o mouse.o nativefs.o vfs_handle.o ui_sdl.o\r
-OBJ += net.o net_wrap.o\r
-\r
 OBJ := $(addprefix obj-$(PLATFORM)/,$(OBJ))\r
 N_OBJ := $(addprefix obj-$(PLATFORM)/,$(N_OBJ))\r
 K_OBJ := $(addprefix $(KERNEL_SRC)obj-native-$(PLATFORM)/,$(KERNEL_OBJ))\r

UCC git Repository :: git.ucc.asn.au