From: Neal Gompa <ngompa13@gmail.com>
Date: Fri, 14 May 2010 03:26:06 +0000 (-0500)
Subject: Fixed SDL linkage and internal libjpeg linkage breaks
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=19f30d5f1d68e9079a6b1951f3dae85795003902;p=lugaru.git

Fixed SDL linkage and internal libjpeg linkage breaks
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bedcf42..3ebfe86 100644
--- 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 f09fd96..76dc3f5 100644
--- 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