WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-12-13 19:49:36 +00:00
Code Issues Projects Releases Wiki Activity

Remove FreeType from Android build

Browse Source
This commit is contained in:
elasota
2021-03-29 11:57:04 -04:00
parent 0df94405f8
commit 9ba0e9f13d
6 changed files with 2 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AerofoilAndroid/app/jni/main/Android.mk
View File

@@ -24,7 +24,7 @@ LOCAL_SRC_FILES := \
LOCAL_SHARED_LIBRARIES := SDL2
LOCAL_STATIC_LIBRARIES := GpShell GpFontHandler_FreeType2 AerofoilPortable AerofoilSDL GpApp
LOCAL_STATIC_LIBRARIES := GpShell AerofoilPortable AerofoilSDL GpApp
LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog

5
AerofoilAndroid/app/jni/main/GpMain_SDL_Android.cpp
View File

@@ -23,8 +23,6 @@
GpAndroidGlobals g_gpAndroidGlobals;
extern "C" IGpFontHandler *GpDriver_CreateFontHandler_FreeType2(const GpFontHandlerProperties &properties);
IGpDisplayDriver *GpDriver_CreateDisplayDriver_SDL_GL2(const GpDisplayDriverProperties &properties);
IGpAudioDriver *GpDriver_CreateAudioDriver_SDL(const GpAudioDriverProperties &properties);
@@ -90,7 +88,7 @@ int main(int argc, char* argv[])
g_gpGlobalConfig.m_audioDriverType = EGpAudioDriverType_SDL2;
g_gpGlobalConfig.m_fontHandlerType = EGpFontHandlerType_FreeType2;
g_gpGlobalConfig.m_fontHandlerType = EGpFontHandlerType_None;
g_gpGlobalConfig.m_inputDriverTypes = nullptr;
g_gpGlobalConfig.m_numInputDrivers = 0;
@@ -101,7 +99,6 @@ int main(int argc, char* argv[])
GpDisplayDriverFactory::RegisterDisplayDriverFactory(EGpDisplayDriverType_SDL_GL2, GpDriver_CreateDisplayDriver_SDL_GL2);
GpAudioDriverFactory::RegisterAudioDriverFactory(EGpAudioDriverType_SDL2, GpDriver_CreateAudioDriver_SDL);
GpFontHandlerFactory::RegisterFontHandlerFactory(EGpFontHandlerType_FreeType2, GpDriver_CreateFontHandler_FreeType2);
int returnCode = GpMain::Run();

3
AerofoilAndroid/make_symlinks.bat
View File

@@ -11,12 +11,9 @@ mklink /D app\jni\SDL2 ..\..\..\SDL2-2.0.12
mklink /D app\jni\GpApp ..\..\..\GpApp
mklink /D app\jni\GpShell ..\..\..\GpShell
mklink /D app\jni\GpCommon ..\..\..\GpCommon
mklink /D app\jni\GpFontHandler_FreeType2 ..\..\..\GpFontHandler_FreeType2
mklink /D app\jni\PortabilityLayer ..\..\..\PortabilityLayer
mklink /D app\jni\FreeType ..\..\..\FreeType
mklink /D app\jni\rapidjson ..\..\..\rapidjson
mklink /D app\jni\MacRomanConversion ..\..\..\MacRomanConversion
mklink /D app\jni\stb ..\..\..\stb
mklink /D app\src\main\assets\Resources ..\..\..\..\..\Resources
pause

3
AerofoilAndroid/remove_symlinks.bat
View File

@@ -8,10 +8,7 @@ rmdir app\jni\SDL2
rmdir app\jni\GpShell
rmdir app\jni\GpCommon
rmdir app\jni\GpApp
rmdir app\jni\GpFontHandler_FreeType2
rmdir app\jni\PortabilityLayer
rmdir app\jni\FreeType
rmdir app\jni\rapidjson
rmdir app\jni\MacRomanConversion
rmdir app\jni\stb
rmdir app\src\main\assets\Resources

38
FreeType/Android.mk
View File

@@ -1,38 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := FreeType
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/freetype/include
# Add your application source files here...
LOCAL_SRC_FILES := \
$(LOCAL_PATH)/freetype/src/base/ftbase.c \
$(LOCAL_PATH)/freetype/src/base/ftbitmap.c \
$(LOCAL_PATH)/freetype/src/base/ftdebug.c \
$(LOCAL_PATH)/freetype/src/base/ftinit.c \
$(LOCAL_PATH)/freetype/src/base/ftsystem.c \
$(LOCAL_PATH)/freetype/src/winfonts/winfnt.c \
$(LOCAL_PATH)/freetype/src/autofit/autofit.c \
$(LOCAL_PATH)/freetype/src/bdf/bdf.c \
$(LOCAL_PATH)/freetype/src/cff/cff.c \
$(LOCAL_PATH)/freetype/src/gzip/ftgzip.c \
$(LOCAL_PATH)/freetype/src/lzw/ftlzw.c \
$(LOCAL_PATH)/freetype/src/pcf/pcf.c \
$(LOCAL_PATH)/freetype/src/pfr/pfr.c \
$(LOCAL_PATH)/freetype/src/psaux/psaux.c \
$(LOCAL_PATH)/freetype/src/pshinter/pshinter.c \
$(LOCAL_PATH)/freetype/src/psnames/psnames.c \
$(LOCAL_PATH)/freetype/src/raster/raster.c \
$(LOCAL_PATH)/freetype/src/sfnt/sfnt.c \
$(LOCAL_PATH)/freetype/src/smooth/smooth.c \
$(LOCAL_PATH)/freetype/src/truetype/truetype.c \
$(LOCAL_PATH)/freetype/src/type1/type1.c \
$(LOCAL_PATH)/freetype/src/cid/type1cid.c \
$(LOCAL_PATH)/freetype/src/type42/type42.c
LOCAL_CFLAGS := -DFT2_BUILD_LIBRARY
include $(BUILD_SHARED_LIBRARY)

20
GpFontHandler_FreeType2/Android.mk
View File

@@ -1,20 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := GpFontHandler_FreeType2
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../Common \
$(LOCAL_PATH)/../GpCommon \
$(LOCAL_PATH)/../FreeType/freetype/include
LOCAL_CFLAGS := -DGP_DEBUG_CONFIG=0
# Add your application source files here...
LOCAL_SRC_FILES := \
GpFontHandler_FreeType2.cpp
LOCAL_SHARED_LIBRARIES := FreeType
include $(BUILD_STATIC_LIBRARY)