You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
873 B
29 lines
873 B
12 years ago
|
--- a/makepackages
|
||
|
|
+++ b/makepackages
|
||
|
|
@@ -52,17 +52,17 @@ else
|
||
|
|
PTHREADS_LIBS = -lpthread
|
||
|
|
|
||
|
|
else
|
||
|
|
- AGG_INCLUDES = -I/usr/include/agg2
|
||
|
|
- AGG_LIBS = -lagg -lX11
|
||
|
|
+ AGG_INCLUDES = $(shell $(PKG_CONFIG) --cflags libagg)
|
||
|
|
+ AGG_LIBS = $(shell $(PKG_CONFIG) --libs libagg) -lX11
|
||
|
|
|
||
|
|
- GSL_INCLUDES =
|
||
|
|
- GSL_LIBS = -lgsl -lblas
|
||
|
|
+ GSL_INCLUDES = $(shell $(PKG_CONFIG) --cflags gsl)
|
||
|
|
+ GSL_LIBS = $(shell $(PKG_CONFIG) --libs gsl)
|
||
|
|
|
||
|
|
- FOX_INCLUDES := $(shell pkg-config fox --cflags)
|
||
|
|
- FOX_LIBS = $(shell pkg-config fox --libs)
|
||
|
|
+ FOX_INCLUDES := $(shell $(PKG_CONFIG) fox --cflags)
|
||
|
|
+ FOX_LIBS = $(shell $(PKG_CONFIG) fox --libs)
|
||
|
|
|
||
|
|
- FREETYPE_INCLUDES = -I/usr/include/freetype2
|
||
|
|
- FREETYPE_LIBS = -lfreetype
|
||
|
|
+ FREETYPE_INCLUDES = $(shell $(PKG_CONFIG) --cflags freetype2)
|
||
|
|
+ FREETYPE_LIBS = $(shell $(PKG_CONFIG) --libs freetype2)
|
||
|
|
|
||
|
|
PTHREADS_LIBS = -lpthread
|
||
|
|
endif
|