projects / packages / highlight.git / blame
| Commit | Line | Data |
|---|---|---|
| 9d86d0ce JP |
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 | |
| 137bf23a | 4 | @@ -2,7 +2,7 @@ |
| 9d86d0ce JP |
5 | # This file will compile the highlight library and binaries. |
| 6 | # See INSTALL for instructions. | |
| 7 | ||
| 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} | |
| b7497651 | 13 | @@ -19,13 +19,13 @@ |
| 9d86d0ce | 14 | |
| 13b9f4a9 JP |
15 | QMAKE ?= qmake |
| 16 | ||
| b7497651 AG |
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 | |
| 19 | ||
| 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 | |
| 22 | ||
| 23 | -#CFLAGS:=-ggdb -O0 ${CFLAGS} -std=c++11 | |
| 24 | +#CXXFLAGS:=-ggdb -O0 ${CFLAGS} -std=c++11 | |
| 9d86d0ce JP |
25 | |
| 26 | -CFLAGS_DILU=-fno-strict-aliasing | |
| 27 | +CXXFLAGS_DILU=-fno-strict-aliasing | |
| 28 | ||
| 13b9f4a9 | 29 | SO_VERSION=3.60 |
| 9d86d0ce | 30 | |
| 9d86d0ce JP |
31 | @@ -63,7 +63,7 @@ |
| 32 | endif | |
| 33 | ||
| 34 | ifdef PIC | |
| 35 | - CFLAGS+=-fPIC | |
| 36 | + CXXFLAGS+=-fPIC | |
| 37 | endif | |
| 38 | ||
| 39 | LDFLAGS = -ldl | |
| 40 | @@ -73,7 +73,7 @@ | |
| 41 | #LDFLAGS = ${LDFLAGS} -s | |
| 42 | #LDFLAGS= -Wl,--as-needed | |
| 43 | ||
| 44 | -CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS} | |
| 45 | +CXX_COMPILE=${CXX} ${CXXFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS} | |
| 46 | ||
| 47 | # Data directories (data dir, configuration file dir) | |
| 48 | CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\" | |
| 49 | @@ -235,7 +235,7 @@ | |
| 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 | |
| 58 | diff -urN highlight-3.34.orig/src/gui-qt/highlight.pro highlight-3.34/src/gui-qt/highlight.pro | |
| 59 | --- highlight-3.34.orig/src/gui-qt/highlight.pro 2017-01-24 22:56:25.702768453 +0100 | |
| 60 | +++ highlight-3.34/src/gui-qt/highlight.pro 2017-01-24 22:58:08.419208074 +0100 | |
| 61 | @@ -38,9 +38,9 @@ | |
| 62 | unix { | |
| 63 | DESTDIR = ../ | |
| 64 | LIBS += -L.. -lhighlight | |
| 65 | - LIBS += -llua | |
| 03025ef9 | 66 | + LIBS += -llua5.3 |
| 9d86d0ce JP |
67 | CONFIG += link_pkgconfig |
| 68 | - PKGCONFIG += lua | |
| 03025ef9 | 69 | + PKGCONFIG += lua5.3 |
| 9d86d0ce JP |
70 | |
| 71 | # to make it run within Qt Creator | |
| 72 | !contains(DEFINES, DATA_DIR) { |