diff options
author | midipix <writeonce@midipix.org> | 2018-05-23 08:36:23 +0000 |
---|---|---|
committer | midipix <writeonce@midipix.org> | 2018-05-23 10:24:50 -0400 |
commit | 407aecafb7c25689638b4f4dd8e60b339b5738ca (patch) | |
tree | c1ae8713654f5b29124002b855fe1acd2a876f0c /project | |
parent | 5ec9b67e061e7bf839d6ae986354190d2e1e0037 (diff) | |
download | ntux-407aecafb7c25689638b4f4dd8e60b339b5738ca.tar.bz2 ntux-407aecafb7c25689638b4f4dd8e60b339b5738ca.tar.xz |
utility: support all three linking modes (ldso/vrfs/static).
Diffstat (limited to 'project')
-rw-r--r-- | project/common.mk | 6 | ||||
-rw-r--r-- | project/extras.mk | 4 | ||||
-rw-r--r-- | project/tree.mk | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/project/common.mk b/project/common.mk index c3dde46..f847b6c 100644 --- a/project/common.mk +++ b/project/common.mk @@ -1,3 +1,8 @@ +INIT_SRCS = \ + src/init/ntux_init_ldso.c \ + src/init/ntux_init_static.c \ + src/init/ntux_init_vrfs.c \ + DRIVER_SRCS = \ src/driver/ntux_amain.c \ src/driver/ntux_driver_ctx.c \ @@ -24,6 +29,7 @@ APP_SRCS = \ src/ntux.c COMMON_SRCS = \ + $(INIT_SRCS) \ $(DRIVER_SRCS) \ $(INTERNAL_SRCS) \ $(CMD_SRCS) \ diff --git a/project/extras.mk b/project/extras.mk index ee0026e..6ecb2a1 100644 --- a/project/extras.mk +++ b/project/extras.mk @@ -7,6 +7,10 @@ CFLAGS_CONFIG += -D_MIDIPIX_FREESTANDING -D__NT$(HOST_BITS) CFLAGS_CONFIG += -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ CFLAGS_CONFIG += -UWIN64 -U_WIN64 -U__WIN64 -U__WIN64__ +ifeq ($(ALL_STATIC),yes) +CFLAGS_CONFIG += -DNTUX_ALL_STATIC +endif + src/driver/ntux_driver_ctx.o: version.tag src/driver/ntux_driver_ctx.lo: version.tag diff --git a/project/tree.mk b/project/tree.mk index 9f0d99e..9ac1469 100644 --- a/project/tree.mk +++ b/project/tree.mk @@ -1,10 +1,10 @@ tree.tag: mkdir -p src mkdir -p src/cmds + mkdir -p src/init mkdir -p src/driver mkdir -p src/internal mkdir -p src/internal/nolibc - mkdir -p src/logic mkdir -p src/output mkdir -p src/skin touch tree.tag |