diff options
author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-01-10 23:11:30 +0000 |
---|---|---|
committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-01-10 23:11:30 +0000 |
commit | f4f969a659645ac0ad184f1959f9213e0ae8be53 (patch) | |
tree | 2c870292829a5c1f3e77e9bb0f256b74295456db /packages/roadmap/files/options.mk.patch | |
parent | e83cd15cbbe73ab0dd97f3e07056d6e0fc03be59 (diff) | |
parent | 7e8411a730dbfa42b70ac583e14f64bd0465f2a3 (diff) |
merge of '503b3ade200ad628a4b30fab228c365b8c0cf2ea'
and '9910934c4f018cde20787ccaa558640752542098'
Diffstat (limited to 'packages/roadmap/files/options.mk.patch')
-rw-r--r-- | packages/roadmap/files/options.mk.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/packages/roadmap/files/options.mk.patch b/packages/roadmap/files/options.mk.patch new file mode 100644 index 0000000000..196f16e31d --- /dev/null +++ b/packages/roadmap/files/options.mk.patch @@ -0,0 +1,34 @@ +--- roadmap-1.1.0/src/options.mk.old 2008-01-09 22:08:00.000000000 -0600 ++++ roadmap-1.1.0/src/options.mk 2008-01-09 23:06:29.000000000 -0600 +@@ -177,10 +177,7 @@ ifeq ($(strip $(AGG)),NO) + else + LIBS += -laggfontfreetype -lagg -lfreetype + CFLAGS += -DAGG_PIXFMT=pixfmt_$(AGG) \ +- -I$(TOP)/agg_support \ +- -I/usr/include/agg2 \ +- -I/usr/local/include/agg2 \ +- -I/usr/include/freetype2 ++ -I$(TOP)/agg_support + CANVAS_OBJS = roadmap_canvas_agg.o \ + $(TOP)/agg_support/roadmap_canvas.o + endif +@@ -188,7 +185,7 @@ endif + # bidirectional text lib + ifneq ($(strip $(BIDI)),NO) + LIBS += -lfribidi +- CFLAGS += -DUSE_FRIBIDI -I/usr/include/fribidi ++ CFLAGS += -DUSE_FRIBIDI + endif + + # RoadMap internal profiling +@@ -205,8 +202,8 @@ else + endif + + +-CFLAGS += -I$(TOP) -I/usr/local/include -DNDEBUG ++CFLAGS += -I$(TOP) -DNDEBUG + +-LIBS := -L/usr/local/lib $(LIBS) -lm ++LIBS := $(LIBS) -lm + + CXXFLAGS = $(CFLAGS) |