From c63330527d9ece5a0d35e18f0c0937d0c65e4c18 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 23 Mar 2023 05:25:18 +0200 Subject: [PATCH] Include only mlibc --- .gitignore | 2 -- .gitmodules | 3 +++ Makefile | 14 ++------------ mlibc | 1 + 4 files changed, 6 insertions(+), 14 deletions(-) create mode 160000 mlibc diff --git a/.gitignore b/.gitignore index bf2e068..53fade0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,3 @@ *.elf out/ .dccache -newlib-cygwin -mlibc \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 3e21a04..c2592f6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "apps/user/games/doomgeneric"] path = apps/user/games/doomgeneric url = https://github.com/Fennix-Project/doomgeneric.git +[submodule "mlibc"] + path = mlibc + url = https://github.com/Fennix-Project/mlibc.git diff --git a/Makefile b/Makefile index 24825b1..7e90a38 100644 --- a/Makefile +++ b/Makefile @@ -2,18 +2,8 @@ include ../Makefile.conf build: -ifeq ($(NEWLIB), 1) - -ifeq (,$(wildcard ./newlib-cygwin)) - git clone https://github.com/Fennix-Project/newlib-cygwin.git newlib-cygwin -endif - -else ifeq ($(MLIBC), 1) - -ifeq (,$(wildcard ./newlib-cygwin)) - git clone https://github.com/Fennix-Project/mlibc.git mlibc -endif - +ifneq ($(NEWLIB),1) + make -C mlibc build else mkdir -p out mkdir -p out/system diff --git a/mlibc b/mlibc new file mode 160000 index 0000000..1f0bf43 --- /dev/null +++ b/mlibc @@ -0,0 +1 @@ +Subproject commit 1f0bf43a1d259bc1627a0e377226219dc57269e9