Skip to content

Commit cbedacd

Browse files
author
xianjimli
committed
update Makefile.am
1 parent 82755d9 commit cbedacd

File tree

21 files changed

+59
-56
lines changed

21 files changed

+59
-56
lines changed

‎apps/calculator/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SUBDIRS=icons data
2-
include $(abs_top_srcdir)/src/rules.mk
2+
include $(abs_top_builddir)/src/rules.mk
33

44
LOCAL_CFLAGS=-DAPP_DATA_DIR="\"$(datadir)/ftk/calc\"" -DAPP_LOCAL_DATA_DIR="\"$(srcdir)\""\
55
-I$(abs_top_srcdir)/apps/common

‎apps/designer/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SUBDIRS=icons data
2-
include $(abs_top_srcdir)/src/rules.mk
2+
include $(abs_top_builddir)/src/rules.mk
33

44
LOCAL_CFLAGS=-DAPP_DATA_DIR="\"$(datadir)/ftk/designer\"" -DAPP_LOCAL_DATA_DIR="\"$(srcdir)\"" \
55
-I$(abs_top_srcdir)/apps/common

‎apps/desktop/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SUBDIRS=icons xul
2-
include $(abs_top_srcdir)/src/rules.mk
2+
include $(abs_top_builddir)/src/rules.mk
33
LOCAL_CFLAGS=-I$(abs_top_srcdir)/apps/common -DAPP_DATA_DIR="\"$(datadir)/ftk/desktop\"" \
44
-DAPP_LOCAL_DATA_DIR="\"$(srcdir)\"" -I$(abs_top_srcdir)/script_binding/lua \
55
-I$(abs_top_srcdir)/script_binding/lua/lua \

‎apps/filemanager/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SUBDIRS=icons data
2-
include $(abs_top_srcdir)/src/rules.mk
2+
include $(abs_top_builddir)/src/rules.mk
33

44
LOCAL_CFLAGS=-DAPP_DATA_DIR="\"$(datadir)/ftk/filem\"" -DAPP_LOCAL_DATA_DIR="\"$(srcdir)\"" \
55
-I$(abs_top_srcdir)/apps/common

‎apps/launcher/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include $(abs_top_srcdir)/src/rules.mk
1+
include $(abs_top_builddir)/src/rules.mk
22
bin_PROGRAMS=ftk_launcher
33

44
ftk_launcher_SOURCES=main.c

‎apps/shell/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SUBDIRS=icons data
2-
include $(abs_top_srcdir)/src/rules.mk
2+
include $(abs_top_builddir)/src/rules.mk
33

44
LOCAL_CFLAGS=-DAPP_DATA_DIR="\"$(datadir)/ftk/shell\"" -DAPP_LOCAL_DATA_DIR="\"$(srcdir)\"" \
55
-I$(abs_top_srcdir)/apps/common

‎config_ftk.h.in

-3
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@
9494
/* Define to the one symbol short name of this package. */
9595
#undef PACKAGE_TARNAME
9696

97-
/* Define to the home page for this package. */
98-
#undef PACKAGE_URL
99-
10097
/* Define to the version of this package. */
10198
#undef PACKAGE_VERSION
10299

‎fbus/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SUBDIRS=. demo
2-
include $(abs_top_srcdir)/src/rules.mk
2+
include $(abs_top_builddir)/src/rules.mk
33

44
lib_LTLIBRARIES=libfbus.la
55
libfbus_la_SOURCES=\

‎fbus/demo/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include $(abs_top_srcdir)/src/rules.mk
1+
include $(abs_top_builddir)/src/rules.mk
22

33

44
lib_LTLIBRARIES=libecho.la

‎script_binding/lua/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include $(abs_top_srcdir)/src/rules.mk
1+
include $(abs_top_builddir)/src/rules.mk
22

33
SUBDIRS=lua
44
lib_LTLIBRARIES=libftklua.la

‎services/fconf/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include $(abs_top_srcdir)/src/rules.mk
1+
include $(abs_top_builddir)/src/rules.mk
22

33
lib_LTLIBRARIES=libfconf.la
44

‎src/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include $(abs_top_srcdir)/src/rules.mk
1+
include $(abs_top_builddir)/src/rules.mk
22

33
SUBDIRS=. im os backend compiler demos test
44

‎src/canvas/skia/ftk_bitmap_factory_skia.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@
3333
#include "SkColor.h"
3434
#include "SkStream.h"
3535
#include "SkTemplates.h"
36-
#include "SkImageDecoder.h"
36+
#include "images/SkImageDecoder.h"
3737
#include "effects/SkPorterDuff.h"
3838

3939
#include "ftk_log.h"
4040
#include "ftk_allocator.h"
4141
#include "ftk_bitmap_factory.h"
4242

43+
using namespace android;
44+
4345
struct _FtkBitmapFactory
4446
{
4547
int unused;

‎src/canvas/skia/ftk_bitmap_skia.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,16 @@ FtkColor ftk_bitmap_get_pixel(FtkBitmap* thiz, int x, int y)
125125
return_val_if_fail(thiz != NULL, c);
126126

127127
bitmap = (SkBitmap*)thiz->data;
128-
128+
#ifdef ANDROID
129+
/*TODO*/
130+
#else
129131
sc = bitmap->getColor(x, y);
130132

131133
c.a = SkColorGetA(sc);
132134
c.r = SkColorGetR(sc);
133135
c.g = SkColorGetG(sc);
134136
c.b = SkColorGetB(sc);
137+
#endif
135138

136139
return c;
137140
}

‎src/canvas/skia/ftk_canvas_skia.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ static Ret ftk_canvas_skia_sync_gc(FtkCanvas* thiz)
5454
int size = 0;
5555
DECL_PRIV(thiz, priv);
5656
FtkColor c = thiz->gc.fg;
57+
#ifdef ANDROID
58+
SkColor color = SkColorSetARGB(c.a, c.r, c.g, c.b);
59+
#else
5760
SkColor color = SkColorSetARGBInline(c.a, c.r, c.g, c.b);
61+
#endif
5862

5963
priv->paint->setColor(color);
6064
if(thiz->gc.font != NULL)

‎src/compiler/android-ndk/jni/ftk/Android.mk

+6-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ LOCAL_SRC_FILES := \
3131
../../../../../src/ftk_allocator_profile.c \
3232
../../../../../src/ftk_app_window.c \
3333
../../../../../src/ftk_bitmap.c \
34-
../../../../../src/ftk_bitmap_factory.c \
3534
../../../../../src/ftk_button.c \
3635
../../../../../src/ftk.c \
3736
../../../../../src/ftk_animation_alpha.c \
@@ -62,10 +61,7 @@ LOCAL_SRC_FILES := \
6261
../../../../../src/ftk_file_browser.c \
6362
../../../../../src/ftk_file_system.c \
6463
../../../../../src/ftk_file_system_posix.c \
65-
../../../../../src/ftk_font.c \
6664
../../../../../src/ftk_font_desc.c \
67-
../../../../../src/ftk_font_manager.c \
68-
../../../../../src/ftk_font_freetype.c \
6965
../../../../../src/ftk_gesture.c \
7066
../../../../../src/ftk_globals.c \
7167
../../../../../src/ftk_icon_cache.c \
@@ -112,7 +108,12 @@ LOCAL_SRC_FILES := \
112108
../../../../../src/ftk_wnd_manager_default.c \
113109
../../../../../src/ftk_xml_parser.c \
114110
../../../../../src/ftk_xul.c \
115-
../../../../../src/ftk_canvas_default.c \
111+
../../../../../src/canvas/default/ftk_font.c \
112+
../../../../../src/canvas/default/ftk_font_manager.c \
113+
../../../../../src/canvas/default/ftk_font_freetype.c \
114+
../../../../../src/canvas/default/ftk_canvas_default.c \
115+
../../../../../src/canvas/default/ftk_bitmap_default.c \
116+
../../../../../src/canvas/default/ftk_bitmap_factory.c \
116117
../../../../../src/backend/android/ftk_backend_android.c \
117118
../../../../../src/backend/android/ftk_display_android_skia.c \
118119
../../../../../src/backend/android/ftk_source_android.c \

‎src/compiler/android/jni/ftk/Android.mk

+25-22
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LOCAL_MODULE := libftk
99
LOCAL_CFLAGS := \
1010
-O2 \
1111
-DANDROID_NDK \
12-
-DFTK_PROFILE \
12+
-DFTK_PROFILE -DHAVE_ENDIAN_H \
1313
-DFTK_FONT=\"/system/fonts/DroidSansFallback.ttf\" \
1414
-DDATA_DIR=\"/assets\" \
1515
-DLOCAL_DATA_DIR=\"./local_data\" \
@@ -19,37 +19,33 @@ LOCAL_CFLAGS := \
1919
-I$(LOCAL_PATH)/../../../../../src/im \
2020
-I$(LOCAL_PATH)/../../../../../src/backend/android \
2121
-I$(LOCAL_PATH)/../../../../../src/os/android \
22-
-I$(ANDROID_SRC_ROOT)external/skia/include \
23-
-I$(ANDROID_SRC_ROOT)external/skia/include/core \
24-
-I$(ANDROID_SRC_ROOT)system/core/include \
25-
-I$(ANDROID_SRC_ROOT)frameworks/base/include
22+
-I$(EXT_INCLUDE_DIR)/skia/include \
23+
-I$(EXT_INCLUDE_DIR)/skia/include/core \
24+
-I$(EXT_INCLUDE_DIR)/skia/include/images \
25+
-I$(EXT_INCLUDE_DIR)/system/core/include \
26+
-I$(EXT_INCLUDE_DIR)/frameworks/base/include
2627

2728
LOCAL_C_INCLUDES := \
2829
$(LOCAL_PATH)/../ftkapp $(JNI_H_INCLUDE)
2930

3031
LOCAL_SRC_FILES := \
32+
../../../../../src/canvas/skia/ftk_bitmap_factory_skia.cpp \
33+
../../../../../src/canvas/skia/ftk_bitmap_skia.cpp \
34+
../../../../../src/canvas/skia/ftk_canvas_skia.cpp \
3135
../../../../../src/ftk_allocator.c \
3236
../../../../../src/ftk_allocator_default.c \
3337
../../../../../src/ftk_allocator_profile.c \
34-
../../../../../src/ftk_app_window.c \
35-
../../../../../src/ftk_bitmap.c \
36-
../../../../../src/ftk_bitmap_factory.c \
37-
../../../../../src/ftk_button.c \
38-
../../../../../src/ftk.c \
3938
../../../../../src/ftk_animation_alpha.c \
4039
../../../../../src/ftk_animation.c \
4140
../../../../../src/ftk_animation_expand.c \
4241
../../../../../src/ftk_animation_scale.c \
4342
../../../../../src/ftk_animation_translate.c \
4443
../../../../../src/ftk_animation_trigger_default.c \
4544
../../../../../src/ftk_animation_trigger_silence.c \
46-
../../../../../src/ftk_interpolator_acc_decelerate.c \
47-
../../../../../src/ftk_interpolator_accelerate.c \
48-
../../../../../src/ftk_interpolator_bounce.c \
49-
../../../../../src/ftk_interpolator_decelerate.c \
50-
../../../../../src/ftk_interpolator_linear.c \
51-
../../../../../src/ftk_pairs.c \
52-
../../../../../src/ftk_params.c \
45+
../../../../../src/ftk_app_window.c \
46+
../../../../../src/ftk_bitmap.c \
47+
../../../../../src/ftk_button.c \
48+
../../../../../src/ftk.c \
5349
../../../../../src/ftk_canvas.c \
5450
../../../../../src/ftk_check_button.c \
5551
../../../../../src/ftk_clipboard.c \
@@ -59,23 +55,30 @@ LOCAL_SRC_FILES := \
5955
../../../../../src/ftk_display.c \
6056
../../../../../src/ftk_display_mem.c \
6157
../../../../../src/ftk_display_rotate.c \
58+
../../../../../src/ftk_dlfcn.c \
6259
../../../../../src/ftk_entry.c \
6360
../../../../../src/ftk_expr.c \
6461
../../../../../src/ftk_file_browser.c \
6562
../../../../../src/ftk_file_system.c \
6663
../../../../../src/ftk_file_system_posix.c \
67-
../../../../../src/ftk_font.c \
6864
../../../../../src/ftk_font_desc.c \
69-
../../../../../src/ftk_font_manager.c \
70-
../../../../../src/ftk_font_skia.cpp \
7165
../../../../../src/ftk_gesture.c \
7266
../../../../../src/ftk_globals.c \
67+
../../../../../src/ftk_group_box.c \
7368
../../../../../src/ftk_icon_cache.c \
7469
../../../../../src/ftk_icon_view.c \
7570
../../../../../src/ftk_image.c \
71+
../../../../../src/ftk_input_method_chooser_default.c \
7672
../../../../../src/ftk_input_method_manager.c \
7773
../../../../../src/ftk_input_method_preeditor.c \
7874
../../../../../src/ftk_input_method_preeditor_default.c \
75+
../../../../../src/ftk_input_pattern.c \
76+
../../../../../src/ftk_interpolator_acc_decelerate.c \
77+
../../../../../src/ftk_interpolator_accelerate.c \
78+
../../../../../src/ftk_interpolator_bounce.c \
79+
../../../../../src/ftk_interpolator_decelerate.c \
80+
../../../../../src/ftk_interpolator_linear.c \
81+
../../../../../src/ftk_key_board.c \
7982
../../../../../src/ftk_label.c \
8083
../../../../../src/ftk_list_model_default.c \
8184
../../../../../src/ftk_list_render_default.c \
@@ -87,11 +90,12 @@ LOCAL_SRC_FILES := \
8790
../../../../../src/ftk_menu_panel.c \
8891
../../../../../src/ftk_message_box.c \
8992
../../../../../src/ftk_painter.c \
93+
../../../../../src/ftk_pairs.c \
94+
../../../../../src/ftk_params.c \
9095
../../../../../src/ftk_path.c \
9196
../../../../../src/ftk_pipe_socket.c \
9297
../../../../../src/ftk_popup_menu.c \
9398
../../../../../src/ftk_progress_bar.c \
94-
../../../../../src/ftk_group_box.c \
9599
../../../../../src/ftk_scroll_bar.c \
96100
../../../../../src/ftk_source_idle.c \
97101
../../../../../src/ftk_source_primary.c \
@@ -114,7 +118,6 @@ LOCAL_SRC_FILES := \
114118
../../../../../src/ftk_wnd_manager_default.c \
115119
../../../../../src/ftk_xml_parser.c \
116120
../../../../../src/ftk_xul.c \
117-
../../../../../src/ftk_canvas_skia.cpp \
118121
../../../../../src/backend/android/ftk_backend_android.c \
119122
../../../../../src/backend/android/ftk_display_android_skia.c \
120123
../../../../../src/backend/android/ftk_source_android.c \

‎src/compiler/android/jni/ftkapp/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ LOCAL_C_INCLUDES := \
1919

2020
LOCAL_STATIC_LIBRARIES := libftk libcutils
2121
LOCAL_SHARED_LIBRARIES := libskia
22-
LOCAL_LDLIBS := -lGLESv1_CM -llog -lgcc
22+
LOCAL_LDLIBS := -lGLESv1_CM -llog -lgcc -L$(EXT_LIBS_DIR) -lskia
2323
LOCAL_PRELINK_MODULE := false
2424

2525
include $(BUILD_SHARED_LIBRARY)

‎src/demos/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include $(abs_top_srcdir)/src/rules.mk
1+
include $(abs_top_builddir)/src/rules.mk
22

33
lib_LTLIBRARIES=libftk_demos.la
44

‎src/im/default/Makefile.in

+1-8
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ DEFS = @DEFS@
7272
DEPDIR = @DEPDIR@
7373
DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
7474
DIRECTFB_LIBS = @DIRECTFB_LIBS@
75-
DLLTOOL = @DLLTOOL@
7675
DSYMUTIL = @DSYMUTIL@
7776
DUMPBIN = @DUMPBIN@
7877
ECHO_C = @ECHO_C@
@@ -86,8 +85,6 @@ GMOFILES = @GMOFILES@
8685
GMSGFMT = @GMSGFMT@
8786
GREP = @GREP@
8887
GTKDOC_CHECK = @GTKDOC_CHECK@
89-
GTKDOC_MKPDF = @GTKDOC_MKPDF@
90-
GTKDOC_REBASE = @GTKDOC_REBASE@
9188
HTML_DIR = @HTML_DIR@
9289
INSTALL = @INSTALL@
9390
INSTALL_DATA = @INSTALL_DATA@
@@ -105,7 +102,6 @@ LIPO = @LIPO@
105102
LN_S = @LN_S@
106103
LTLIBOBJS = @LTLIBOBJS@
107104
MAKEINFO = @MAKEINFO@
108-
MANIFEST_TOOL = @MANIFEST_TOOL@
109105
MKDIR_P = @MKDIR_P@
110106
MKINSTALLDIRS = @MKINSTALLDIRS@
111107
MSGFMT = @MSGFMT@
@@ -121,12 +117,9 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
121117
PACKAGE_NAME = @PACKAGE_NAME@
122118
PACKAGE_STRING = @PACKAGE_STRING@
123119
PACKAGE_TARNAME = @PACKAGE_TARNAME@
124-
PACKAGE_URL = @PACKAGE_URL@
125120
PACKAGE_VERSION = @PACKAGE_VERSION@
126121
PATH_SEPARATOR = @PATH_SEPARATOR@
127122
PKG_CONFIG = @PKG_CONFIG@
128-
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
129-
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
130123
POFILES = @POFILES@
131124
POSUB = @POSUB@
132125
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -143,7 +136,6 @@ abs_builddir = @abs_builddir@
143136
abs_srcdir = @abs_srcdir@
144137
abs_top_builddir = @abs_top_builddir@
145138
abs_top_srcdir = @abs_top_srcdir@
146-
ac_ct_AR = @ac_ct_AR@
147139
ac_ct_CC = @ac_ct_CC@
148140
ac_ct_CXX = @ac_ct_CXX@
149141
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -177,6 +169,7 @@ libdir = @libdir@
177169
libexecdir = @libexecdir@
178170
localedir = @localedir@
179171
localstatedir = @localstatedir@
172+
lt_ECHO = @lt_ECHO@
180173
mandir = @mandir@
181174
mkdir_p = @mkdir_p@
182175
oldincludedir = @oldincludedir@

‎src/test/Makefile.am

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include $(abs_top_srcdir)/src/rules.mk
1+
include $(abs_top_builddir)/src/rules.mk
22

33
noinst_PROGRAMS=label_test widget_test \
44
canvas_test ftk_test bitmap_test primary_source_test\
@@ -19,8 +19,8 @@ canvas_test_LDFLAGS=$(MYLDFLAGS)
1919
ftk_test_SOURCES=ftk_test.c
2020
ftk_test_LDFLAGS=$(MYLDFLAGS)
2121

22-
bitmap_factory_test_SOURCES=bitmap_factory_test.c
23-
bitmap_factory_test_LDFLAGS=$(MYLDFLAGS)
22+
#bitmap_factory_test_SOURCES=bitmap_factory_test.c
23+
#bitmap_factory_test_LDFLAGS=$(MYLDFLAGS)
2424

2525
main_loop_test_SOURCES=main_loop_test.c
2626
main_loop_test_LDFLAGS=$(MYLDFLAGS)

0 commit comments

Comments
 (0)