]> git.jsancho.org Git - lugaru.git/commitdiff
Added extern structure to 'OpenGL_Windows.cpp' and fixed header inclusion order
authorNeal Gompa <ngompa13@gmail.com>
Thu, 13 May 2010 01:38:35 +0000 (20:38 -0500)
committerNeal Gompa <ngompa13@gmail.com>
Thu, 13 May 2010 01:38:35 +0000 (20:38 -0500)
Source/OpenGL_Windows.cpp

index fabb712dc5b787bbe613e2b89338daadd33998bc..691499f945e679d54416da3678633853fa06f9c3 100644 (file)
@@ -40,10 +40,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        #include "Game.h"
 #else
 
+       #include "Game.h"
        #include <zlib.h>
        #include <png.h>
        #include <jpeglib.h>
-       #include "Game.h"
+       extern "C" {
+               #include "zlib.h"
+                       #include "png.h"
+               #include "jpeglib.h"
+       }
+
     static bool load_image(const char * fname, TGAImageRec & tex);
     static bool load_png(const char * fname, TGAImageRec & tex);
     static bool load_jpg(const char * fname, TGAImageRec & tex);