blob: 3e5e726211d97ec02d63905324ea20b787c248a0 (
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
|
--- src/makefile.orig 2015-07-02 16:51:26.582456000 +0200
+++ src/makefile 2015-07-02 16:51:53.706070000 +0200
@@ -12,7 +12,7 @@
# See src/gui-qt/highlight.pro for the Qt GUI compilation options
-CXX=c++
+CXX?=c++
# Added -qt4 because of Arch Linux Qt5 migration
QMAKE=qmake-qt4
@@ -37,10 +37,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)
@@ -67,7 +67,7 @@
#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}\"
|
