blob: 091ad764296370a0a01321573e175ccaae337b2a (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
--- src/makefile.orig 2016-08-20 21:01:57.961708000 +0200
+++ src/makefile 2016-08-20 21:03:49.861494000 +0200
@@ -12,7 +12,7 @@
# See src/gui-qt/highlight.pro for the Qt GUI compilation options
-CXX=g++
+CXX?=g++
# was: qmake-qt5
QMAKE=qmake
@@ -38,10 +38,10 @@
# If Lua 5.2 is not default on your system yet you have to
# use lua5.1 in the pkg-config calls
-LUA_CFLAGS=$(shell pkg-config --cflags lua)
+LUA_CFLAGS=$(shell pkg-config --cflags lua-5.2)
# default lua lib
-LUA_LIBS=$(shell pkg-config --libs lua)
+LUA_LIBS=$(shell pkg-config --libs lua-5.2)
# luajit lib
# LUA_LIBS=$(shell pkg-config --libs luajit)
@@ -65,19 +65,19 @@
CFLAGS+=-fPIC
endif
-LDFLAGS = -ldl
+LDFLAGS = #-ldl
# Do not strip by default (Mac OS X lazy pointer issues)
# Add -static to avoid linking with shared libs (can cause trouble when highlight
# is run as service)
#LDFLAGS = ${LDFLAGS} -s
#LDFLAGS= -Wl,--as-needed
-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
+CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} -I%%LOCALBASE%%/include ${LUA_CFLAGS}
# Data directories (data dir, configuration file dir)
CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
-AR=ar
+AR?=ar
ARFLAGS=-crs
# objects files to build the library
|
