Forgot to commit back the Android.mk makefile from Tuxpaint-Android.

This commit is contained in:
Pere Pujal i Carabantes 2021-10-03 23:26:39 +02:00
parent 097d542db4
commit 72555cff6d

View file

@ -7,6 +7,7 @@ LOCAL_MODULE := tuxpaint
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../SDL2/src/main/android \ $(LOCAL_PATH)/../SDL2/src/main/android \
$(LOCAL_PATH)/../libimagequant \
$(LOCAL_PATH)/src \ $(LOCAL_PATH)/src \
$(LOCAL_PATH)/src/mouse \ $(LOCAL_PATH)/src/mouse \
$(NULL) $(NULL)
@ -28,7 +29,9 @@ LOCAL_SRC_FILES := \
src/onscreen_keyboard.c \ src/onscreen_keyboard.c \
src/android_print.c \ src/android_print.c \
src/android_mbstowcs.c \ src/android_mbstowcs.c \
src/android_assets.c src/fill.c \
src/android_assets.c \
src/gifenc.c
MY_CFLAGS:= -O0 -g -W -Wall -fno-common -ffloat-store \ MY_CFLAGS:= -O0 -g -W -Wall -fno-common -ffloat-store \
-Wcast-align -Wredundant-decls \ -Wcast-align -Wredundant-decls \
@ -38,7 +41,7 @@ MY_CFLAGS:= -O0 -g -W -Wall -fno-common -ffloat-store \
-Wstrict-aliasing=2 \ -Wstrict-aliasing=2 \
-include $(LOCAL_PATH)"/../tp-assets-fopen/tp_android_assets_fopen.h" -include $(LOCAL_PATH)"/../tp-assets-fopen/tp_android_assets_fopen.h"
MY_VER_VERSION :=0.9.23 MY_VER_VERSION :=0.9.27
MY_VER_DATE :=$(shell date +"%Y-%m-%d") MY_VER_DATE :=$(shell date +"%Y-%m-%d")
MY_NOSOUNDFLAG := MY_NOSOUNDFLAG :=
# MY_NOSOUNDFLAG := -DNOSOUND # MY_NOSOUNDFLAG := -DNOSOUND
@ -81,7 +84,7 @@ LOCAL_LDLIBS := \
-lz -llog -lGLESv1_CM -lGLESv2 -landroid \ -lz -llog -lGLESv1_CM -lGLESv2 -landroid \
$(NULL) $(NULL)
LOCAL_SHARED_LIBRARIES := SDL2 SDL2_image SDL2_mixer SDL2_ttf SDL2_Pango tuxpaint_intl tuxpaint_fribidi tuxpaint_png tuxpaint_rsvg tuxpaint_cairo tp_android_assets_fopen LOCAL_SHARED_LIBRARIES := SDL2 SDL2_image SDL2_mixer SDL2_ttf SDL2_Pango tuxpaint_intl tuxpaint_fribidi tuxpaint_png tuxpaint_rsvg tuxpaint_cairo tp_android_assets_fopen libimagequant SDL2_gfx
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)