AuxCurl.cpp

+/*
+/ AuxCurl.cpp
+/ checking and notifying updated versions
+/
+/ version 2.1, 2018 August 1
+/
+/ Author: Sandro Furieri a.furieri@lqt.it
+/
+/ Copyright (C) 2018  Alessandro Furieri
+/
+/    This program is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    This program is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU General Public License for more details.
+/
+/    You should have received a copy of the GNU General Public License
+/    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/
+*/
+
+#include <stdlib.h>
+#include <memory.h>
+#include <string.h>
+
+#include <curl/curl.h>
+
+#include "config.h"
+
+#ifdef SPATIALITE_AMALGAMATION
+#include <spatialite/sqlite3.h>
+#else
+#include <sqlite3.h>
+#endif
+
+#include <spatialite.h>
+
+#include "AuxCurl.h"
+
+typedef struct curlMemBufferStruct
+{
+/* a struct handling a dynamically growing output buffer */
+  unsigned char *Buffer;
+  size_t WriteOffset;
+  size_t BufferSize;
+  int Error;
+} curlMemBuffer;
+typedef curlMemBuffer *curlMemBufferPtr;
+
+static void curlMemBufferInitialize(curlMemBufferPtr buf)
+{
+// initializing a dynamically growing output buffer 
+  buf->Buffer = NULL;
+  buf->WriteOffset = 0;
+  buf->BufferSize = 0;
+  buf->Error = 0;
+}
+
+static void curlMemBufferReset(curlMemBufferPtr buf)
+{
+// cleaning a dynamically growing output buffer
+  if (buf->Buffer)
+    free(buf->Buffer);
+  buf->Buffer = NULL;
+  buf->WriteOffset = 0;
+  buf->BufferSize = 0;
+  buf->Error = 0;
+}
+
+static void
+curlMemBufferAppend(curlMemBufferPtr buf, const unsigned char *payload,
+                    size_t size)
+{
+// appending into the buffer
+  size_t free_size = buf->BufferSize - buf->WriteOffset;
+  if (size > free_size)
+    {
+      // we must allocate a bigger buffer
+      size_t new_size;
+      unsigned char *new_buf;
+      if (buf->BufferSize == 0)
+        new_size = size + 1024;
+      else if (buf->BufferSize <= 4196)
+        new_size = buf->BufferSize + size + 4196;
+      else if (buf->BufferSize <= 65536)
+        new_size = buf->BufferSize + size + 65536;
+      else
+        new_size = buf->BufferSize + size + (1024 * 1024);
+      new_buf = (unsigned char *) malloc(new_size);
+      if (!new_buf)
+        {
+          buf->Error = 1;
+          return;
+        }
+      if (buf->Buffer)
+        {
+          memcpy(new_buf, buf->Buffer, buf->WriteOffset);
+          free(buf->Buffer);
+        }
+      buf->Buffer = new_buf;
+      buf->BufferSize = new_size;
+    }
+  memcpy(buf->Buffer + buf->WriteOffset, payload, size);
+  buf->WriteOffset += size;
+}
+
+static size_t
+curlStoreData(char *ptr, size_t size, size_t nmemb, void *userdata)
+{
+// updating the dynamic buffer
+  size_t total = size * nmemb;
+  curlMemBufferAppend((curlMemBufferPtr) userdata, (unsigned char *) ptr,
+                      total);
+  return total;
+}
+
+static void
+curlCheckHttpHeader(curlMemBufferPtr buf, int *http_status, char **http_code)
+{
+// checking the HTTP header 
+  unsigned char *p_in;
+  unsigned char *base_status;
+  unsigned char *base_code;
+  int size_status = 0;
+  int size_code = 0;
+  char *tmp;
+
+  *http_status = -1;
+  *http_code = NULL;
+  if (buf->Buffer == NULL)
+    return;
+  if (buf->WriteOffset < 10)
+    return;
+  if (memcmp(buf->Buffer, "HTTP/1.1 ", 9) != 0
+      && memcmp(buf->Buffer, "HTTP/1.0 ", 9) != 0)
+    return;
+
+// attempting to retrieve the HTTP status 
+  p_in = buf->Buffer + 9;
+  base_status = p_in;
+  while ((size_t) (p_in - buf->Buffer) < buf->WriteOffset)
+    {
+      if (*p_in == ' ')
+        break;
+      size_status++;
+      p_in++;
+    }
+  if (size_status <= 0)
+    return;
+  tmp = (char *) malloc(size_status + 1);
+  memcpy(tmp, base_status, size_status);
+  *(tmp + size_status) = '\0';
+  *http_status = atoi(tmp);
+  free(tmp);
+
+// attempting to retrieve the HTTP code 
+  p_in = buf->Buffer + 10 + size_status;
+  base_code = p_in;
+  while ((size_t) (p_in - buf->Buffer) < buf->WriteOffset)
+    {
+      if (*p_in == '\r')
+        break;
+      size_code++;
+      p_in++;
+    }
+  if (size_code <= 0)
+    return;
+  tmp = (char *) malloc(size_code + 1);
+  memcpy(tmp, base_code, size_code);
+  *(tmp + size_code) = '\0';
+  *http_code = tmp;
+}
+
+extern char *GetUpdateVersion()
+{
+//
+// checking if there is an updated version
+//
+  CURL *curl = NULL;
+  CURLcode res;
+  int http_status;
+  char *http_code;
+  char *text = NULL;
+  curlMemBuffer headerBuf;
+  curlMemBuffer bodyBuf;
+  char *request;
+  int windows;
+#ifdef _WIN32
+  windows = 1;
+#else
+  windows = 0;
+#endif
+  request =
+    sqlite3_mprintf
+    ("http://www.gaia-gis.it/cgi-bin/splitegui_update?windows=%d&cpu=%s&version=%s",
+     windows, spatialite_target_cpu(), VERSION);
+  curl = curl_easy_init();
+
+  if (curl)
+    {
+      /* setting the URL */
+      curl_easy_setopt(curl, CURLOPT_URL, request);
+
+      /* no progress meter please */
+      curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L);
+      /* setting the output callback function */
+      curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curlStoreData);
+
+      /* initializes the buffers */
+      curlMemBufferInitialize(&headerBuf);
+      curlMemBufferInitialize(&bodyBuf);
+      curl_easy_setopt(curl, CURLOPT_WRITEHEADER, &headerBuf);
+      curl_easy_setopt(curl, CURLOPT_WRITEDATA, &bodyBuf);
+
+      /* Perform the request, res will get the return code */
+      res = curl_easy_perform(curl);
+      /* Check for errors */
+      if (res != CURLE_OK)
+        {
+          fprintf(stderr, "CURL error: %s\n", curl_easy_strerror(res));
+          goto stop;
+        }
+
+      /* verifying the HTTP status code */
+      curlCheckHttpHeader(&headerBuf, &http_status, &http_code);
+      if (http_status != 200)
+        {
+          fprintf(stderr, "Invalid HTTP status code: %d %s\n",
+                  http_status, http_code);
+          if (http_code != NULL)
+            free(http_code);
+          goto stop;
+        }
+      if (http_code != NULL)
+        free(http_code);
+
+      curlMemBufferReset(&headerBuf);
+      text = (char *) malloc(bodyBuf.WriteOffset + 1);
+      strcpy(text, (const char *) (bodyBuf.Buffer));
+
+    stop:
+      curlMemBufferReset(&headerBuf);
+      curlMemBufferReset(&bodyBuf);
+      curl_easy_cleanup(curl);
+    }
+
+  sqlite3_free(request);
+  return text;
+}
+
+
+extern bool DoDownloadUpdatedPackage(const char *download_url,
+                                     unsigned char **data, int *data_len)
+{
+//
+// downloading the updated version package
+//
+  CURL *curl = NULL;
+  CURLcode res;
+  int http_status;
+  char *http_code;
+  curlMemBuffer headerBuf;
+  curlMemBuffer bodyBuf;
+  bool retcode = false;
+
+  *data = NULL;
+  *data_len = 0;
+  curl = curl_easy_init();
+
+  if (curl)
+    {
+      /* setting the URL */
+      curl_easy_setopt(curl, CURLOPT_URL, download_url);
+
+      /* no progress meter please */
+      curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L);
+      /* setting the output callback function */
+      curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curlStoreData);
+
+      /* initializes the buffers */
+      curlMemBufferInitialize(&headerBuf);
+      curlMemBufferInitialize(&bodyBuf);
+      curl_easy_setopt(curl, CURLOPT_WRITEHEADER, &headerBuf);
+      curl_easy_setopt(curl, CURLOPT_WRITEDATA, &bodyBuf);
+
+      /* Perform the request, res will get the return code */
+      res = curl_easy_perform(curl);
+      /* Check for errors */
+      if (res != CURLE_OK)
+        {
+          fprintf(stderr, "CURL error: %s\n", curl_easy_strerror(res));
+          goto stop;
+        }
+
+      /* verifying the HTTP status code */
+      curlCheckHttpHeader(&headerBuf, &http_status, &http_code);
+      if (http_status != 200)
+        {
+          fprintf(stderr, "Invalid HTTP status code: %d %s\n",
+                  http_status, http_code);
+          if (http_code != NULL)
+            free(http_code);
+          goto stop;
+        }
+      if (http_code != NULL)
+        free(http_code);
+
+      curlMemBufferReset(&headerBuf);
+      *data_len = bodyBuf.WriteOffset;
+      *data = (unsigned char *) malloc(*data_len);
+      memcpy(*data, (const unsigned char *) (bodyBuf.Buffer), *data_len);
+      retcode = true;
+
+    stop:
+      curlMemBufferReset(&headerBuf);
+      curlMemBufferReset(&bodyBuf);
+      curl_easy_cleanup(curl);
+    }
+
+  return retcode;
+}

AuxCurl.h

+/*
+/ AuxCurl.h
+/ checking and notifying updated versions
+/
+/ version 2.1, 2018 August 1
+/
+/ Author: Sandro Furieri a.furieri@lqt.it
+/
+/ Copyright (C) 2018  Alessandro Furieri
+/
+/    This program is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    This program is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU General Public License for more details.
+/
+/    You should have received a copy of the GNU General Public License
+/    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/
+*/
+
+extern char *GetUpdateVersion();
+extern bool DoDownloadUpdatedPackage(const char *download_url,
+                                     unsigned char **data, int *data_len);
+extern bool DoDownloadUpdatedPackage(const char *download_url,
+                                     unsigned char **data, int *data_len);

BlobExplorer.cpp

@@ -4,7 +4,7 @@
 /
 / version 1.7, 2013 May 8
 /
-/ Author: Sandro Furieri a-furieri@lqt.it
+/ Author: Sandro Furieri a.furieri@lqt.it
 /
 / Copyright (C) 2008-2013  Alessandro Furieri
 /
@@ -77,11 +77,13 @@ bool BlobExplorerDialog::Create(MyFrame * parent, int blob_size,
 
   if (BlobType == GAIA_GEOMETRY_BLOB)
     Geometry = gaiaFromSpatiaLiteBlobWkb(Blob, BlobSize);
+  else if (BlobType == GAIA_TINYPOINT_BLOB)
+    Geometry = gaiaFromSpatiaLiteBlobWkb(Blob, BlobSize);
   else if (BlobType == GAIA_GPB_BLOB)
     Geometry = gaiaFromGeoPackageGeometryBlob(Blob, BlobSize);
   else if (BlobType == GAIA_XML_BLOB)
     {
-#ifdef ENABLE_LIBXML2           /* only if LIBXML2 is enabled */
+#ifdef ENABLE_LIBXML2           // only if LIBXML2 is enabled
 
       char *xml = gaiaXmlTextFromBlob(Blob, BlobSize, -1);
       if (xml != NULL)
@@ -136,7 +138,7 @@ bool BlobExplorerDialog::Create(MyFrame * parent, int blob_size,
             }
           free(svg);
         }
-#endif /* end LIBXML2 conditionals */
+#endif // end LIBXML2 conditionals
   } else
     {
       switch (BlobType)
@@ -156,13 +158,13 @@ bool BlobExplorerDialog::Create(MyFrame * parent, int blob_size,
             raster = rl2_raster_from_tiff(Blob, BlobSize);
             break;
 
-#ifndef OMIT_WEBP               /* only if WebP is supported */
+#ifndef OMIT_WEBP               // only if WebP is supported
           case GAIA_WEBP_BLOB:
             raster = rl2_raster_from_webp(Blob, BlobSize);
             break;
-#endif /* end WebP conditional */
+#endif // end WebP conditional
 
-#ifndef	OMIT_OPENJPEG           /* only if OpenJpeg is supported */
+#ifndef	OMIT_OPENJPEG           // only if OpenJpeg is supported
           case GAIA_JP2_BLOB:
             if (rl2_get_jpeg2000_blob_type
                 (Blob, BlobSize, &sample_type, &pixel_type,
@@ -177,7 +179,7 @@ bool BlobExplorerDialog::Create(MyFrame * parent, int blob_size,
                                              pixel_type, num_bands);
               }
             break;
-#endif /* end OpenJpeg conditional */
+#endif // end OpenJpeg conditional
           default:
             // testing for an eventual Text Font
             int ret = rl2_is_valid_encoded_font(Blob, BlobSize);
@@ -255,6 +257,7 @@ bool BlobExplorerDialog::Create(MyFrame * parent, int blob_size,
                     if (*ppts < 0.0)
                       break;
                   }
+                rl2_graph_release_font(ctx);
                 rl2_graph_destroy_font(font2);
                 unsigned char *rgb = rl2_graph_get_context_rgb_array(ctx);
                 rl2_graph_destroy_context(ctx);
@@ -315,7 +318,8 @@ bool BlobExplorerDialog::Create(MyFrame * parent, int blob_size,
 // creates individual panels
   wxPanel *hexadecimal = CreateHexadecimalPage(book);
   book->AddPage(hexadecimal, wxT("Hexadecimal dump"), true);
-  if (BlobType == GAIA_GEOMETRY_BLOB || BlobType == GAIA_GPB_BLOB)
+  if (BlobType == GAIA_GEOMETRY_BLOB || BlobType == GAIA_TINYPOINT_BLOB
+      || BlobType == GAIA_GPB_BLOB)
     {
       wxPanel *geometry = CreateGeometryPage(book);
       book->AddPage(geometry, wxT("Geometry explorer"), false);
@@ -344,10 +348,10 @@ bool BlobExplorerDialog::Create(MyFrame * parent, int blob_size,
   if (BlobType == GAIA_JPEG_BLOB || BlobType == GAIA_EXIF_BLOB
       || BlobType == GAIA_EXIF_GPS_BLOB || BlobType == GAIA_PNG_BLOB
       || BlobType == GAIA_GIF_BLOB || BlobType == GAIA_TIFF_BLOB
-#ifndef OMIT_WEBP               /* only if WebP is supported */
+#ifndef OMIT_WEBP               // only if WebP is supported
       || BlobType == GAIA_WEBP_BLOB
 #endif
-#ifndef OMIT_OPENJPEG           /* only if OpenJpeg is supported */
+#ifndef OMIT_OPENJPEG           // only if OpenJpeg is supported
       || BlobType == GAIA_JP2_BLOB
 #endif
       || IsSVG == true || IsTextFont == true)
@@ -1082,7 +1086,8 @@ void BlobExplorerDialog::OnPageChanged(wxNotebookEvent & event)
         UpdateHexadecimalPage();
         break;
       case 1:
-        if (BlobType == GAIA_GEOMETRY_BLOB || BlobType == GAIA_GPB_BLOB)
+        if (BlobType == GAIA_GEOMETRY_BLOB || BlobType == GAIA_TINYPOINT_BLOB
+            || BlobType == GAIA_GPB_BLOB)
           UpdateGeometryPage();
         else if (BlobType == GAIA_XML_BLOB)
           UpdateXmlDocumentPage();
@@ -1432,23 +1437,23 @@ void BlobExplorerDialog::UpdateImagePage()
                 title = wxString::FromUTF8(dummy);
                 break;
 
-#ifndef OMIT_WEBP               /* only if WebP is supported */
+#ifndef OMIT_WEBP               // only if WebP is supported
               case GAIA_WEBP_BLOB:
                 sprintf(dummy,
                         "WEBP image     resolution: %d x %d          %d bytes",
                         Image->GetWidth(), Image->GetHeight(), BlobSize);
                 title = wxString::FromUTF8(dummy);
                 break;
-#endif /* end WebP conditional */
+#endif // end WebP conditional
 
-#ifndef OMIT_OPENJPEG           /* only if OpenJpeg is supported */
+#ifndef OMIT_OPENJPEG           // only if OpenJpeg is supported
               case GAIA_JP2_BLOB:
                 sprintf(dummy,
                         "Jpeg2000 image     resolution: %d x %d          %d bytes",
                         Image->GetWidth(), Image->GetHeight(), BlobSize);
                 title = wxString::FromUTF8(dummy);
                 break;
-#endif /* end OpenJpeg conditional */
+#endif // end OpenJpeg conditional
 
               default:
                 if (IsSVG == true)
@@ -2334,18 +2339,19 @@ wxString MyHexList::OnGetItemText(long item, long column) const
   return value;
 }
 
-TilePreviewDialog::TilePreviewDialog(MyFrame * parent, wxString & coverage,
-                                     int tile_id, int blob_size,
-                                     unsigned char *blob)
+TilePreviewDialog::TilePreviewDialog(MyFrame * parent, wxString & db_prefix,
+                                     wxString & coverage, int tile_id,
+                                     int blob_size, unsigned char *blob)
 {
 //
 // constructor; just calls Create()
 //
-  Create(parent, coverage, tile_id, blob_size, blob);
+  Create(parent, db_prefix, coverage, tile_id, blob_size, blob);
 }
 
-bool TilePreviewDialog::Create(MyFrame * parent, wxString & coverage,
-                               int tile_id, int blob_size, unsigned char *blob)
+bool TilePreviewDialog::Create(MyFrame * parent, wxString & db_prefix,
+                               wxString & coverage, int tile_id, int blob_size,
+                               unsigned char *blob)
 {
 //
 // creating the dialog
@@ -2359,6 +2365,9 @@ bool TilePreviewDialog::Create(MyFrame * parent, wxString & coverage,
   unsigned char pixel_type;
   unsigned char num_bands;
   MainFrame = parent;
+  DbPrefix = db_prefix;
+  if (DbPrefix.Len() == 0)
+    DbPrefix = wxT("MAIN");
   CoverageTable = coverage;
   TileId = tile_id;
   if (wxDialog::Create(parent, wxID_ANY, wxT("Raster Tile Preview")) == false)
@@ -2385,13 +2394,13 @@ bool TilePreviewDialog::Create(MyFrame * parent, wxString & coverage,
         raster = rl2_raster_from_tiff(blob, blob_size);
         break;
 
-#ifndef OMIT_WEBP               /* only if WebP is supported */
+#ifndef OMIT_WEBP               // only if WebP is supported
       case GAIA_WEBP_BLOB:
         raster = rl2_raster_from_webp(blob, blob_size);
         break;
-#endif /* end WebP conditional */
+#endif // end WebP conditional
 
-#ifndef OMIT_OPENJPEG           /* only if OpenJpeg is supported */
+#ifndef OMIT_OPENJPEG           // only if OpenJpeg is supported
       case GAIA_JP2_BLOB:
         if (rl2_get_jpeg2000_blob_type
             (blob, blob_size, &sample_type, &pixel_type, &num_bands) == RL2_OK)
@@ -2405,7 +2414,7 @@ bool TilePreviewDialog::Create(MyFrame * parent, wxString & coverage,
                                          pixel_type, num_bands);
           }
         break;
-#endif /* end OpenJpeg conditional */
+#endif // end OpenJpeg conditional
     };
   if (raster)
     {
@@ -2474,7 +2483,9 @@ void TilePreviewDialog::CreateControls()
 // Coverage and TileId
   wxBoxSizer *hdrSizer = new wxBoxSizer(wxHORIZONTAL);
   boxSizer->Add(hdrSizer, 0, wxALIGN_CENTER_HORIZONTAL | wxALL, 0);
-  wxString hdr = wxT("Coverage: ") + CoverageTable;
+  wxString cvg = CoverageTable;
+  CoverageTable.EndsWith(wxT("_tile_data"), &cvg);
+  wxString hdr = wxT("Coverage: ") + DbPrefix + wxT(".") + cvg;
   hdr += wxT(" - TileID=");
   char dummy[1024];
   sprintf(dummy, "%d", TileId);

Makefile-static-MacOsX

-# SandroFurieri (c) 2008
-# Makefile ( wxwidgets MacOsX) for spatialite-GUI
-
-SRC = Main.cpp TableTree.cpp QueryView.cpp ResultSetView.cpp BlobExplorer.cpp \
-	Dialogs.cpp Shapefiles.cpp Network.cpp Exif.cpp TextCsv.cpp \
-	Objects.cpp QueryViewComposer.cpp MalformedGeoms.cpp DialogsGraph.cpp
-OBJ = Main.o TableTree.o QueryView.o ResultSetView.o BlobExplorer.o Dialogs.o \
-	Shapefiles.o Network.o Exif.o TextCsv.o Objects.o QueryViewComposer.o \
-	MalformedGeoms.o DialogsGraph.o
-EXE = ./static_bin/spatialite_gui
-INCLUDE = Classdef.h 
-
-# Define default flags:
-CXXFLAGS = $(shell wx-config --cxxflags) -DSPATIALITE_AMALGAMATION
-LIB = $(shell wx-config --libs)
-EXTRAFLAGS = -Wall -Wextra -Wno-ctor-dtor-privacy \
-	-fno-strict-aliasing -I/usr/local/include -D_LARGE_FILE=1 \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1
-EXTRALIBS = /usr/local/lib/libspatialite.a /opt/local/lib/libgeos_c.a \
-	/opt/local/lib/libgeos.a /opt/local/lib/libproj.a  \
-	/opt/local/lib/libgeotiff.a \
-	/opt/local/lib/libsqlite3.a /opt/local/lib/libcairo.a \
-	/opt/local/lib/libpixman-1.a /opt/local/lib/libfontconfig.a \
-	/opt/local/lib/libfreetype.a /opt/local/lib/libexpat.a \
-	/opt/local/lib/libtiff.a /opt/local/lib/libpng.a \
-	/opt/local/lib/libz.a /opt/local/lib/libjpeg.a \
-	/usr/local/lib/libfreexl.a \
-	/opt/local/lib/libcharset.a /opt/local/lib/libiconv.a
-
-
-all: $(EXE)
-
-$(EXE): $(OBJ) $(EXTRALIBS)
-	$(CXX) $(OBJ) -o $(EXE) $(LIB) $(EXTRALIBS) $(EXTRALIB2)
-	strip $(EXE)
-
-clean :
-	$(RM) $(OBJ) $(EXE)
-	
-Main.o: Main.cpp $(INCLUDE)
-	$(CXX) -c Main.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
-TableTree.o: TableTree.cpp $(INCLUDE)
-	$(CXX) -c TableTree.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
-QueryView.o: QueryView.cpp $(INCLUDE)
-	$(CXX) -c QueryView.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
-ResultSetView.o: ResultSetView.cpp $(INCLUDE)
-	$(CXX) -c ResultSetView.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
-BlobExplorer.o: BlobExplorer.cpp $(INCLUDE)
-	$(CXX) -c BlobExplorer.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
-Dialogs.o: Dialogs.cpp $(INCLUDE)
-	$(CXX) -c Dialogs.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
-DialogsGraph.o: DialogsGraph.cpp $(INCLUDE)
-	$(CXX) -c DialogsGraph.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
-Shapefiles.o: Shapefiles.cpp $(INCLUDE)
-	$(CXX) -c Shapefiles.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
-Network.o: Network.cpp $(INCLUDE)
-	$(CXX) -c Network.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
-Exif.o: Exif.cpp $(INCLUDE)
-	$(CXX) -c Exif.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
-TextCsv.o: TextCsv.cpp $(INCLUDE)
-	$(CXX) -c TextCsv.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
-Objects.o: Objects.cpp $(INCLUDE)
-	$(CXX) -c Objects.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
-QueryViewComposer.o: QueryViewComposer.cpp $(INCLUDE)
-	$(CXX) -c QueryViewComposer.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
-MalformedGeoms.o: MalformedGeoms.cpp $(INCLUDE)
-	$(CXX) -c MalformedGeoms.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-								

Makefile-static-MinGW → Makefile-static-mingw32

@@ -2,49 +2,59 @@
 # Makefile ( Mingw & wxwidgets) for spatialite-GUI
 
 SRC = Main.cpp TableTree.cpp QueryView.cpp ResultSetView.cpp BlobExplorer.cpp \
-	Dialogs.cpp Shapefiles.cpp Network.cpp Exif.cpp TextCsv.cpp \
+	Dialogs.cpp Shapefiles.cpp Exif.cpp TextCsv.cpp Postgres.cpp \
 	Objects.cpp QueryViewComposer.cpp MalformedGeoms.cpp DialogsGraph.cpp \
 	Raster.cpp Styles.cpp RasterSymbolizers.cpp VectorSymbolizers1.cpp \
-	VectorSymbolizers2.cpp Wfs.cpp win_resource/resource.rc
+	VectorSymbolizers2.cpp Wfs.cpp SqlFilterComposer.cpp AuxCurl.cpp \
+	WmsDialog.cpp LayerTree.cpp MapPanel.cpp MapView.cpp \
+	QuickStylesVector.cpp QuickStylesTopology.cpp QuickStylesRaster.cpp \
+	HtmlHelp.cpp \
+	win_resource/resource.rc
 OBJ = Main.o TableTree.o QueryView.o ResultSetView.o BlobExplorer.o \
-	Dialogs.o Shapefiles.o Network.o Exif.o TextCsv.o Objects.o \
-	QueryViewComposer.o MalformedGeoms.o DialogsGraph.o \
+	Dialogs.o Shapefiles.o Exif.o TextCsv.o Objects.o Postgres.o \
+	QueryViewComposer.o MalformedGeoms.o DialogsGraph.o AuxCurl.o \
 	Raster.o Styles.o RasterSymbolizers.o VectorSymbolizers1.o \
-	VectorSymbolizers2.o Wfs.o win_resource/resource.o 
+	VectorSymbolizers2.o Wfs.o SqlFiltersComposer.o HtmlHelp.o \
+	WmsDialog.o LayerTree.o MapPanel.o MapView.o QuickStylesVector.o \
+	QuickStylesTopology.o QuickStylesRaster.o \
+	win_resource/resource.o 
 EXE = ./static_bin/spatialite_gui.exe
 INCLUDE = Classdef.h 
 
 # Define default flags:
-CXXFLAGS = $(shell wx-config --cxxflags)
-LIB = -Wl,--subsystem,windows /usr/local/lib/libwx_mswu-3.0.a \
+CXXFLAGS = $(shell /mingw32/local/bin/wx-config --cxxflags)
+LIB = -Wl,--subsystem,windows /mingw32/local/lib/libwx_mswu-3.0.a \
 	-lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 \
 	-lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32
 EXTRAFLAGS = -Wall -Wextra -Wno-ctor-dtor-privacy \
-	-fno-strict-aliasing -I/usr/local/include -D_LARGE_FILE=1 \
+	-fno-strict-aliasing -I/mingw32/local/include -D_LARGE_FILE=1 \
 	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1
-REZ = $(shell wx-config --rescomp)
-EXTRALIBS = /usr/local/lib/librasterlite2.a /usr/local/lib/libspatialite.a \
-	/usr/local/lib/libxml2.a /usr/local/lib/liblwgeom.a \
-	/usr/local/lib/libgeos_c.a /usr/local/lib/libiconv.a \
-	/usr/local/lib/libgeos.a /usr/local/lib/libproj.a \
-	/usr/local/lib/libcairo.a /usr/local/lib/libpixman-1.a \
-	/usr/local/lib/libfreexl.a /usr/local/lib/libfontconfig.a \
-	/usr/local/lib/libfreetype.a /usr/local/lib/libexpat.a \
-	/usr/local/lib/libgeotiff.a /usr/local/lib/libtiff.a \
-	/usr/local/lib/libpng.a /usr/local/lib/libjpeg.a \
-	/usr/local/lib/libsqlite3.a /usr/local/lib/libcurl.a \
-	/usr/local/lib/libwebp.a /usr/local/lib/libgif.a \
-	/usr/local/lib/libssl.a /usr/local/lib/libcrypto.a \
-	/usr/local/lib/libz.a /usr/local/lib/liblzma.a \
-	/usr/local/lib/libCharLS.a /usr/local/lib/libopenjp2.a
-EXTRALIB2 = -lmsimg32 -lws2_32 -lwldap32
+EXTRALIBS = /mingw32/local/lib/librasterlite2.a /mingw32/local/lib/libspatialite.a \
+	/mingw32/local/lib/libxml2.a /mingw32/local/lib/librttopo.a \
+	/mingw32/local/lib/libgeos_c.a /mingw32/local/lib/libiconv.a \
+	/mingw32/local/lib/libgeos.a /mingw32/local/lib/libproj.a \
+	/mingw32/local/lib/libcairo.a /mingw32/local/lib/libpixman-1.a \
+	/mingw32/local/lib/libfreexl.a /mingw32/local/lib/libfontconfig.a \
+	/mingw32/local/lib/libfreetype.a /mingw32/local/lib/libexpat.a \
+	/mingw32/local/lib/libgeotiff.a /mingw32/local/lib/libtiff.a \
+	/mingw32/local/lib/libpng.a /mingw32/local/lib/libjpeg.a \
+	/mingw32/local/lib/libsqlite3.a /mingw32/local/lib/libcurl.a \
+	/mingw32/local/lib/libwebp.a /mingw32/local/lib/libgif.a \
+	/mingw32/local/lib/libssl.a /mingw32/local/lib/libcrypto.a \
+	/mingw32/local/lib/libz.a /mingw32/local/lib/liblzma.a \
+	/mingw32/local/lib/libCharLS.a /mingw32/local/lib/libopenjp2.a \
+	/mingw32/local/lib/libvirtualpg.a
+EXTRALIB2 = -lgdi32 -lmsimg32 -lws2_32 -lwldap32
+
+CXX = g++ -static
+REZ = $(shell /mingw32/local/bin/wx-config --rescomp)
 
 
 all: $(EXE)
 
 $(EXE): $(OBJ) $(EXTRALIBS)
-	$(CXX) $(OBJ) -o $(EXE) $(EXTRALIBS) $(EXTRALIB2) $(LIB) \
-	-static-libstdc++ -static-libgcc
+	$(CXX) $(OBJ) -o $(EXE) $(LIB) $(EXTRALIBS) $(EXTRALIB2) \
+	-static-libstdc++ -static-libgcc -static
 	strip --strip-all  $(EXE)
 
 clean :
@@ -89,9 +99,6 @@ DialogsGraph.o: DialogsGraph.cpp $(INCLUDE)
 Shapefiles.o: Shapefiles.cpp $(INCLUDE)
 	$(CXX) -c Shapefiles.cpp $(CXXFLAGS) $(EXTRAFLAGS)
 
-Network.o: Network.cpp $(INCLUDE)
-	$(CXX) -c Network.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
 Exif.o: Exif.cpp $(INCLUDE)
 	$(CXX) -c Exif.cpp $(CXXFLAGS) $(EXTRAFLAGS)
 
@@ -107,5 +114,33 @@ QueryViewComposer.o: QueryViewComposer.cpp $(INCLUDE)
 MalformedGeoms.o: MalformedGeoms.cpp $(INCLUDE)
 	$(CXX) -c MalformedGeoms.cpp $(CXXFLAGS) $(EXTRAFLAGS)
 
+WmsDialog.o: WmsDialog.cpp $(INCLUDE)
+	$(CXX) -c WmsDialog.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+LayerTree.o: LayerTree.cpp $(INCLUDE)
+	$(CXX) -c TableTree.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+MapPanel.o: MapPanel.cpp $(INCLUDE)
+	$(CXX) -c MapPanel.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+MapView.o: MapView.cpp $(INCLUDE)
+	$(CXX) -c MapView.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+QuickStylesVector.o: QuickStylesVector.cpp $(INCLUDE)
+	$(CXX) -c QuickStylesVector.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+	
+QuickStylesTopology.o: QuickStylesTopology.cpp $(INCLUDE)
+	$(CXX) -c QuickStylesTopology.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+	
+QuickStylesRaster.o: QuickStylesRaster.cpp $(INCLUDE)
+	$(CXX) -c QuickStylesRaster.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+Postgres.o: Postgres.cpp $(INCLUDE)
+	$(CXX) -c Postgres.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+HtmlHelp.o: HtmlHelp.cpp $(INCLUDE)
+	$(CXX) -c HtmlHelp.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
 win_resource/resource.o: win_resource/resource.rc
-	$(REZ) -i win_resource/resource.rc -o win_resource/resource.o 
+	echo $(CXXFLAGS)
+	$(REZ) $(CXXFLAGS) -i win_resource/resource.rc -o win_resource/resource.o 

Makefile-static-Linux → Makefile-static-mingw64

 # SandroFurieri (c) 2008
-# Makefile ( wxwidgets GTK) for spatialite-GUI
+# Makefile ( Mingw & wxwidgets) for spatialite-GUI
 
 SRC = Main.cpp TableTree.cpp QueryView.cpp ResultSetView.cpp BlobExplorer.cpp \
-	Dialogs.cpp Shapefiles.cpp Network.cpp Exif.cpp TextCsv.cpp \
-	Objects.cpp QueryViewComposer.cpp MalformedGeoms.cpp DialogsGraph.cpp
-OBJ = Main.o TableTree.o QueryView.o ResultSetView.o BlobExplorer.o Dialogs.o \
-	Shapefiles.o Network.o Exif.o TextCsv.o Objects.o QueryViewComposer.o \
-	MalformedGeoms.o DialogsGraph.o
-EXE = ./static_bin/spatialite_gui
+	Dialogs.cpp Shapefiles.cpp Exif.cpp TextCsv.cpp Postgres.cpp \
+	Objects.cpp QueryViewComposer.cpp MalformedGeoms.cpp DialogsGraph.cpp \
+	Raster.cpp Styles.cpp RasterSymbolizers.cpp VectorSymbolizers1.cpp \
+	VectorSymbolizers2.cpp Wfs.cpp SqlFilterComposer.cpp AuxCurl.cpp \
+	WmsDialog.cpp LayerTree.cpp MapPanel.cpp MapView.cpp \
+	QuickStylesVector.cpp QuickStylesTopology.cpp QuickStylesRaster.cpp \
+	HtmlHelp.cpp \
+	win_resource/resource.rc
+OBJ = Main.o TableTree.o QueryView.o ResultSetView.o BlobExplorer.o \
+	Dialogs.o Shapefiles.o Exif.o TextCsv.o Objects.o Postgres.o \
+	QueryViewComposer.o MalformedGeoms.o DialogsGraph.o AuxCurl.o \
+	Raster.o Styles.o RasterSymbolizers.o VectorSymbolizers1.o \
+	VectorSymbolizers2.o Wfs.o SqlFiltersComposer.o HtmlHelp.o \
+	WmsDialog.o LayerTree.o MapPanel.o MapView.o QuickStylesVector.o \
+	QuickStylesTopology.o QuickStylesRaster.o \
+	win_resource/resource.o 
+EXE = ./static_bin/spatialite_gui.exe
 INCLUDE = Classdef.h 
 
 # Define default flags:
-CXXFLAGS = $(shell wx-config --cxxflags) -DSPATIALITE_AMALGAMATION
-LIB = $(shell wx-config --libs)
+CXXFLAGS = $(shell /mingw64/local/bin/wx-config --cxxflags)
+LIB = -Wl,--subsystem,windows /mingw64/local/lib/libwx_mswu-3.0.a \
+	-lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 \
+	-lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32
 EXTRAFLAGS = -Wall -Wextra -Wno-ctor-dtor-privacy \
-	-fno-strict-aliasing -I/usr/local/include -D_LARGE_FILE=1 \
+	-fno-strict-aliasing -I/mingw64/local/include -D_LARGE_FILE=1 \
 	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1
-EXTRALIBS = /usr/local/lib/libspatialite.a \
-	/usr/local/lib/libgeos_c.a /usr/local/lib/libgeos.a \
-	/usr/local/lib/libproj4.a \
-	/usr/local/lib/libfreexl.a \
-	/usr/local/lib/libgeotiff.a \
-	/usr/local/lib/libpng.a /usr/local/lib/libz.a \
-	/usr/local/lib/libjpeg.a /usr/local/lib/libtiff.a
+EXTRALIBS = /mingw64/local/lib/librasterlite2.a /mingw64/local/lib/libspatialite.a \
+	/mingw64/local/lib/libxml2.a /mingw64/local/lib/librttopo.a \
+	/mingw64/local/lib/libgeos_c.a /mingw64/local/lib/libiconv.a \
+	/mingw64/local/lib/libgeos.a /mingw64/local/lib/libproj.a \
+	/mingw64/local/lib/libcairo.a /mingw64/local/lib/libpixman-1.a \
+	/mingw64/local/lib/libfreexl.a /mingw64/local/lib/libfontconfig.a \
+	/mingw64/local/lib/libfreetype.a /mingw64/local/lib/libexpat.a \
+	/mingw64/local/lib/libgeotiff.a /mingw64/local/lib/libtiff.a \
+	/mingw64/local/lib/libpng.a /mingw64/local/lib/libjpeg.a \
+	/mingw64/local/lib/libsqlite3.a /mingw64/local/lib/libcurl.a \
+	/mingw64/local/lib/libwebp.a /mingw64/local/lib/libgif.a \
+	/mingw64/local/lib/libssl.a /mingw64/local/lib/libcrypto.a \
+	/mingw64/local/lib/libz.a /mingw64/local/lib/liblzma.a \
+	/mingw64/local/lib/libCharLS.a /mingw64/local/lib/libopenjp2.a \
+	/mingw64/local/lib/libvirtualpg.a
+EXTRALIB2 = -lgdi32 -lmsimg32 -lws2_32 -lwldap32
+
+CXX = g++ -static
+REZ = $(shell /mingw64/local/bin/wx-config --rescomp)
+
 
 all: $(EXE)
 
 $(EXE): $(OBJ) $(EXTRALIBS)
-	$(CXX) $(OBJ) -o $(EXE) $(LIB) $(EXTRALIBS)
+	$(CXX) $(OBJ) -o $(EXE) $(LIB) $(EXTRALIBS) $(EXTRALIB2) \
+	-static-libstdc++ -static-libgcc -static
 	strip --strip-all  $(EXE)
 
 clean :
@@ -51,15 +78,27 @@ BlobExplorer.o: BlobExplorer.cpp $(INCLUDE)
 Dialogs.o: Dialogs.cpp $(INCLUDE)
 	$(CXX) -c Dialogs.cpp $(CXXFLAGS) $(EXTRAFLAGS)
 
+Raster.o: Raster.cpp $(INCLUDE)
+	$(CXX) -c Raster.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+Styles.o: Styles.cpp $(INCLUDE)
+	$(CXX) -c Styles.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+RasterSymbolizers.o: RasterSymbolizers.cpp $(INCLUDE)
+	$(CXX) -c RasterSymbolizers.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+VectorSymbolizers1.o: VectorSymbolizers1.cpp $(INCLUDE)
+	$(CXX) -c VectorSymbolizers1.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+VectorSymbolizers2.o: VectorSymbolizers2.cpp $(INCLUDE)
+	$(CXX) -c VectorSymbolizers2.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
 DialogsGraph.o: DialogsGraph.cpp $(INCLUDE)
 	$(CXX) -c DialogsGraph.cpp $(CXXFLAGS) $(EXTRAFLAGS)
 
 Shapefiles.o: Shapefiles.cpp $(INCLUDE)
 	$(CXX) -c Shapefiles.cpp $(CXXFLAGS) $(EXTRAFLAGS)
 
-Network.o: Network.cpp $(INCLUDE)
-	$(CXX) -c Network.cpp $(CXXFLAGS) $(EXTRAFLAGS)
-
 Exif.o: Exif.cpp $(INCLUDE)
 	$(CXX) -c Exif.cpp $(CXXFLAGS) $(EXTRAFLAGS)
 
@@ -75,3 +114,33 @@ QueryViewComposer.o: QueryViewComposer.cpp $(INCLUDE)
 MalformedGeoms.o: MalformedGeoms.cpp $(INCLUDE)
 	$(CXX) -c MalformedGeoms.cpp $(CXXFLAGS) $(EXTRAFLAGS)
 
+WmsDialog.o: WmsDialog.cpp $(INCLUDE)
+	$(CXX) -c WmsDialog.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+LayerTree.o: LayerTree.cpp $(INCLUDE)
+	$(CXX) -c TableTree.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+MapPanel.o: MapPanel.cpp $(INCLUDE)
+	$(CXX) -c MapPanel.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+MapView.o: MapView.cpp $(INCLUDE)
+	$(CXX) -c MapView.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+QuickStylesVector.o: QuickStylesVector.cpp $(INCLUDE)
+	$(CXX) -c QuickStylesVector.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+	
+QuickStylesTopology.o: QuickStylesTopology.cpp $(INCLUDE)
+	$(CXX) -c QuickStylesTopology.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+	
+QuickStylesRaster.o: QuickStylesRaster.cpp $(INCLUDE)
+	$(CXX) -c QuickStylesRaster.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+Postgres.o: Postgres.cpp $(INCLUDE)
+	$(CXX) -c Postgres.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+HtmlHelp.o: HtmlHelp.cpp $(INCLUDE)
+	$(CXX) -c HtmlHelp.cpp $(CXXFLAGS) $(EXTRAFLAGS)
+
+win_resource/resource.o: win_resource/resource.rc
+	echo $(CXXFLAGS)
+	$(REZ) $(CXXFLAGS) -i win_resource/resource.rc -o win_resource/resource.o 

Makefile.am

@@ -2,24 +2,33 @@ ACLOCAL_AMFLAGS = -I m4
 
 bin_PROGRAMS = spatialite_gui
 
-AM_CPPFLAGS = @CFLAGS@
+AM_CPPFLAGS = @CFLAGS@ @CPPFLAGS@ \
+	@PG_CFLAGS@ @LIBCURL_CFLAGS@
+	
 AM_CPPFLAGS += -I$(top_srcdir)
 
 spatialite_gui_SOURCES = Classdef.h BlobExplorer.cpp \
-	Dialogs.cpp DialogsGraph.cpp Exif.cpp \
-	Main.cpp MalformedGeoms.cpp Network.cpp \
+	Dialogs.cpp DialogsGraph.cpp WmsDialog.cpp Exif.cpp \
+	Main.cpp MalformedGeoms.cpp \
 	Objects.cpp QueryView.cpp QueryViewComposer.cpp \
 	ResultSetView.cpp Shapefiles.cpp TableTree.cpp \
 	TextCsv.cpp Wfs.cpp Raster.cpp Styles.cpp \
 	RasterSymbolizers.cpp VectorSymbolizers1.cpp \
-	VectorSymbolizers2.cpp
+	VectorSymbolizers2.cpp SqlFiltersComposer.cpp \
+	MapPanel.cpp MapView.cpp LayerTree.cpp \
+	QuickStylesVector.cpp QuickStylesTopology.cpp \
+	QuickStylesRaster.cpp HtmlHelp.cpp Postgres.cpp \
+	AuxCurl.h AuxCurl.cpp
 
 LDADD = @WX_LIBS@ @LIBSPATIALITE_LIBS@ \
-	@LIBRASTERLITE2_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ -lgeos_c
-
-EXTRA_DIST = Makefile-static-MinGW \
-        Makefile-static-Linux \
-        Makefile-static-MacOsX \
+	@LIBRASTERLITE2_LIBS@ @LIBFREEXL_LIBS@ \
+	@LIBVIRTUALPG_LIBS@ @LIBXML2_LIBS@ \
+	@LIBCURL_LIBS@ @PG_LDFLAGS@ @PG_LIB@ -lgeos_c
+
+EXTRA_DIST = Makefile-static-mingw32 \
+	Makefile-static-mingw64 \
+    helpgen/helpgen.c \
+    helpgen/READ_ME.txt \
     indent_me
 
 AUTOMAKE_OPTIONS = dist-zip foreign

Makefile.in

-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -108,13 +108,18 @@ CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_spatialite_gui_OBJECTS = BlobExplorer.$(OBJEXT) Dialogs.$(OBJEXT) \
-	DialogsGraph.$(OBJEXT) Exif.$(OBJEXT) Main.$(OBJEXT) \
-	MalformedGeoms.$(OBJEXT) Network.$(OBJEXT) Objects.$(OBJEXT) \
+	DialogsGraph.$(OBJEXT) WmsDialog.$(OBJEXT) Exif.$(OBJEXT) \
+	Main.$(OBJEXT) MalformedGeoms.$(OBJEXT) Objects.$(OBJEXT) \
 	QueryView.$(OBJEXT) QueryViewComposer.$(OBJEXT) \
 	ResultSetView.$(OBJEXT) Shapefiles.$(OBJEXT) \
 	TableTree.$(OBJEXT) TextCsv.$(OBJEXT) Wfs.$(OBJEXT) \
 	Raster.$(OBJEXT) Styles.$(OBJEXT) RasterSymbolizers.$(OBJEXT) \
-	VectorSymbolizers1.$(OBJEXT) VectorSymbolizers2.$(OBJEXT)
+	VectorSymbolizers1.$(OBJEXT) VectorSymbolizers2.$(OBJEXT) \
+	SqlFiltersComposer.$(OBJEXT) MapPanel.$(OBJEXT) \
+	MapView.$(OBJEXT) LayerTree.$(OBJEXT) \
+	QuickStylesVector.$(OBJEXT) QuickStylesTopology.$(OBJEXT) \
+	QuickStylesRaster.$(OBJEXT) HtmlHelp.$(OBJEXT) \
+	Postgres.$(OBJEXT) AuxCurl.$(OBJEXT)
 spatialite_gui_OBJECTS = $(am_spatialite_gui_OBJECTS)
 spatialite_gui_LDADD = $(LDADD)
 spatialite_gui_DEPENDENCIES =
@@ -305,6 +310,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
+LIBCURL_LIBS = @LIBCURL_LIBS@
 LIBFREEXL_CFLAGS = @LIBFREEXL_CFLAGS@
 LIBFREEXL_LIBS = @LIBFREEXL_LIBS@
 LIBLZMA_CFLAGS = @LIBLZMA_CFLAGS@
@@ -316,6 +323,8 @@ LIBS = @LIBS@
 LIBSPATIALITE_CFLAGS = @LIBSPATIALITE_CFLAGS@
 LIBSPATIALITE_LIBS = @LIBSPATIALITE_LIBS@
 LIBTOOL = @LIBTOOL@
+LIBVIRTUALPG_CFLAGS = @LIBVIRTUALPG_CFLAGS@
+LIBVIRTUALPG_LIBS = @LIBVIRTUALPG_LIBS@
 LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@
 LIBWEBP_LIBS = @LIBWEBP_LIBS@
 LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
@@ -342,6 +351,10 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PGCONFIG = @PGCONFIG@
+PG_CFLAGS = @PG_CFLAGS@
+PG_LDFLAGS = @PG_LDFLAGS@
+PG_LIB = @PG_LIB@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -407,22 +420,30 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
-AM_CPPFLAGS = @CFLAGS@ -I$(top_srcdir)
+AM_CPPFLAGS = @CFLAGS@ @CPPFLAGS@ @PG_CFLAGS@ @LIBCURL_CFLAGS@ \
+	-I$(top_srcdir)
 spatialite_gui_SOURCES = Classdef.h BlobExplorer.cpp \
-	Dialogs.cpp DialogsGraph.cpp Exif.cpp \
-	Main.cpp MalformedGeoms.cpp Network.cpp \
+	Dialogs.cpp DialogsGraph.cpp WmsDialog.cpp Exif.cpp \
+	Main.cpp MalformedGeoms.cpp \
 	Objects.cpp QueryView.cpp QueryViewComposer.cpp \
 	ResultSetView.cpp Shapefiles.cpp TableTree.cpp \
 	TextCsv.cpp Wfs.cpp Raster.cpp Styles.cpp \
 	RasterSymbolizers.cpp VectorSymbolizers1.cpp \
-	VectorSymbolizers2.cpp
+	VectorSymbolizers2.cpp SqlFiltersComposer.cpp \
+	MapPanel.cpp MapView.cpp LayerTree.cpp \
+	QuickStylesVector.cpp QuickStylesTopology.cpp \
+	QuickStylesRaster.cpp HtmlHelp.cpp Postgres.cpp \
+	AuxCurl.h AuxCurl.cpp
 
 LDADD = @WX_LIBS@ @LIBSPATIALITE_LIBS@ \
-	@LIBRASTERLITE2_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ -lgeos_c
-
-EXTRA_DIST = Makefile-static-MinGW \
-        Makefile-static-Linux \
-        Makefile-static-MacOsX \
+	@LIBRASTERLITE2_LIBS@ @LIBFREEXL_LIBS@ \
+	@LIBVIRTUALPG_LIBS@ @LIBXML2_LIBS@ \
+	@LIBCURL_LIBS@ @PG_LDFLAGS@ @PG_LIB@ -lgeos_c
+
+EXTRA_DIST = Makefile-static-mingw32 \
+	Makefile-static-mingw64 \
+    helpgen/helpgen.c \
+    helpgen/READ_ME.txt \
     indent_me
 
 AUTOMAKE_OPTIONS = dist-zip foreign
@@ -540,26 +561,36 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuxCurl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BlobExplorer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Dialogs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DialogsGraph.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exif.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HtmlHelp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LayerTree.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MalformedGeoms.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Network.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MapPanel.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MapView.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Objects.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Postgres.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QueryView.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QueryViewComposer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuickStylesRaster.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuickStylesTopology.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuickStylesVector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Raster.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RasterSymbolizers.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ResultSetView.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Shapefiles.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SqlFiltersComposer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Styles.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TableTree.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextCsv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VectorSymbolizers1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VectorSymbolizers2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Wfs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WmsDialog.Po@am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -762,7 +793,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -788,7 +819,7 @@ dist-shar: distdir
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 dist-zip: distdir
 	-rm -f $(distdir).zip
@@ -805,7 +836,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -815,7 +846,7 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac