RmlUi third-party containers test

Author: viciious

platforms/android/projects/qfusion/jni/Application.mk

@@ -1,5 +1,5 @@
 APP_ABI := armeabi-v7a x86
-APP_CFLAGS := -ffast-math -fno-strict-aliasing -funroll-loops -std=gnu99 -Werror=return-type -Wno-typedef-redefinition -DRMLUI_STATIC_LIB=1 -DRMLUI_NO_FONT_INTERFACE_DEFAULT=1 -DRMLUI_NO_THIRDPARTY_CONTAINERS=1 -DMINIZ_NO_STDIO=1 -DMINIZ_NO_ARCHIVE_APIS=1 -DMINIZ_NO_ARCHIVE_WRITING_APIS=1
+APP_CFLAGS := -ffast-math -fno-strict-aliasing -funroll-loops -std=gnu99 -Werror=return-type -Wno-typedef-redefinition -DRMLUI_STATIC_LIB=1 -DRMLUI_NO_FONT_INTERFACE_DEFAULT=1 -DMINIZ_NO_STDIO=1 -DMINIZ_NO_ARCHIVE_APIS=1 -DMINIZ_NO_ARCHIVE_WRITING_APIS=1 -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
 APP_CPPFLAGS := -fexceptions -frtti -std=gnu++14
 APP_OPTIM := release
 APP_PLATFORM := android-18

source/ui/CMakeLists.txt

@@ -39,7 +39,7 @@ target_include_directories(ui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) # for ui_prec
 
 target_link_libraries(ui PRIVATE RmlCore RmlControls RmlDebugger)
 
-set_target_properties(ui PROPERTIES COMPILE_DEFINITIONS "RMLUI_STATIC_LIB;RMLUI_NO_FONT_INTERFACE_DEFAULT;RMLUI_NO_THIRDPARTY_CONTAINERS")
+set_target_properties(ui PROPERTIES COMPILE_DEFINITIONS "RMLUI_STATIC_LIB;RMLUI_NO_FONT_INTERFACE_DEFAULT;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS")
 if (CMAKE_VERSION VERSION_GREATER 3.16.0)
     target_precompile_headers(ui PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}/ui_precompiled.h>")
 endif()
@@ -48,7 +48,6 @@ add_dependencies(ui angelwrap)
 
 option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 option(NO_FONT_INTERFACE_DEFAULT "Do not build the font providers that come with the library" ON)
-option(NO_THIRDPARTY_CONTAINERS "Only use standard library containers." ON)
 add_subdirectory(${LIBROCKET_DIR} ${CMAKE_HOME_DIRECTORY}/build/ui/rmlui/)
 set_property(TARGET RmlCore PROPERTY POSITION_INDEPENDENT_CODE ON)
 set_property(TARGET RmlControls PROPERTY POSITION_INDEPENDENT_CODE ON)