Add some changes from Edgemaster for MinGW support, see osm2pgsql-dev…

…#926 git-svn-id: http://svn.openstreetmap.org/applications/utils/export/osm2pgsql@7976 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
paulbalomiri · May 28, 2008 · 471fd4c · 471fd4c
1 parent 08a441a
commit 471fd4c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 PACKAGE:=osm2pgsql
-VERSION:=0.53
+VERSION:=0.54
 SVN:=$(shell date +%Y%m%d)
 
 CC = gcc
@@ -20,7 +20,7 @@ CXXFLAGS += $(shell geos-config --cflags)
 LDFLAGS += $(shell xml2-config --libs) 
 LDFLAGS += $(shell geos-config --libs)
 LDFLAGS += -L$(shell pg_config --libdir) -lpq
-LDFLAGS += -lbz2
+LDFLAGS += -lbz2 -lz
 LDFLAGS += -g -lproj
 LDFLAGS += -lstdc++
 LDFLAGS += -lpthread

diff --git a/build_geometry.cpp b/build_geometry.cpp
@@ -23,7 +23,7 @@
 #include <iostream>
 #include <cstring>
 
-#include <geos_c.h>
+#include <geos.h>
 
 #if (GEOS_VERSION_MAJOR==3)
 /* geos trunk (3.0.0rc) */

diff --git a/sprompt.c b/sprompt.c
@@ -52,7 +52,6 @@
  * Returns a malloc()'ed string with the input (w/o trailing newline).
  */
 
-#define HAVE_TERMIOS_H
 #define DEVTTY "/dev/tty"
 
 #include <stdio.h>
@@ -63,9 +62,11 @@
 
 #include <libpq-fe.h>
 
-
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
+#ifdef __MINGW_H
+# include <windows.h>
+#else
+# define HAVE_TERMIOS_H
+# include <termios.h>
 #endif
 
 extern char *simple_prompt(const char *prompt, int maxlen, int echo);