merged

2013-09-02 11:51:59 -05:00 · 2013-09-02 11:51:59 -05:00 · 538425c954
parent 1bcf58a6e1 2cd0806c92
commit 538425c954
2 changed files with 4 additions and 4 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,7 @@

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

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