33 lines
1.3 KiB
Text
33 lines
1.3 KiB
Text
--- gtk/makefile.orig 2020-09-11 10:44:44 UTC
|
|
+++ gtk/makefile
|
|
@@ -18,9 +18,7 @@ ifdef CLANG
|
|
# thread also need to create Position Independent Executable -> search online documentation
|
|
SANITIZE = address
|
|
#SANITIZE = undefined
|
|
-CXX = clang++
|
|
-CC = clang
|
|
-BASE_FLAGS += -fsanitize=$(SANITIZE)
|
|
+#BASE_FLAGS += -fsanitize=$(SANITIZE)
|
|
WARNINGS += -Wno-deprecated-register
|
|
WARNINGS += -Wno-empty-body
|
|
else
|
|
@@ -59,7 +57,7 @@ COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a
|
|
COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION)
|
|
LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
|
|
|
|
-all: $(PROG) $(COMPONENT) $(LEXILLA)
|
|
+all: $(PROG)
|
|
|
|
vpath %.h $(srcdir) $(srcdir)/../src $(SCINTILLA_DIR)/include
|
|
vpath %.cxx $(srcdir) $(srcdir)/../src
|
|
@@ -151,7 +149,9 @@ SRC_OBJS = \
|
|
Utf8_16.o
|
|
|
|
$(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
|
|
- $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS)
|
|
+ $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic \
|
|
+ -Wl,--version-script $(srcdir)/lua.vers $^ -o $@ -lscintilla \
|
|
+ -Wl,--as-needed $(CONFIGLIB)
|
|
|
|
# Automatically generate header dependencies with "make deps"
|
|
include deps.mak
|