From: Ryan C. Gordon Date: Thu, 13 May 2010 00:47:46 +0000 (-0400) Subject: jpeglib (etc) need to be wrapped in extern "C". :/ X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=ce7a0cd9e7bb28d1b26e1b2cda36a52592224d9e;p=lugaru.git jpeglib (etc) need to be wrapped in extern "C". :/ --- diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp index a50c24f..550552e 100644 --- a/Source/OpenGL_Windows.cpp +++ b/Source/OpenGL_Windows.cpp @@ -37,9 +37,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Game.h" #else - #include - #include - #include + extern "C" { + #include "zlib.h" + #include "png.h" + #include "jpeglib.h" + } #include "Game.h" static bool load_image(const char * fname, TGAImageRec & tex); static bool load_png(const char * fname, TGAImageRec & tex);