Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Make CXX/CXXFLAGS overridable
This makes it easier to support systemwide compiler settings.
While here, link with pthreads in a more correct way (-pthread instead
of -lpthread).
  • Loading branch information
AMDmi3 committed Aug 27, 2013
1 parent d9be2d1 commit 2c281c9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/Makefile
@@ -1,6 +1,6 @@

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

all: libosmpbf.a ../include/osmpbf/fileformat.pb.h ../include/osmpbf/osmformat.pb.h
Expand Down
7 changes: 4 additions & 3 deletions tools/Makefile
@@ -1,7 +1,8 @@

CXX = g++
CXXFLAGS = -g -I../include
LDFLAGS = -L../src -lpthread -lz -lprotobuf-lite -losmpbf
CXX ?= g++
CXXFLAGS ?= -g
CXXFLAGS += -I../include
LDFLAGS += -L../src -pthread -lz -lprotobuf-lite -losmpbf

all: osmpbf-outline

Expand Down

0 comments on commit 2c281c9

Please sign in to comment.