GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix stb compilation on Windows for TextureTool

Browse Source
This commit is contained in:
Wojtek Figat
2021-10-11 13:58:46 +02:00
parent 65bee6bd0f
commit ee2c9a3970
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/ThirdParty/detex/detex.h vendored
View File

@@ -34,6 +34,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define DETEX_HELPER_SHARED_IMPORT __declspec(dllimport) #define DETEX_HELPER_SHARED_IMPORT __declspec(dllimport)
#define DETEX_HELPER_SHARED_EXPORT __declspec(dllexport) #define DETEX_HELPER_SHARED_EXPORT __declspec(dllexport)
#define DETEX_HELPER_SHARED_LOCAL #define DETEX_HELPER_SHARED_LOCAL
#define DETEX_INLINE_ONLY __forceinline
#else #else
#if __GNUC__ >= 4 #if __GNUC__ >= 4
#define DETEX_HELPER_SHARED_IMPORT __attribute__ ((visibility ("default"))) #define DETEX_HELPER_SHARED_IMPORT __attribute__ ((visibility ("default")))
@@ -44,6 +45,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define DETEX_HELPER_SHARED_EXPORT #define DETEX_HELPER_SHARED_EXPORT
#define DETEX_HELPER_SHARED_LOCAL #define DETEX_HELPER_SHARED_LOCAL
#endif #endif
#define DETEX_INLINE_ONLY __attribute__((always_inline)) inline
#endif #endif
/* Now we use the generic helper definitions above to define DETEX_API and DETEX_LOCAL. */ /* Now we use the generic helper definitions above to define DETEX_API and DETEX_LOCAL. */
@@ -72,7 +74,6 @@ __BEGIN_DECLS
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#define DETEX_INLINE_ONLY __attribute__((always_inline)) inline
#define DETEX_RESTRICT __restrict #define DETEX_RESTRICT __restrict
/* Maximum uncompressed block size in bytes. */ /* Maximum uncompressed block size in bytes. */

2
Source/ThirdParty/stb/stb_dxt.h vendored
View File

@@ -317,7 +317,7 @@ static unsigned int stb__MatchColorsBlock(unsigned char *block, unsigned char *c
static void stb__OptimizeColorsBlock(unsigned char *block, unsigned short *pmax16, unsigned short *pmin16) static void stb__OptimizeColorsBlock(unsigned char *block, unsigned short *pmax16, unsigned short *pmin16)
{ {
int mind = 0x7fffffff,maxd = -0x7fffffff; int mind = 0x7fffffff,maxd = -0x7fffffff;
unsigned char *minp, *maxp; unsigned char *minp = nullptr, *maxp = nullptr;
double magn; double magn;
int v_r,v_g,v_b; int v_r,v_g,v_b;
static const int nIterPower = 4; static const int nIterPower = 4;