2017-07-27 20:26:45 +00:00
|
|
|
Index: scintilla/gtk/makefile
|
2011-11-28 11:57:21 +00:00
|
|
|
===================================================================
|
2017-07-27 20:26:45 +00:00
|
|
|
--- scintilla.orig/gtk/makefile
|
|
|
|
|
+++ scintilla/gtk/makefile
|
2023-04-15 17:21:23 +00:00
|
|
|
@@ -67,7 +67,7 @@ DEL = del /q
|
2011-11-28 11:57:21 +00:00
|
|
|
else
|
|
|
|
|
DEL = rm -f
|
|
|
|
|
endif
|
2021-06-28 06:28:04 +00:00
|
|
|
-COMPLIB=$(basedir)/bin/scintilla.a
|
|
|
|
|
+COMPLIB=$(basedir)/bin/libscintilla.la
|
|
|
|
|
COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
|
2009-02-19 03:48:13 +00:00
|
|
|
|
2021-07-28 17:42:31 +00:00
|
|
|
vpath %.h $(srcdir) $(basedir)/src $(basedir)/include
|
2023-04-15 17:21:23 +00:00
|
|
|
@@ -83,7 +83,7 @@ DEFINES += -DNO_CXX11_REGEX
|
2016-07-12 18:24:41 +00:00
|
|
|
endif
|
|
|
|
|
|
2021-06-28 06:28:04 +00:00
|
|
|
DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
|
2022-12-27 08:59:43 +00:00
|
|
|
-BASE_FLAGS += $(if $(DEBUG),-g,-O3)
|
2021-06-28 06:28:04 +00:00
|
|
|
+BASE_FLAGS += $(if $(DEBUG),-g)
|
|
|
|
|
|
|
|
|
|
CXX_BASE_FLAGS =--std=c++17 $(BASE_FLAGS)
|
|
|
|
|
CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS) $(CONFIG_FLAGS)
|
2024-03-14 17:20:51 +00:00
|
|
|
@@ -164,6 +164,7 @@ GTK_OBJS = \
|
2022-02-16 07:37:23 +00:00
|
|
|
$(COMPLIB): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
|
|
|
|
|
$(AR) $(ARFLAGS) $@ $^
|
|
|
|
|
$(RANLIB) $@
|
2016-07-12 18:24:41 +00:00
|
|
|
+ libtool --mode=link gcc $(CONFIGFLAGS) -o $@ $^ -rpath $(LIBDIR) $(CONFIGLDFLAGS) -version-info $(VERSION)
|
2009-02-19 03:48:13 +00:00
|
|
|
|
2021-06-28 06:28:04 +00:00
|
|
|
$(COMPONENT): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
|
|
|
|
|
$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(CONFIGLIB)
|