mirror of
https://github.com/godotengine/godot.git
synced 2025-12-08 06:09:55 +00:00
Fix libjpeg-turbo not working on 32-bit builds
This commit is contained in:
parent
09fcbb8645
commit
2a89ec5ccd
2 changed files with 20 additions and 4 deletions
|
|
@ -107,10 +107,18 @@ index 0000000000..f6171bf846
|
||||||
+#define PACKAGE_NAME "libjpeg-turbo"
|
+#define PACKAGE_NAME "libjpeg-turbo"
|
||||||
+
|
+
|
||||||
+/* Version number of package */
|
+/* Version number of package */
|
||||||
+#define VERSION "3.1.1"
|
+#define VERSION "3.1.0"
|
||||||
+
|
+
|
||||||
+/* The size of `size_t', as computed by sizeof. */
|
+/* The size of `size_t', as computed by sizeof. */
|
||||||
+#define SIZEOF_SIZE_T 8
|
+#if defined(__SIZEOF_SIZE_T__)
|
||||||
|
+ #define SIZEOF_SIZE_T __SIZEOF_SIZE_T__
|
||||||
|
+#elif defined(_WIN64)
|
||||||
|
+ #define SIZEOF_SIZE_T 8
|
||||||
|
+#elif defined(_WIN32)
|
||||||
|
+ #define SIZEOF_SIZE_T 4
|
||||||
|
+#else
|
||||||
|
+ #error "Cannot determine size of size_t"
|
||||||
|
+#endif
|
||||||
+
|
+
|
||||||
+/* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */
|
+/* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */
|
||||||
+#if defined(__GNUC__)
|
+#if defined(__GNUC__)
|
||||||
|
|
|
||||||
12
thirdparty/libjpeg-turbo/src/jconfigint.h
vendored
12
thirdparty/libjpeg-turbo/src/jconfigint.h
vendored
|
|
@ -33,10 +33,18 @@
|
||||||
#define PACKAGE_NAME "libjpeg-turbo"
|
#define PACKAGE_NAME "libjpeg-turbo"
|
||||||
|
|
||||||
/* Version number of package */
|
/* Version number of package */
|
||||||
#define VERSION "3.1.1"
|
#define VERSION "3.1.0"
|
||||||
|
|
||||||
/* The size of `size_t', as computed by sizeof. */
|
/* The size of `size_t', as computed by sizeof. */
|
||||||
#define SIZEOF_SIZE_T 8
|
#if defined(__SIZEOF_SIZE_T__)
|
||||||
|
#define SIZEOF_SIZE_T __SIZEOF_SIZE_T__
|
||||||
|
#elif defined(_WIN64)
|
||||||
|
#define SIZEOF_SIZE_T 8
|
||||||
|
#elif defined(_WIN32)
|
||||||
|
#define SIZEOF_SIZE_T 4
|
||||||
|
#else
|
||||||
|
#error "Cannot determine size of size_t"
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */
|
/* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue