38 lines
1.6 KiB
Text
38 lines
1.6 KiB
Text
--- makefile.orig 2015-09-22 01:37:15 UTC
|
|
+++ makefile
|
|
@@ -5,14 +5,6 @@
|
|
# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
|
|
|
|
.SUFFIXES: .cxx .o .h .a .c
|
|
-ifdef CLANG
|
|
-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
|
|
-# thread also need to create Position Independent Executable -> search online documentation
|
|
-SANITIZE = address
|
|
-#SANITIZE = undefined
|
|
-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
|
|
-CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
|
|
-endif
|
|
|
|
ifdef GTK3
|
|
GTKVERSION=gtk+-3.0
|
|
@@ -24,7 +16,7 @@ endif
|
|
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
|
|
CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
|
|
CONFIGTHREADS:=
|
|
-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
|
|
+gnomeprefix:=$(PREFIX)
|
|
ifndef prefix
|
|
ifdef gnomeprefix
|
|
prefix=$(gnomeprefix)
|
|
@@ -114,8 +106,9 @@ FilePath.o SciTEBase.o FileWorker.o Cook
|
|
ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
|
|
MatchMarker.o StringHelpers.o \
|
|
PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
|
|
- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
|
|
- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
|
|
+ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
|
|
+ $(CXX) -rdynamic -Wl,--version-script lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \
|
|
+ $(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
|
|
|
|
# Automatically generate header dependencies with "make deps"
|
|
include deps.mak
|