Permalink
Browse files

Bump win64 packages to newer versions.

 - SDL 1.2.15
 - libpng 1.5.7
 - libogg 1.3.0
 - libvorbis 1.3.2
 - zlib 1.2.5

Drop merged SDL patch.
Build fix for mingw's new ws2 header.
Build fix for libpng 1.5.7.
  • Loading branch information...
1 parent 341e989 commit ee3263e465b4a24686b6db21f6ee48fefb0ec372 @ajs1984 committed Jan 26, 2012
Showing with 2 additions and 54 deletions.
  1. +0 −52 contrib/patches/sdl/01-SDL-1.2.14-fix-default-beep.diff
  2. +1 −1 src/network/host.c
  3. +1 −1 src/pngops.c
@@ -1,52 +0,0 @@
-Index: src/video/windib/SDL_dibevents.c
-===================================================================
---- src/video/windib/SDL_dibevents.c (revision 5261)
-+++ src/video/windib/SDL_dibevents.c (revision 5262)
-@@ -198,7 +198,7 @@
- m.wParam = wParam;
- m.lParam = lParam;
- m.time = 0;
-- if ( PeekMessage(&m, hwnd, 0, WM_USER, PM_NOREMOVE) && (m.message == WM_CHAR) ) {
-+ if ( TranslateMessage(&m) && PeekMessage(&m, hwnd, 0, WM_USER, PM_NOREMOVE) && (m.message == WM_CHAR) ) {
- GetMessage(&m, hwnd, 0, WM_USER);
- wParam = m.wParam;
- }
-@@ -363,7 +363,6 @@
-
- while ( PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) ) {
- if ( GetMessage(&msg, NULL, 0, 0) > 0 ) {
-- TranslateMessage(&msg);
- DispatchMessage(&msg);
- }
- }
-Index: src/video/windx5/SDL_dx5events.c
-===================================================================
---- src/video/windx5/SDL_dx5events.c (revision 5261)
-+++ src/video/windx5/SDL_dx5events.c (revision 5262)
-@@ -657,7 +657,6 @@
- while ( ! posted &&
- PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) ) {
- if ( GetMessage(&msg, NULL, 0, 0) > 0 ) {
-- TranslateMessage(&msg);
- DispatchMessage(&msg);
- } else {
- return(-1);
-@@ -716,17 +715,12 @@
- }
- if ( event != WAIT_TIMEOUT ) {
- /* Maybe there was a windows message? */
-- posted = 0;
-- while ( ! posted &&
-- PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) ) {
-+ if ( PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) ) {
- if ( GetMessage(&msg, NULL, 0, 0) > 0 ) {
-- TranslateMessage(&msg);
- DispatchMessage(&msg);
- } else {
- return(-1);
- }
-- }
-- if ( posted ) {
- return(1);
- }
- }
View
@@ -126,7 +126,7 @@ struct addrinfo
#if defined(__amigaos__)
static
#endif
-const char *gai_strerror(int errcode)
+char *gai_strerror(int errcode)
{
switch(errcode)
{
View
@@ -126,7 +126,7 @@ void *png_read_file(const char *name, png_uint_32 *_w, png_uint_32 *_h,
if(!info_ptr)
goto exit_free_close;
- if(setjmp(png_ptr->jmpbuf))
+ if(setjmp(png_jmpbuf(png_ptr)))
goto exit_free_close;
png_init_io(png_ptr, f);

0 comments on commit ee3263e

Please sign in to comment.