rebuild of few external libs for windows

sezero · Apr 29, 2024 · 8ab55df · 8ab55df
1 parent 7e00445
commit 8ab55df
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 10 deletions.
diff --git a/MacOSX/SDL.framework/Versions/A/Headers/SDL_stdinc.h b/MacOSX/SDL.framework/Versions/A/Headers/SDL_stdinc.h
@@ -92,7 +92,7 @@
 # elif defined(__MRC__)
    void *alloca (unsigned);
 # else
-   char *alloca ();
+   void *alloca (size_t);
 # endif
 #endif
 
@@ -409,7 +409,9 @@ extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src, size_t ma
 extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src, size_t maxlen);
 #endif
 
-#ifdef HAVE_STRDUP
+#if defined(HAVE_STRDUP) && defined(_WIN32)
+#define SDL_strdup    _strdup
+#elif defined(HAVE_STRDUP)
 #define SDL_strdup     strdup
 #else
 extern DECLSPEC char * SDLCALL SDL_strdup(const char *string);

diff --git a/Windows/SDL/include/SDL_config_win32.h b/Windows/SDL/include/SDL_config_win32.h
@@ -131,12 +131,6 @@ typedef unsigned int uintptr_t;
 #define HAVE_STDDEF_H	1
 #endif
 
-/* Windows CE can support only _strdup() */
-#if defined(_WIN32_WCE) && defined(HAVE_STRDUP)
-#undef strdup
-#define strdup	_strdup
-#endif
-
 /* Enable various audio drivers */
 #ifndef _WIN32_WCE
 #define SDL_AUDIO_DRIVER_DSOUND	1

diff --git a/Windows/SDL/include/SDL_stdinc.h b/Windows/SDL/include/SDL_stdinc.h
@@ -92,7 +92,7 @@
 # elif defined(__MRC__)
    void *alloca (unsigned);
 # else
-   char *alloca ();
+   void *alloca (size_t);
 # endif
 #endif
 
@@ -409,7 +409,9 @@ extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src, size_t ma
 extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src, size_t maxlen);
 #endif
 
-#ifdef HAVE_STRDUP
+#if defined(HAVE_STRDUP) && defined(_WIN32)
+#define SDL_strdup    _strdup
+#elif defined(HAVE_STRDUP)
 #define SDL_strdup     strdup
 #else
 extern DECLSPEC char * SDLCALL SDL_strdup(const char *string);

diff --git a/Windows/SDL/lib/SDL.dll b/Windows/SDL/lib/SDL.dll
diff --git a/Windows/SDL/lib64/SDL.dll b/Windows/SDL/lib64/SDL.dll
diff --git a/Windows/codecs/x64/libFLAC-8.dll b/Windows/codecs/x64/libFLAC-8.dll
diff --git a/Windows/codecs/x64/libmpg123-0.dll b/Windows/codecs/x64/libmpg123-0.dll
diff --git a/Windows/codecs/x64/libopusfile-0.dll b/Windows/codecs/x64/libopusfile-0.dll
diff --git a/Windows/codecs/x86/libmpg123-0.dll b/Windows/codecs/x86/libmpg123-0.dll
diff --git a/Windows/codecs/x86/libopusfile-0.dll b/Windows/codecs/x86/libopusfile-0.dll