Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/adxeproject/adxe

This commit is contained in:
halx99 2021-05-27 14:52:23 +08:00
parent 8750096575 2b3ae5e41d
commit c4dc07d1aa
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/jpeg/CMakeLists.txt vendored
View File

@ -5,7 +5,7 @@ if(CMAKE_EXECUTABLE_SUFFIX)
endif() endif()
project(libjpeg-turbo C) project(libjpeg-turbo C)
set(VERSION 2.1.0) set(VERSION 2.1.1)
string(REPLACE "." ";" VERSION_TRIPLET ${VERSION}) string(REPLACE "." ";" VERSION_TRIPLET ${VERSION})
list(GET VERSION_TRIPLET 0 VERSION_MAJOR) list(GET VERSION_TRIPLET 0 VERSION_MAJOR)
list(GET VERSION_TRIPLET 1 VERSION_MINOR) list(GET VERSION_TRIPLET 1 VERSION_MINOR)

9
external/jpeg/ChangeLog.md vendored
View File

@ -1,3 +1,12 @@
2.1.1
=====
### Significant changes relative to 2.1.0
1. Fixed a regression introduced in 2.1.0 that caused build failures with
non-GCC-compatible compilers for Un*x/Arm platforms.
2.1.0 2.1.0
===== =====

5
external/jpeg/jchuff.c vendored
View File

@ -44,8 +44,9 @@
* flags (this defines __thumb__). * flags (this defines __thumb__).
*/ */
#if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || \ /* NOTE: Both GCC and Clang define __GNUC__ */
defined(_M_ARM64) #if (defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))) || \
defined(_M_ARM) || defined(_M_ARM64)
#if !defined(__thumb__) || defined(__thumb2__) #if !defined(__thumb__) || defined(__thumb2__)
#define USE_CLZ_INTRINSIC #define USE_CLZ_INTRINSIC
#endif #endif

5
external/jpeg/jcphuff.c vendored
View File

@ -52,8 +52,9 @@
* flags (this defines __thumb__). * flags (this defines __thumb__).
*/ */
#if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || \ /* NOTE: Both GCC and Clang define __GNUC__ */
defined(_M_ARM64) #if (defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))) || \
defined(_M_ARM) || defined(_M_ARM64)
#if !defined(__thumb__) || defined(__thumb2__) #if !defined(__thumb__) || defined(__thumb2__)
#define USE_CLZ_INTRINSIC #define USE_CLZ_INTRINSIC
#endif #endif