SwallowOS/XServer-XSDL-android-src
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

整理

Browse Source 
Change-Id: I18aa6225790900427ae4a287843ada1ae68d1467
This commit is contained in:
kuailexs
2018-07-06 20:16:11 +08:00
parent ec4fd44192
commit 1db6171c8d
14 changed files with 62 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jni/application/xserver/Android.mk
View File

@@ -97,16 +97,16 @@ LOCAL_SRC_FILES := \
# $(wildcard xserver/Xext/*.c) \
LOCAL_SHARED_LIBRARIES := libsdl-1.2 libsdl_ttf libXfont
LOCAL_SHARED_LIBRARIES := libsdl-1.2 libsdl_ttf
LOCAL_STATIC_LIBRARIES := libxcb \
libXau libXdmcp libX11 libXext libXrender libxkbfile \
libICE libfontenc android-shmem_xserver pixman-1_xserver \
libcrypto_static
libICE android-shmem_xserver pixman-1_xserver \
libcrypto_static libXfont freetype_xserver libfontenc libz libpng liblog
#LOCAL_LDFLAGS := -pie
LOCAL_LDLIBS := -llog -lc -lm -ldl -lz -lGLESv1_CM
#LOCAL_LDLIBS := -llog -lc -lm -ldl -lGLESv1_CM
include $(BUILD_SHARED_LIBRARY)

2
other_lib/x_lib/libICE-1.0.8/Android.mk
View File

@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libICE
LOCAL_C_INCLUDES := \
external/XServer-XSDL-android-src/jni/application/header/include \
$(TARGET_OUT_INTERMEDIATES)/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/include/X11/ICE \
$(LOCAL_PATH)/ \

2
other_lib/x_lib/libSM-1.2.2/Android.mk
View File

@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libSM
LOCAL_C_INCLUDES := \
external/XServer-XSDL-android-src/jni/application/header/include \
$(TARGET_OUT_INTERMEDIATES)/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/include/X11/SM \
$(LOCAL_PATH)/ \

24
other_lib/x_lib/libX11-1.6.2/Android.mk
View File

@@ -8,7 +8,7 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libX11
LOCAL_C_INCLUDES := \
external/XServer-XSDL-android-src/jni/application/header/include \
$(TARGET_OUT_INTERMEDIATES)/include \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/include/X11 \
@@ -303,4 +303,26 @@ include $(BUILD_STATIC_LIBRARY)
$(call import-module,android/support)
include $(CLEAR_VARS)
LOCAL_COPY_HEADERS_TO := X11
LOCAL_COPY_HEADERS := \
include/X11/XKBlib.h \
include/X11/Xcms.h \
include/X11/Xlib.h \
include/X11/Xlibint.h \
include/X11/Xlocale.h \
include/X11/Xresource.h \
include/X11/Xutil.h \
include/X11/cursorfont.h \
include/X11/Xregion.h \
include/X11/ImUtil.h \
include/X11/Xlib-xcb.h \
include/X11/XlibConf.h
include $(BUILD_COPY_HEADERS)

2
other_lib/x_lib/libXau-1.0.8/Android.mk
View File

@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXau
LOCAL_C_INCLUDES := \
external/XServer-XSDL-android-src/jni/application/header/include \
$(TARGET_OUT_INTERMEDIATES)/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \

2
other_lib/x_lib/libXdmcp-1.1.1/Android.mk
View File

@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXdmcp
LOCAL_C_INCLUDES := \
external/XServer-XSDL-android-src/jni/application/header/include \
$(TARGET_OUT_INTERMEDIATES)/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \

2
other_lib/x_lib/libXext-1.3.2/Android.mk
View File

@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXext
LOCAL_C_INCLUDES := \
external/XServer-XSDL-android-src/jni/application/header/include \
$(TARGET_OUT_INTERMEDIATES)/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \

12
other_lib/x_lib/libXfont-1.4.6/Android.mk
View File

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SDK_VERSION := 21
#LOCAL_SDK_VERSION := 23
LOCAL_MODULE := libXfont
@@ -42,10 +42,10 @@ LOCAL_SRC_FILES := \
src/fontfile/catalogue.c
LOCAL_SHARED_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := freetype_xserver libfontenc
LOCAL_LDLIBS := -llog -lc -lm -ldl -lz
include $(BUILD_SHARED_LIBRARY)
LOCAL_STATIC_LIBRARIES := freetype_xserver libfontenc libz libpng
include $(BUILD_STATIC_LIBRARY)

2
other_lib/x_lib/libXrandr-1.4.2/Android.mk
View File

@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXrandr
LOCAL_C_INCLUDES := \
external/XServer-XSDL-android-src/jni/application/header/include \
$(TARGET_OUT_INTERMEDIATES)/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/include/X11/extensions \
$(LOCAL_PATH)/ \

2
other_lib/x_lib/libXrender-0.9.8/Android.mk
View File

@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXrender
LOCAL_C_INCLUDES := \
external/XServer-XSDL-android-src/jni/application/header/include \
$(TARGET_OUT_INTERMEDIATES)/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/include/X11/extensions \
$(LOCAL_PATH)/ \

2
other_lib/x_lib/libXt-1.1.4/Android.mk
View File

@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libXt
LOCAL_C_INCLUDES := \
external/XServer-XSDL-android-src/jni/application/header/include \
$(TARGET_OUT_INTERMEDIATES)/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \

9
other_lib/x_lib/libfontenc-1.1.2/Android.mk
View File

@@ -2,11 +2,14 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libfontenc
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
external/libpng \
external/zlib
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DFONT_ENCODINGS_DIRECTORY=\"/usr/share/fonts/X11/encodings/encodings.dir\"
@@ -17,7 +20,7 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES :=
LOCAL_LDLIBS := -llog -lc -lm -ldl -lz
include $(BUILD_STATIC_LIBRARY)

15
other_lib/x_lib/libxcb-1.10/Android.mk
View File

@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libxcb
LOCAL_C_INCLUDES := \
external/XServer-XSDL-android-src/jni/application/header/include \
$(TARGET_OUT_INTERMEDIATES)/include \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/src/
@@ -28,3 +28,16 @@ LOCAL_LDLIBS := -llog -lc -lm -ldl -lz
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_COPY_HEADERS_TO := xcb
LOCAL_SRCS := \
src/*.h
LOCAL_COPY_HEADERS := \
$(foreach F, $(LOCAL_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) \
include $(BUILD_COPY_HEADERS)

2
other_lib/x_lib/libxkbfile-1.0.8/Android.mk
View File

@@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21
LOCAL_MODULE := libxkbfile
LOCAL_C_INCLUDES := \
external/XServer-XSDL-android-src/jni/application/header/include \
$(TARGET_OUT_INTERMEDIATES)/include \
$(LOCAL_PATH)/include/X11 \
$(LOCAL_PATH)/include/X11/extensions \
$(LOCAL_PATH)/ \