File scintilla-shared.patch of Package scintilla

Overview Repositories Revisions Requests Users Attributes Meta

File scintilla-shared.patch of Package scintilla (Revision 4538599ebdc9eaf92418ee01228c1fab)

Currently displaying revision 4538599ebdc9eaf92418ee01228c1fab , Show latest

Index: gtk/makefile
===================================================================
--- gtk/makefile.orig
+++ gtk/makefile
@@ -36,7 +36,7 @@ DEL = del /q
 COMPLIB=..\bin\scintilla.a
 else
 DEL = rm -f
-COMPLIB=../bin/scintilla.a
+COMPLIB=../bin/libscintilla.la
 endif
 
 vpath %.h ../src ../include ../lexlib
@@ -46,7 +46,7 @@ INCLUDEDIRS=-I ../include -I ../src -I .
 ifdef CHECK_DEPRECATED
 DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
 endif
-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
+CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long -pedantic -fPIC -DPIC -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
 
 ifdef NOTHREADS
 THREADFLAGS=-DG_THREADS_IMPL_NONE
@@ -62,7 +62,7 @@ endif
 
 CFLAGS:=$(CXXFLAGS)
 
-CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
+CONFIGFLAGS:=$(shell pkg-config --cflags --libs $(GTKVERSION))
 MARSHALLER=scintilla-marshal.o
 
 .cxx.o:
@@ -86,8 +86,7 @@ $(COMPLIB): Accessor.o CharacterSet.o Le
 	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
 	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
 	$(MARSHALLER) $(LEXOBJS)
-	$(AR) rc $@ $^
-	$(RANLIB) $@
+	libtool --mode=link gcc -g -O3 -o $@ $^ -rpath $(LIBDIR) $(CONFIGLDFLAGS) -version-info $(VERSION)
 
 # Automatically generate header dependencies with "make deps"
 include deps.mak

Places

File scintilla-shared.patch of Package scintilla (Revision 4538599ebdc9eaf92418ee01228c1fab)

Places