Fixed SDL linkage and internal libjpeg linkage breaks

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bedcf427511780bef89ae87a34f99720bc2dc98f..3ebfe8657eecd8d5de1a8779e8a23639c59a65d7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,8 +212,10 @@ if (NOT SDL_FOUND)
         endif (MSVC)
         if (MINGW)
           set(SDL_LIBRARY
+              "mingw32"
               ${SDLDIR}/lib/win32/mingw/libSDLmain.a
               ${SDLDIR}/lib/win32/mingw/libSDL.dll.a
+              "-mwindows"
           )
         endif (MINGW)
     endif (WIN32)

diff --git a/Dependencies/libjpeg/jconfig.h b/Dependencies/libjpeg/jconfig.h
index f09fd96042781f700f9a462f564aca1ac5acd8bc..76dc3f58be518835b161fae121b63e92f9333bf3 100644 (file)
--- a/Dependencies/libjpeg/jconfig.h
+++ b/Dependencies/libjpeg/jconfig.h
@@ -1,7 +1,7 @@
 #define HAVE_PROTOTYPES
 #define HAVE_STDDEF_H
 #define HAVE_STDLIB_H
-#define NEED_BSD_STRINGS
+/* #define NEED_BSD_STRINGS -- causes fail on Win32 */
 #define NEED_SYS_TYPES_H
 
 #ifdef JPEG_INTERNALS