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 amd ./indentSchemes to /your/path/.
12 # See ../makefile for the definition of ${data_dir}
16 # Added -std=c++11 because of auto_ptr to unique_ptr transition
17 -CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
18 -#CFLAGS:=-ggdb ${CFLAGS} -std=c++11
19 +CXXFLAGS:=-Wall -O2 ${CXXFLAGS} -DNDEBUG -std=c++11
20 +#CXXFLAGS:=-ggdb ${CXXFLAGS} -std=c++11
22 -CFLAGS_DILU=-fno-strict-aliasing
23 +CXXFLAGS_DILU=-fno-strict-aliasing
37 #LDFLAGS = ${LDFLAGS} -s
38 #LDFLAGS= -Wl,--as-needed
40 -CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
41 +CXX_COMPILE=${CXX} ${CXXFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
43 # Data directories (data dir, configuration file dir)
44 CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
46 LuaUtils.o: ${DILU_DIR}LuaUtils.cpp
47 ${CXX_COMPILE} ${DILU_DIR}LuaUtils.cpp
48 LuaValue.o: ${DILU_DIR}LuaValue.cpp
49 - ${CXX_COMPILE} ${CFLAGS_DILU} ${DILU_DIR}LuaValue.cpp
50 + ${CXX_COMPILE} ${CXXFLAGS_DILU} ${DILU_DIR}LuaValue.cpp
51 LuaVariable.o: ${DILU_DIR}LuaVariable.cpp
52 ${CXX_COMPILE} ${DILU_DIR}LuaVariable.cpp
53 LuaWrappers.o: ${DILU_DIR}LuaWrappers.cpp
54 diff -urN highlight-3.34.orig/src/gui-qt/highlight.pro highlight-3.34/src/gui-qt/highlight.pro
55 --- highlight-3.34.orig/src/gui-qt/highlight.pro 2017-01-24 22:56:25.702768453 +0100
56 +++ highlight-3.34/src/gui-qt/highlight.pro 2017-01-24 22:58:08.419208074 +0100
60 LIBS += -L.. -lhighlight
63 CONFIG += link_pkgconfig
67 # to make it run within Qt Creator
68 !contains(DEFINES, DATA_DIR) {