Skip to content

Commit

Permalink
Merge branch 'release/0.14.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
guillaumeblanc committed Aug 11, 2023
2 parents 7fd3642 + 737fffc commit 36d2420
Show file tree
Hide file tree
Showing 37 changed files with 381 additions and 337 deletions.
77 changes: 31 additions & 46 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,14 @@ jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
build_type: [Debug]
option: [default, ref, shared, no_sample, no_data, no_fbx, no_gltf, no_tests]
cxx_standard: ['11']
include:
- build_type: Release
option: default
- build_type: Debug
option: gcc7
compiler_c: gcc-7
compiler_cxx: g++-7
- build_type: Debug
option: gcc7
compiler_c: gcc-7
compiler_cxx: g++-7
cxx_standard: '17'
- build_type: Debug
option: gcc8
compiler_c: gcc-8
compiler_cxx: g++-8
- build_type: Debug
option: gcc9
compiler_c: gcc-9
compiler_cxx: g++-9
- build_type: Debug
option: gcc10
compiler_c: gcc-10
Expand All @@ -37,43 +21,44 @@ jobs:
compiler_c: gcc-11
compiler_cxx: g++-11
- build_type: Debug
option: gcc11
compiler_c: gcc-11
compiler_cxx: g++-11
cxx_standard: '20'
- build_type: Debug
option: clang7
compiler_c: clang-7
compiler_cxx: clang++-7
- build_type: Debug
option: clang7
compiler_c: clang-7
compiler_cxx: clang++-7
cxx_standard: '17'
- build_type: Debug
option: clang8
compiler_c: clang-8
compiler_cxx: clang++-8
option: gcc12
compiler_c: gcc-12
compiler_cxx: g++-12
- build_type: Debug
option: clang9
compiler_c: clang-9
compiler_cxx: clang++-9
- build_type: Debug
option: clang10
compiler_c: clang-10
compiler_cxx: clang++-10
option: gcc13
compiler_c: gcc-13
compiler_cxx: g++-13
- build_type: Release
option: gcc13
compiler_c: gcc-13
compiler_cxx: g++-13
- build_type: Debug
option: clang11
compiler_c: clang-11
compiler_cxx: clang++-11
- build_type: Debug
option: clang11
compiler_c: clang-11
compiler_cxx: clang++-11
cxx_standard: '20'
option: clang12
compiler_c: clang-12
compiler_cxx: clang++-12
- build_type: Debug
option: clang13
compiler_c: clang-13
compiler_cxx: clang++-13
- build_type: Debug
option: clang14
compiler_c: clang-14
compiler_cxx: clang++-14
- build_type: Debug
option: clang15
compiler_c: clang-15
compiler_cxx: clang++-15
- build_type: Release
option: clang15
compiler_c: clang-15
compiler_cxx: clang++-15

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install OpenGL dependency
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ jobs:
build:
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
build_type: [Debug]
option: [default, ref, shared, no_fbx]
include:
- build_type: Release
option: default
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install fbx sdk
if: matrix.option != 'no_fbx'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ jobs:
build:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
build_type: [Debug]
option: [default, ref, shared, no_fbx]
include:
- build_type: Release
option: default
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install fbx sdk
if: matrix.option != 'no_fbx'
Expand Down
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ The following authors have all licensed their contributions to ozz-animation und
- Kota Iguchi <[email protected]>
- Mikołaj Siedlarek <[email protected]>
- Paul Gruenbacher <[email protected]>
- Christophe Meyer <[email protected]>
24 changes: 24 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
Release version 0.14.2
----------------------

* Library
- Transitions away from sprintf to the more secure snprintf.
- #147 Works around gcc 11 error stringop-overflow which emits false positives for ozz math serialisation.

* Build pipeline
- Updates CI compiler versions.

Release version 0.14.1
----------------------

* Samples
- Allows reusing sample framework outside of sample directory.
- #154 Exposes swap interval

* Library
- #153 Fixes deprecated implicit copy warning.
- #141 Removes non-ASCII characters in source codes.

* Build pipeline
- Exposes ozz cmake configuration variables to PARENT_SCOPE, so it can be used/changed by an external project.

Release version 0.14.0
----------------------

Expand Down
25 changes: 19 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
cmake_minimum_required (VERSION 3.3)
cmake_minimum_required(VERSION 3.24)

# Defines the project's name
project(ozz)

# Check if project is top level or a sub project
get_directory_property(is_sub_project PARENT_DIRECTORY)

# Current version
set(OZZ_VERSION_MAJOR 0)
set(OZZ_VERSION_MINOR 14)
set(OZZ_VERSION_PATCH 0)
set(OZZ_VERSION_PATCH 2)
set(OZZ_VERSION ${OZZ_VERSION_MAJOR}.${OZZ_VERSION_MINOR}.${OZZ_VERSION_PATCH})

# Add project build options
Expand All @@ -28,6 +31,10 @@ if(WIN32 AND BUILD_SHARED_LIBS AND NOT ozz_build_msvc_rt_dll)
set(ozz_build_msvc_rt_dll ON)
endif()

if(is_sub_project)
set(ozz_build_msvc_rt_dll ${ozz_build_msvc_rt_dll} PARENT_SCOPE)
endif()

# Include ozz cmake parameters and scripts
include(CheckCXXCompilerFlag)
include(${PROJECT_SOURCE_DIR}/build-utils/cmake/compiler_settings.cmake)
Expand All @@ -45,7 +52,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/build-utils/cm

# Detects Fbx SDK, required to build Fbx pipeline.
if(ozz_build_tools AND ozz_build_fbx)

# Select a msvc runtime compatible with ozz_build_msvc_rt_dll
set(FBX_SHARED ${BUILD_SHARED_LIBS})
set(FBX_MSVC_RT_DLL ${ozz_build_msvc_rt_dll})
Expand All @@ -64,12 +70,20 @@ else()
set(ozz_build_fbx OFF)
endif()

# gltf
if(is_sub_project)
set(ozz_build_fbx ${ozz_build_fbx} PARENT_SCOPE)
endif()

# gltf
if(ozz_build_tools AND ozz_build_gltf)
else()
set(ozz_build_gltf OFF)
endif()

if(is_sub_project)
set(ozz_build_gltf ${ozz_build_gltf} PARENT_SCOPE)
endif()

# Enables unit tests.
if(ozz_build_tests)
enable_testing()
Expand Down Expand Up @@ -115,9 +129,8 @@ if(ozz_build_tests AND NOT EMSCRIPTEN)
add_subdirectory(test)
endif()


install(FILES
${PROJECT_SOURCE_DIR}/CHANGES.md
${PROJECT_SOURCE_DIR}/LICENSE.md
${PROJECT_SOURCE_DIR}/README.md
DESTINATION ./)
DESTINATION "share/doc/ozz-animation/")
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Documentation and samples are available from [ozz-animation website](http://guil
Supported platforms
-------------------

Ozz is tested on Linux, Mac OS and Windows, for x86, x86-64 and ARM architectures. The run-time code (ozz_base, ozz_animation, ozz_geometry) depends only on c++11, the standard CRT and has no OS specific code, portability to any other platform shouldn't be an issue.
Ozz is tested on Linux, Mac OS and Windows, for x86, x86-64 and ARM architectures. The run-time code (ozz_base, ozz_animation, ozz_geometry) depends only on c++11, on the C and the C++ standard libraries, and has no OS specific code. Portability to any other platform shouldn't be an issue.

Samples, tools and tests depend on external libraries (glfw, tinygltf, Fbx SDK, jsoncpp, gtest, ...), which could limit portability.

Expand Down
Loading

0 comments on commit 36d2420

Please sign in to comment.