Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android: add path to "pnglibconf.h" for compilation with libpng #466

Merged
merged 1 commit into from
Sep 5, 2024

Conversation

1bsyl
Copy link
Contributor

@1bsyl 1bsyl commented Sep 5, 2024

Android: add path to "pnglibconf.h" for compilation with libpng

@sezero
Copy link
Contributor

sezero commented Sep 5, 2024

You want to do the same for jpg too, like:

diff --git a/Android.mk b/Android.mk
index f63afcd..d0a78f9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -113,7 +113,8 @@ ifeq ($(SUPPORT_AVIF),true)
 endif
 
 ifeq ($(SUPPORT_JPG),true)
-    LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(JPG_LIBRARY_PATH)
+    LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(JPG_LIBRARY_PATH)             \
+                        $(LOCAL_PATH)/$(JPG_LIBRARY_PATH)/android
     LOCAL_CFLAGS += -DLOAD_JPG
     LOCAL_STATIC_LIBRARIES += jpeg
 ifeq ($(SUPPORT_SAVE_JPG),true)

And these should go into SDL2 branch, too.

and path to "jconfig.h" for compilation with libjpeg.
@1bsyl
Copy link
Contributor Author

1bsyl commented Sep 5, 2024

thanks @sezero done !

@sezero sezero merged commit 382b972 into libsdl-org:main Sep 5, 2024
3 of 5 checks passed
@sezero
Copy link
Contributor

sezero commented Sep 5, 2024

Just cherry picked to SDL2 branch too.

@1bsyl 1bsyl deleted the br_android_libpng branch September 5, 2024 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants