From 19f30d5f1d68e9079a6b1951f3dae85795003902 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 13 May 2010 22:26:06 -0500 Subject: [PATCH] Fixed SDL linkage and internal libjpeg linkage breaks --- CMakeLists.txt | 2 ++ Dependencies/libjpeg/jconfig.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 -- 2.39.5