Remove unneeded FriBidi and libraqm files

Author: Benau

CMakeLists.txt

@@ -44,7 +44,6 @@ CMAKE_DEPENDENT_OPTION(USE_WIIUSE "Support for wiimote input devices" ON
 
 if(APPLE AND NOT IOS)
     list(APPEND CMAKE_PREFIX_PATH /usr/local/opt)
-    include_directories(/usr/local/opt/fribidi/include/)
     include_directories(/usr/local/opt/[email protected]/include/)
     include_directories(/usr/local/opt/[email protected]/include/openssl/)
     include_directories(/usr/local/opt/freetype/include/freetype2/)
@@ -370,7 +369,7 @@ if(NOT SERVER_ONLY)
     add_definitions(-DENABLE_SOUND)
 endif()
 
-# Text handling in STK (We use freetype, harfbuzz, fribidi and libraqm for i18n text handling)
+# Text handling in STK (We use freetype, harfbuzz and SheenBidifor i18n text handling)
 if (NOT SERVER_ONLY)
     # SheenBidi
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/sheenbidi")
@@ -396,28 +395,6 @@ if (NOT SERVER_ONLY)
         include_directories("${HARFBUZZ_INCLUDEDIR}")
         MESSAGE(STATUS "Use system harfbuzz: ${HARFBUZZ_LIBRARY}")
     endif()
-
-    # Fribidi
-    find_package(Fribidi)
-    if(FRIBIDI_FOUND)
-        include_directories(${FRIBIDI_INCLUDE_DIRS})
-    else()
-        message(FATAL_ERROR "Fribidi not found. "
-            "Fribidi is required to display characters in SuperTuxKart.")
-    endif()
-
-    # Libraqm
-    find_library(RAQM_LIBRARY NAMES raqm libraqm)
-    find_path(RAQM_INCLUDEDIR NAMES raqm.h PATHS)
-    if (NOT RAQM_LIBRARY OR NOT RAQM_INCLUDEDIR)
-        add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libraqm")
-        include_directories("${PROJECT_SOURCE_DIR}/lib/libraqm")
-        SET(RAQM_LIBRARY raqm)
-        message(STATUS "System libraqm not found, use the bundled one.")
-    else()
-        include_directories("${RAQM_INCLUDEDIR}")
-        MESSAGE(STATUS "Use system libraqm: ${RAQM_LIBRARY}")
-    endif()
 endif()
 
 # OpenGL
@@ -665,8 +642,6 @@ if(NOT SERVER_ONLY)
         ${JPEG_LIBRARIES}
         ${OGGVORBIS_LIBRARIES}
         ${OPENAL_LIBRARY}
-        ${RAQM_LIBRARY}
-        ${FRIBIDI_LIBRARIES}
         ${FREETYPE_LIBRARIES}
         ${HARFBUZZ_LIBRARY}
         ${SDL2_LIBRARY}

android/Android.mk

@@ -72,13 +72,6 @@ include $(PREBUILT_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 
-# Fribidi
-LOCAL_MODULE       := fribidi
-LOCAL_SRC_FILES    := obj/fribidi/lib/.libs/libfribidi.a
-include $(PREBUILT_STATIC_LIBRARY)
-include $(CLEAR_VARS)
-
-
 # Freetype
 LOCAL_MODULE := freetype
 LOCAL_SRC_FILES := obj/freetype/objs/.libs/libfreetype.a
@@ -93,23 +86,6 @@ include $(PREBUILT_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 
-# Raqm
-LOCAL_MODULE       := raqm
-LOCAL_PATH         := .
-LOCAL_CPP_FEATURES += rtti
-LOCAL_SRC_FILES    := $(wildcard ../lib/libraqm/*.c)
-LOCAL_CFLAGS       := -Iobj/fribidi/include             \
-                      -Iobj/freetype/include            \
-                      -Iobj/harfbuzz/include            \
-                      -DHAVE_DECL_HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES \
-                      -DHAVE_HB_BUFFER_SET_INVISIBLE_GLYPH \
-                      -DHAVE_HB_FT_FONT_CREATE_REFERENCED \
-                      -DHAVE_HB_FT_FONT_SET_LOAD_FLAGS \
-                      -std=c99
-include $(BUILD_STATIC_LIBRARY)
-include $(CLEAR_VARS)
-
-
 # ifaddrs
 LOCAL_MODULE    := ifaddrs
 LOCAL_PATH      := .
@@ -258,7 +234,6 @@ LOCAL_SRC_FILES    := $(wildcard ../src/*.cpp)     \
 LOCAL_LDLIBS       := -llog -landroid -lGLESv1_CM -lGLESv3 -lOpenSLES -ldl -lm
 LOCAL_CFLAGS       := -I../lib/angelscript/include      \
                       -I../lib/bullet/src               \
-                      -I../lib/libraqm                  \
                       -I../lib/sheenbidi/Headers        \
                       -I../lib/enet/include             \
                       -I../lib/ifaddrs                  \
@@ -269,7 +244,6 @@ LOCAL_CFLAGS       := -I../lib/angelscript/include      \
                       -I../lib/sdl2/include             \
                       -I../src                          \
                       -Iobj/curl/include                \
-                      -Iobj/fribidi/include             \
                       -Iobj/freetype/include            \
                       -Iobj/harfbuzz/include            \
                       -Iobj/libogg/include              \
@@ -290,8 +264,7 @@ LOCAL_CPPFLAGS     := -std=gnu++0x
 
 LOCAL_STATIC_LIBRARIES := irrlicht bullet enet ifaddrs angelscript mcpp SDL2 \
                           vorbisfile vorbis ogg openal curl libssl libcrypto \
-                          c++_static raqm fribidi sheenbidi harfbuzz freetype \
-                          graphics_utils
+                          c++_static sheenbidi harfbuzz freetype graphics_utils
 
 include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)

android/make.sh

@@ -322,21 +322,6 @@ if [ ! -f "$DIRNAME/obj/libpng.stamp" ]; then
     touch "$DIRNAME/obj/libpng.stamp"
 fi
 
-# Fribidi
-if [ ! -f "$DIRNAME/obj/fribidi.stamp" ]; then
-    echo "Compiling fribidi"
-    mkdir -p "$DIRNAME/obj/fribidi"
-    cp -a -f "$DIRNAME/../lib/fribidi/"* "$DIRNAME/obj/fribidi"
-
-    cd "$DIRNAME/obj/fribidi"
-    ./configure --host=$HOST --enable-static=yes &&
-    make $@
-    check_error
-    mkdir -p "$DIRNAME/obj/fribidi/include/fribidi"
-    cp $DIRNAME/obj/fribidi/lib/*.h "$DIRNAME/obj/fribidi/include/fribidi"
-    touch "$DIRNAME/obj/fribidi.stamp"
-fi
-
 # Freetype bootstrap
 if [ ! -f "$DIRNAME/obj/freetype_bootstrap.stamp" ]; then
     echo "Compiling freetype"