Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-04 20:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix android build.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Martín Lucas Golini
2019-11-04 17:56:19 -03:00
parent 33f8a2eebb
commit 7219454355
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/android-project/app/jni/Application.mk
View File

@@ -20,4 +20,4 @@ APP_CPPFLAGS := -std=c++14 -frtti -fexceptions
APP_PLATFORM := android-14
APP_MODULES := main
APP_ABI := armeabi-v7a x86
APP_ABI := armeabi-v7a x86 x86_64

8
projects/android-project/app/jni/eepp.mk
View File

@@ -38,7 +38,7 @@ EEPP_C_FLAGS := \
EEPP_LDLIBS := $(APP_LDLIBS)
include $(call all-subdir-makefiles)
include $(call all-subdir-makefiles)
#*************** EEPP ***************
include $(CLEAR_VARS)
@@ -62,6 +62,7 @@ CODE_SRCS := \
system/*.cpp \
system/platform/posix/*.cpp \
network/*.cpp \
network/http/*.cpp \
network/ssl/*.cpp \
network/ssl/backend/mbedtls/*.cpp \
network/platform/unix/*.cpp \
@@ -70,7 +71,6 @@ CODE_SRCS := \
audio/*.cpp \
window/*.cpp \
window/backend/SDL2/*.cpp \
window/platform/null/*.cpp \
graphics/*.cpp \
graphics/renderer/*.cpp \
physics/*.cpp \
@@ -90,7 +90,7 @@ LOCAL_SRC_FILES := $(foreach F, $(CODE_SRCS), $(addprefix $(dir $(F)),$(notdir
LOCAL_STATIC_LIBRARIES := openal SDL2 chipmunk freetype
include $(BUILD_STATIC_LIBRARY)
include $(BUILD_STATIC_LIBRARY)
#*************** EEPP ***************
#*************** CHIPMUNK ***************
@@ -226,4 +226,4 @@ LOCAL_SRC_FILES := \
include $(BUILD_STATIC_LIBRARY)
#**************** SDL 2 ***************

15
src/eepp/ui/uiloader.cpp
View File

@@ -48,14 +48,19 @@ void UILoader::draw() {
mCircle.setPosition( rect.getCenter() );
ClippingMask * clippingMask = Renderer::instance()->getClippingMask();
clippingMask->setMaskMode( ClippingMask::Exclusive );
clippingMask->clearMasks();
clippingMask->appendMask( mCircle );
clippingMask->stencilMaskEnable();
if ( mCircle.getRadius() > 0 ) {
clippingMask->setMaskMode( ClippingMask::Exclusive );
clippingMask->clearMasks();
clippingMask->appendMask( mCircle );
clippingMask->stencilMaskEnable();
}
mArc.draw();
clippingMask->stencilMaskDisable();
if ( mCircle.getRadius() > 0 ) {
clippingMask->stencilMaskDisable();
}
}
void UILoader::scheduledUpdate( const Time& time ) {