We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch of android.mk files

SDL_ttf_android_mk.patch (text/plain), 5.06 KB, created by Sylvain on 2014-12-04 17:11:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvain

Created: 2014-12-04 17:11:54 UTC

Size: 5.06 KB

patch

obsolete

>diff -r f28f7b0f72ae Android.mk
>--- a/Android.mk	Sat Oct 04 11:55:45 2014 -0400
>+++ b/Android.mk	Thu Dec 04 18:03:44 2014 +0100
>@@ -1,62 +1,26 @@
>-LOCAL_PATH := $(call my-dir)
>+# Save the local path
>+my_LOCAL_PATH := $(call my-dir)
> 
>+FREETYPE_LIBRARY_PATH := external/freetype-2.4.12
>+
>+# Build freetype library
>+ifneq ($(FREETYPE_LIBRARY_PATH),)
>+    include $(my_LOCAL_PATH)/$(FREETYPE_LIBRARY_PATH)/Android.mk
>+endif
>+
>+# Restore local path
>+LOCAL_PATH := $(my_LOCAL_PATH)
> include $(CLEAR_VARS)
> 
> LOCAL_MODULE := SDL2_ttf
> 
>-FREETYPE_LIBRARY_PATH := external/freetype-2.4.12
>-
> LOCAL_C_INCLUDES := $(LOCAL_PATH)
> 
>-LOCAL_SRC_FILES := SDL_ttf.c \
>+LOCAL_SRC_FILES := SDL_ttf.c
> 
> ifneq ($(FREETYPE_LIBRARY_PATH),)
>     LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(FREETYPE_LIBRARY_PATH)/include
>-    LOCAL_CFLAGS += -DFT2_BUILD_LIBRARY
>-    LOCAL_SRC_FILES += \
>-        $(FREETYPE_LIBRARY_PATH)/src/autofit/autofit.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftbase.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftbbox.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftbdf.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftbitmap.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftcid.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftdebug.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftfstype.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftgasp.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftglyph.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftgxval.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftinit.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftlcdfil.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftmm.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftotval.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftpatent.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftpfr.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftstroke.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftsynth.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftsystem.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/fttype1.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftwinfnt.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/base/ftxf86.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/bdf/bdf.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/bzip2/ftbzip2.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/cache/ftcache.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/cff/cff.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/cid/type1cid.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/gzip/ftgzip.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/lzw/ftlzw.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/pcf/pcf.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/pfr/pfr.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/psaux/psaux.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/pshinter/pshinter.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/psnames/psmodule.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/raster/raster.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/sfnt/sfnt.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/smooth/smooth.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/tools/apinames.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/truetype/truetype.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/type1/type1.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/type42/type42.c \
>-        $(FREETYPE_LIBRARY_PATH)/src/winfonts/winfnt.c
>+    LOCAL_STATIC_LIBRARIES += freetype
> endif
> 
> LOCAL_SHARED_LIBRARIES := SDL2
>diff -r f28f7b0f72ae external/freetype-2.4.12/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/external/freetype-2.4.12/Android.mk	Thu Dec 04 18:03:44 2014 +0100
>@@ -0,0 +1,63 @@
>+LOCAL_PATH:= $(call my-dir)
>+
>+include $(CLEAR_VARS)
>+
>+
>+LOCAL_SRC_FILES := \
>+        ./src/autofit/autofit.c \
>+        ./src/base/ftbase.c \
>+        ./src/base/ftbbox.c \
>+        ./src/base/ftbdf.c \
>+        ./src/base/ftbitmap.c \
>+        ./src/base/ftcid.c \
>+        ./src/base/ftdebug.c \
>+        ./src/base/ftfstype.c \
>+        ./src/base/ftgasp.c \
>+        ./src/base/ftglyph.c \
>+        ./src/base/ftgxval.c \
>+        ./src/base/ftinit.c \
>+        ./src/base/ftlcdfil.c \
>+        ./src/base/ftmm.c \
>+        ./src/base/ftotval.c \
>+        ./src/base/ftpatent.c \
>+        ./src/base/ftpfr.c \
>+        ./src/base/ftstroke.c \
>+        ./src/base/ftsynth.c \
>+        ./src/base/ftsystem.c \
>+        ./src/base/fttype1.c \
>+        ./src/base/ftwinfnt.c \
>+        ./src/base/ftxf86.c \
>+        ./src/bdf/bdf.c \
>+        ./src/bzip2/ftbzip2.c \
>+        ./src/cache/ftcache.c \
>+        ./src/cff/cff.c \
>+        ./src/cid/type1cid.c \
>+        ./src/gzip/ftgzip.c \
>+        ./src/lzw/ftlzw.c \
>+        ./src/pcf/pcf.c \
>+        ./src/pfr/pfr.c \
>+        ./src/psaux/psaux.c \
>+        ./src/pshinter/pshinter.c \
>+        ./src/psnames/psmodule.c \
>+        ./src/raster/raster.c \
>+        ./src/sfnt/sfnt.c \
>+        ./src/smooth/smooth.c \
>+        ./src/tools/apinames.c \
>+        ./src/truetype/truetype.c \
>+        ./src/type1/type1.c \
>+        ./src/type42/type42.c \
>+        ./src/winfonts/winfnt.c
>+
>+
>+
>+LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
>+LOCAL_CFLAGS += -DFT2_BUILD_LIBRARY -Os
>+
>+
>+LOCAL_MODULE:= freetype
>+
>+LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO)
>+LOCAL_COPY_HEADERS := $(common_COPY_HEADERS)
>+
>+include $(BUILD_STATIC_LIBRARY)
>+

Actions: View | Diff

Attachments on bug 2801: 1952

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.