Win32 build fixes

diff --git a/configure.ac b/configure.ac
index e9d4b08108824cedd97077971a1a57d1ae454cc4..d30a4072c2d663e1fe9230011351fdf2d1f7d66d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ PKG_PROG_PKG_CONFIG
 GTK_DOC_CHECK(1.9)
 
 # Check for required packages
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14 gobject-2.0 gthread-2.0 gmodule-export-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14 gobject-2.0 gthread-2.0)
 PKG_CHECK_MODULES(GTK,  gtk+-2.0 >= 2.16 gtkglext-1.0)
 PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.26)
 

diff --git a/src/plugins/bmng.c b/src/plugins/bmng.c
index 7aff2a7cf9d083037c1f658735fa25d7b040424c..8404f5e9153c29d0789b3da04a520ccfe59c026a 100644 (file)
--- a/src/plugins/bmng.c
+++ b/src/plugins/bmng.c
@@ -57,8 +57,8 @@ static gboolean _load_tile_cb(gpointer _data)
                        (alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, pixels);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+       //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+       //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
        glFlush();
        gis_opengl_end(self->opengl);
 

diff --git a/src/plugins/srtm.c b/src/plugins/srtm.c
index e4460fe9d2e2e3338f6dd8f4ca7386670ce6e430..ad3eff30e930c225105ef21757d96a25c437a4a5 100644 (file)
--- a/src/plugins/srtm.c
+++ b/src/plugins/srtm.c
@@ -141,8 +141,8 @@ static guint _load_opengl(GdkPixbuf *pixbuf)
                        (alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, pixels);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+       //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+       //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
 
        g_debug("GisPluginSrtm: load_opengl %d", opengl);
        return opengl;