]> git.jsancho.org Git - lugaru.git/commitdiff
jpeglib (etc) need to be wrapped in extern "C". :/
authorRyan C. Gordon <icculus@icculus.org>
Thu, 13 May 2010 00:47:46 +0000 (20:47 -0400)
committerRyan C. Gordon <icculus@icculus.org>
Thu, 13 May 2010 00:47:46 +0000 (20:47 -0400)
Source/OpenGL_Windows.cpp

index a50c24ff99d7f2f5ac4ae6446f0c60c313c57c01..550552e3c361016f4d5df3da0b6038f338dfac83 100644 (file)
@@ -37,9 +37,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        #include "Game.h"
 #else
 
-       #include <zlib.h>
-       #include <png.h>
-       #include <jpeglib.h>
+    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);