From ce7a0cd9e7bb28d1b26e1b2cda36a52592224d9e Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 12 May 2010 20:47:46 -0400 Subject: [PATCH] jpeglib (etc) need to be wrapped in extern "C". :/ --- Source/OpenGL_Windows.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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); -- 2.39.2