|
Lines 1-12
Link Here
|
| 1 |
--- makefile.orig 2013-10-13 23:38:06.000000000 +0200 |
1 |
--- ./makefile.orig 2014-05-25 22:01:00.000000000 -0400 |
| 2 |
+++ makefile 2014-01-27 15:50:05.858185668 +0100 |
2 |
+++ ./makefile 2014-06-07 11:45:11.000000000 -0400 |
| 3 |
@@ -5,13 +5,6 @@ |
3 |
@@ -5,17 +5,6 @@ |
| 4 |
# GNU make does not like \r\n line endings so should be saved to CVS in binary form. |
4 |
# GNU make does not like \r\n line endings so should be saved to CVS in binary form. |
| 5 |
|
5 |
|
| 6 |
.SUFFIXES: .cxx .o .h .a .c |
6 |
.SUFFIXES: .cxx .o .h .a .c |
| 7 |
-ifdef CLANG |
7 |
-ifdef CLANG |
| 8 |
-CC = clang -fsanitize=address --std=c++0x |
8 |
-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for |
| 9 |
-CCOMP = clang -fsanitize=address -Wno-empty-body |
9 |
-# thread also need to create Position Independent Executable -> search online documentation |
|
|
10 |
-SANITIZE = address |
| 11 |
-#SANITIZE = undefined |
| 12 |
-CC = clang++ -fsanitize=$(SANITIZE) --std=c++0x |
| 13 |
-CCOMP = clang -fsanitize=$(SANITIZE) -Wno-empty-body |
| 10 |
-else |
14 |
-else |
| 11 |
-CC = g++ |
15 |
-CC = g++ |
| 12 |
-CCOMP = gcc |
16 |
-CCOMP = gcc |
|
Lines 14-20
Link Here
|
| 14 |
AR = ar |
18 |
AR = ar |
| 15 |
|
19 |
|
| 16 |
ifdef GTK3 |
20 |
ifdef GTK3 |
| 17 |
@@ -24,7 +17,7 @@ |
21 |
@@ -28,7 +17,7 @@ |
| 18 |
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) |
22 |
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) |
| 19 |
CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0) |
23 |
CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0) |
| 20 |
CONFIGTHREADS:= |
24 |
CONFIGTHREADS:= |
|
Lines 23-37
Link Here
|
| 23 |
ifndef prefix |
27 |
ifndef prefix |
| 24 |
ifdef gnomeprefix |
28 |
ifdef gnomeprefix |
| 25 |
prefix=$(gnomeprefix) |
29 |
prefix=$(gnomeprefix) |
| 26 |
@@ -116,8 +109,9 @@ |
30 |
@@ -117,8 +106,9 @@ |
| 27 |
$(PROG): SciTEGTK.o GUIGTK.o Widget.o \ |
31 |
FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o \ |
| 28 |
FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \ |
32 |
Exporters.o MatchMarker.o StringHelpers.o \ |
| 29 |
PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \ |
33 |
PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \ |
| 30 |
- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS) |
34 |
- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS) |
| 31 |
- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++ |
35 |
- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++ |
| 32 |
+ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS) |
36 |
+ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS) |
| 33 |
+ $(CC) -DGTK $(CXXFLAGS) -rdynamic -Wl,--version-script lua.vers $(LDFLAGS) \ |
37 |
+ $(CC) -rdynamic -Wl,--version-script lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \ |
| 34 |
+ -o $@ $^ -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB) |
38 |
+ $(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB) |
| 35 |
|
39 |
|
| 36 |
# Automatically generate header dependencies with "make deps" |
40 |
# Automatically generate header dependencies with "make deps" |
| 37 |
include deps.mak |
41 |
include deps.mak |