From a235249f57d5559c7a485389e1aadc36f6e0e69a Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Sat, 1 Jan 2022 21:51:08 +0200 Subject: [PATCH] Moving sdl2_image to the subdirectory --- .gitmodules | 3 --- project/jni/jpeg/Android.mk | 1 + project/jni/jpeg/include | 1 + project/jni/png/Android.mk | 1 + project/jni/png/include | 1 + project/jni/sdl2_image | 1 - 6 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 project/jni/jpeg/Android.mk create mode 120000 project/jni/jpeg/include create mode 100644 project/jni/png/Android.mk create mode 120000 project/jni/png/include delete mode 160000 project/jni/sdl2_image diff --git a/.gitmodules b/.gitmodules index 765426f04..bfddd81f6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -87,6 +87,3 @@ [submodule "project/jni/sdl2"] path = project/jni/sdl2 url = https://github.com/libsdl-org/SDL.git -[submodule "project/jni/sdl2_image"] - path = project/jni/sdl2_image - url = https://github.com/libsdl-org/SDL_image diff --git a/project/jni/jpeg/Android.mk b/project/jni/jpeg/Android.mk new file mode 100644 index 000000000..c387b72d8 --- /dev/null +++ b/project/jni/jpeg/Android.mk @@ -0,0 +1 @@ +include include/Android.mk diff --git a/project/jni/jpeg/include b/project/jni/jpeg/include new file mode 120000 index 000000000..9466fa484 --- /dev/null +++ b/project/jni/jpeg/include @@ -0,0 +1 @@ +../sdl2_image/include/external/jpeg-9d \ No newline at end of file diff --git a/project/jni/png/Android.mk b/project/jni/png/Android.mk new file mode 100644 index 000000000..c387b72d8 --- /dev/null +++ b/project/jni/png/Android.mk @@ -0,0 +1 @@ +include include/Android.mk diff --git a/project/jni/png/include b/project/jni/png/include new file mode 120000 index 000000000..b24923491 --- /dev/null +++ b/project/jni/png/include @@ -0,0 +1 @@ +../sdl2_image/include/external/libpng-1.6.37 \ No newline at end of file diff --git a/project/jni/sdl2_image b/project/jni/sdl2_image deleted file mode 160000 index 840d1d80c..000000000 --- a/project/jni/sdl2_image +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 840d1d80ce9fec099a656e1fa5078a9f1980d88d