Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated Android.mk, Added CI #49

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Updated Android.mk, Added CI #49

wants to merge 17 commits into from

Commits on Nov 16, 2015

  1. surrogate pairs decoding

    nischuk committed Nov 16, 2015
    Configuration menu
    Copy the full SHA
    008b063 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2017

  1. Fixed a bug in tryGetBoolean.

    @madbranch
    madbranch committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    37b0cb3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature' of git://github.com/Aranoledur/JsonBox into Ar… 

    …anoledur-feature
    @madbranch
    madbranch committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    ee357f9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'Aranoledur-feature' into develop

    @madbranch
    madbranch committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    cca261b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of git://github.com/cristianglezm/JsonBox into… 

    … cristianglezm-develop
    @madbranch
    madbranch committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    9ff00a6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'cristianglezm-develop' into develop

    @madbranch
    madbranch committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    89a01b9 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2017

  1. Fixed the formatting and specified a .clang-format configuration file.

    @madbranch
    madbranch committed Oct 7, 2017
    Configuration menu
    Copy the full SHA
    43ad9c1 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2020

  1. Update CMakeLists.txt

    @cristianglezm
    cristianglezm authored Jun 14, 2020
    Configuration menu
    Copy the full SHA
    c167634 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2020

  1. Merge branch 'develop' of https://github.com/AnHero/JsonBox into develop

    @cristianglezm
    cristianglezm committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    dde6258 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop'

    @cristianglezm
    cristianglezm committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    7b656e8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AnHero/JsonBox

    @cristianglezm
    cristianglezm committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    cd3607a View commit details
    Browse the repository at this point in the history

  4. Increased CMake version and fixed typo on android build

    @cristianglezm
    cristianglezm committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    8d10074 View commit details
    Browse the repository at this point in the history

  5. Merged CMake required version and android build typo.

    @cristianglezm
    cristianglezm committed Sep 10, 2020
    Configuration menu
    Copy the full SHA
    d9fa92e View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2023

  1. Update Android.mk 

    added  debug version for android JsonBox_d and JsonBox_d-static
    @cristianglezm
    cristianglezm authored Jan 29, 2023
    Configuration menu
    Copy the full SHA
    9b18cbb View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. removed android forced shared build 

    * fixed findJsonBox.cmake
* fixed wrong tab

Signed-off-by: Cristian Gonzalez <[email protected]>
    @cristianglezm
    cristianglezm committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    0729e3b View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. fixed FindJsonBox.cmake for msvc. 

    Signed-off-by: Cristian Gonzalez <[email protected]>
    @cristianglezm
    cristianglezm committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    24e455c View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Added ci. 

    * fixed missing platform.flags
* fixed gcc / clang++ compiler mix when compiling with clang.

Signed-off-by: Cristian Gonzalez <[email protected]>
    @cristianglezm
    cristianglezm committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    fdae6ee View commit details
    Browse the repository at this point in the history