[Stratagus-CVS] stratagus ./configure.in src/map/map_fog.c

[address@hidden]

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       04/01/16 04:44:05

Modified files:
        .              : configure.in 
        src/map        : map_fog.c 

Log message:
        Fix autoconf junk.

Patches:
Index: stratagus/configure.in
diff -u stratagus/configure.in:1.36 stratagus/configure.in:1.37
--- stratagus/configure.in:1.36 Fri Jan 16 04:26:39 2004
+++ stratagus/configure.in      Fri Jan 16 04:44:02 2004
@@ -87,12 +87,12 @@
 dnl    [  --enable-optimization          [Enable detection of optimization 
flags (default: no)]])
 dnl FIXME: todo
 
-AC_CHECK_PROGS(sdl-config)
+AC_CHECK_PROGS(SDLCONFIG, sdl-config)
 VIDEO_CFLAGS="-DUSE_SDL -DUSE_SDLA `sdl-config --cflags`"
 if test "$enable_static" != "yes"; then
-    VIDEO_LIBS="`sdl-config --libs`"
+    VIDEO_LIBS="`$SDLCONFIG --libs`"
 else
-    VIDEO_LIBS="`sdl-config --static-libs`"
+    VIDEO_LIBS="`$SDLCONFIG --static-libs`"
 fi
 if test "$WIN32" = "1"; then
     if test "`uname -a | grep -is cygwin`"; then
@@ -109,7 +109,7 @@
 AC_ARG_WITH(opengl,
     [  --with-opengl             [Use opengl (default: no)]],, 
with_opengl="no")
 if test "$with_opengl" != "no"; then
-       VIDEO_CFLAGS="$VIDEO_CFLAGS -DOPENGL"
+       VIDEO_CFLAGS="$VIDEO_CFLAGS -DUSE_OPENGL"
        case "$target" in
                *-*-cygwin* | *-*-mingw32*)
                        VIDEO_LIBS="$VIDEO_LIBS -lopengl32"
Index: stratagus/src/map/map_fog.c
diff -u stratagus/src/map/map_fog.c:1.143 stratagus/src/map/map_fog.c:1.144
--- stratagus/src/map/map_fog.c:1.143   Thu Jan 15 17:44:25 2004
+++ stratagus/src/map/map_fog.c Fri Jan 16 04:44:04 2004
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: map_fog.c,v 1.143 2004/01/15 06:44:25 jsalmon3 Exp $
+//      $Id: map_fog.c,v 1.144 2004/01/15 17:44:04 nobody_ Exp $
 
 //@{
 
@@ -524,7 +524,6 @@
 
        drect.x = x;
        drect.y = y;
-
        SDL_BlitSurface(TheMap.TileGraphic->Surface, &srect, TheScreen, &drect);
 }
 
@@ -568,10 +567,7 @@
 }
 
 /**
-**             Fast draw 100% fog of war 32x32 tile for 32 bpp video modes.
-**
-**             100% fog of war -- i.e. raster          10101.
-**                                                                             
01010 etc...
+**             Fast draw 100% fog of war Opengl.
 **
 **             @param data             pointer to tile graphic data.
 **             @param x                X position into video memory
@@ -965,7 +961,9 @@
                free(VisibleTable);
                VisibleTable = NULL;
        }
+#ifndef OPENGL
        SDL_FreeSurface(OnlyFogSurface);
+#endif
 }
 
 /**