mirror of
https://github.com/SpartanJ/eepp.git
synced 2026-05-28 17:16:29 +03:00
Fix Android build.
This commit is contained in:
@@ -25,6 +25,7 @@ EEPP_C_INCLUDES := \
|
||||
$(EEPP_THIRD_PARTY_PATH)/mojoAL \
|
||||
$(EEPP_THIRD_PARTY_PATH)/pcre2/src \
|
||||
$(EEPP_THIRD_PARTY_PATH)/oniguruma \
|
||||
$(EEPP_THIRD_PARTY_PATH)/SheenBidi/Headers \
|
||||
$(EEPP_THIRD_PARTY_PATH)/efsw/include \
|
||||
$(EEPP_BASE_PATH)/modules/eterm/include \
|
||||
$(EEPP_BASE_PATH)/modules/eterm/src \
|
||||
@@ -39,6 +40,7 @@ EEPP_C_FLAGS := \
|
||||
-Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit \
|
||||
-DANDROID \
|
||||
-DANDROID_NDK \
|
||||
-DZ_HAVE_UNISTD_H \
|
||||
-DDISABLE_IMPORTGL \
|
||||
-Wall \
|
||||
-Wno-unknown-pragmas \
|
||||
@@ -108,7 +110,7 @@ LOCAL_C_INCLUDES := $(EEPP_C_INCLUDES)
|
||||
|
||||
LOCAL_SRC_FILES := $(foreach F, $(CODE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := freetype libpng libwebp pcre2 oniguruma harfbuzz
|
||||
LOCAL_STATIC_LIBRARIES := freetype libpng libwebp pcre2 oniguruma harfbuzz sheenbidi
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := SDL2
|
||||
|
||||
@@ -330,6 +332,23 @@ LOCAL_SRC_FILES := $(foreach F, $(HARFBUZZ_SRCS), $(addprefix $(dir $(F)),$(no
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
#*************** HARFBUZZ *************
|
||||
|
||||
#*************** SHEENBIDI *************
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_PATH := $(EEPP_THIRD_PARTY_PATH)
|
||||
|
||||
LOCAL_MODULE := sheenbidi
|
||||
|
||||
SHEENBIDI_SRCS := SheenBidi/Source/**.c
|
||||
|
||||
LOCAL_C_INCLUDES := $(LOCAL_PATH)/SheenBidi/Headers
|
||||
LOCAL_CFLAGS := -Os -I$(LOCAL_PATH)/freetype2/include
|
||||
|
||||
LOCAL_SRC_FILES := $(foreach F, $(SHEENBIDI_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
#*************** SHEENBIDI *************
|
||||
|
||||
#**************** SDL 2 ***************
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
|
||||
@@ -53,18 +53,22 @@ std::string ClipboardSDL::getPrimarySelectionText() {
|
||||
#if EE_PLATFORM == EE_PLATFORM_EMSCRIPTEN
|
||||
return "";
|
||||
#else
|
||||
|
||||
#if SDL_VERSION_ATLEAST(2, 26, 0)
|
||||
if ( SDL_HasPrimarySelectionText() ) {
|
||||
char* text = SDL_GetPrimarySelectionText();
|
||||
std::string str( text );
|
||||
SDL_free( text );
|
||||
return str;
|
||||
}
|
||||
#endif
|
||||
|
||||
return "";
|
||||
#endif
|
||||
}
|
||||
|
||||
void ClipboardSDL::setPrimarySelectionText( const std::string& text ) {
|
||||
#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN
|
||||
#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN && SDL_VERSION_ATLEAST(2, 26, 0)
|
||||
SDL_SetPrimarySelectionText( text.c_str() );
|
||||
#endif
|
||||
}
|
||||
|
||||
2
src/thirdparty/SOIL2
vendored
2
src/thirdparty/SOIL2
vendored
Submodule src/thirdparty/SOIL2 updated: bc9b68d3eb...703320d930
Reference in New Issue
Block a user