1 diff -urN highlight-3.34.orig/src/makefile highlight-3.34/src/makefile
2 --- highlight-3.34.orig/src/makefile 2017-01-24 22:56:25.702768453 +0100
3 +++ highlight-3.34/src/makefile 2017-01-24 22:57:44.332773964 +0100
5 # This file will compile the highlight library and binaries.
6 # See INSTALL for instructions.
8 -# Add -DHL_DATA_DIR=\"/your/path/\" to CFLAGS if you want to define a
9 +# Add -DHL_DATA_DIR=\"/your/path/\" to CXXFLAGS if you want to define a
10 # custom installation directory not listed in INSTALL.
11 # Copy *.conf, ./langDefs, ./themes and ./plugins to /your/path/.
12 # See ../makefile for the definition of ${data_dir}
17 -CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
18 +CXXFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
20 -#CFLAGS:= -fPIC -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection
21 +#CXXFLAGS:= -fPIC -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection
23 -#CFLAGS:=-ggdb -O0 ${CFLAGS} -std=c++11
24 +#CXXFLAGS:=-ggdb -O0 ${CFLAGS} -std=c++11
26 -CFLAGS_DILU=-fno-strict-aliasing
27 +CXXFLAGS_DILU=-fno-strict-aliasing
41 #LDFLAGS = ${LDFLAGS} -s
42 #LDFLAGS= -Wl,--as-needed
44 -CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
45 +CXX_COMPILE=${CXX} ${CXXFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
47 # Data directories (data dir, configuration file dir)
48 CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
50 LuaUtils.o: ${DILU_DIR}LuaUtils.cpp
51 ${CXX_COMPILE} ${DILU_DIR}LuaUtils.cpp
52 LuaValue.o: ${DILU_DIR}LuaValue.cpp
53 - ${CXX_COMPILE} ${CFLAGS_DILU} ${DILU_DIR}LuaValue.cpp
54 + ${CXX_COMPILE} ${CXXFLAGS_DILU} ${DILU_DIR}LuaValue.cpp
55 LuaVariable.o: ${DILU_DIR}LuaVariable.cpp
56 ${CXX_COMPILE} ${DILU_DIR}LuaVariable.cpp
57 LuaWrappers.o: ${DILU_DIR}LuaWrappers.cpp