Merge 2cd0806c92 into d9be2d1024

2013-08-30 08:43:19 -07:00 · 2013-08-30 08:43:19 -07:00 · 94f53a71ca
parent d9be2d1024 2cd0806c92
commit 94f53a71ca
2 changed files with 4 additions and 5 deletions
--- a/include/osmpbf/osmpbf.h
+++ b/include/osmpbf/osmpbf.h
@ -7,10 +7,9 @@
 // this describes the high-level OSM objects
 #include <osmpbf/osmformat.pb.h>

-namespace OSMPBF {
+#define OSMPBF_VERSION "1.3.0"

-    // library version
-    const char *version = "1.3.0";
+namespace OSMPBF {

    // the maximum size of a blob header in bytes
    const int max_blob_header_size = 64 * 1024; // 64 kB
--- a/src/Makefile
+++ b/src/Makefile
@ -1,6 +1,6 @@

-CXX = g++
-CXXFLAGS = -O3
+CXXFLAGS += -O3 -fPIC
+
 AR = ar

 all: libosmpbf.a ../include/osmpbf/fileformat.pb.h ../include/osmpbf/osmformat.pb.h