Merge.

[lugaru.git] / Source / OpenGL_Windows.cpp

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 550552e3c361016f4d5df3da0b6038f338dfac83..7b68b8f4849445fabf0121c08fe09418e52d8574 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -19,10 +19,13 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-
+/* No need for Visual Leak Detector
 #ifdef WIN32
 #include <vld.h>
 #endif
+*/
+
+#define USE_DEVIL 0
 
 #ifndef USE_DEVIL
 #  ifdef WIN32
@@ -37,12 +40,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        #include "Game.h"
 #else
 
-    extern "C" {
-       #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);
@@ -257,9 +261,10 @@ Boolean gDone = false, gfFrontProcess = true;
 
 Game * pgame = 0;
 
-
+#ifndef WIN32
 static int _argc = 0;
 static char **_argv = NULL;
+#endif
 
 bool cmdline(const char *cmd)
 {