Buildfixes for CentOS, MinGW, osxcross
authorEthan Lee <flibitijibibo@flibitijibibo.com>
Sat, 18 Apr 2020 20:00:35 -0400
changeset 1242 4929f916a134
parent 1241 01fea3855ffb
child 1243 0092b6c389d4
Buildfixes for CentOS, MinGW, osxcross
mojoshader_internal.h
--- a/mojoshader_internal.h	Mon Apr 13 22:14:42 2020 -0400
+++ b/mojoshader_internal.h	Sat Apr 18 20:00:35 2020 -0400
@@ -11,7 +11,8 @@
 #ifdef MOJOSHADER_USE_SDL_STDLIB
 #include <SDL_assert.h>
 #include <SDL_stdinc.h>
-#ifdef _MSC_VER
+#include <math.h> /* Needed for isinf/isnan :( */
+#ifndef __APPLE__
 #include <malloc.h> /* Needed for alloca :( */
 #endif
 
@@ -54,13 +55,6 @@
 #define sqrt SDL_sqrt
 
 /* string.h */
-#define strchr SDL_strchr
-#define strcmp SDL_strcmp
-#define strlen SDL_strlen
-#define strncmp SDL_strncmp
-#define strstr SDL_strstr
-
-/* string.h but with undefs for Apple systems */
 #ifdef memcmp
 #undef memcmp
 #endif
@@ -73,6 +67,26 @@
 #undef memset
 #endif
 #define memset SDL_memset
+#ifdef strchr
+#undef strchr
+#endif
+#define strchr SDL_strchr
+#ifdef strcmp
+#undef strcmp
+#endif
+#define strcmp SDL_strcmp
+#ifdef strlen
+#undef strlen
+#endif
+#define strlen SDL_strlen
+#ifdef strncmp
+#undef strncmp
+#endif
+#define strncmp SDL_strncmp
+#ifdef strstr
+#undef strstr
+#endif
+#define strstr SDL_strstr
 #ifdef strcat
 #undef strcat
 #endif