644b855b6e
- The update fixes build on recent head PR: ports/182014 Submitted by: me Approved by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)
63 lines
1.7 KiB
Text
63 lines
1.7 KiB
Text
--- makefile.orig 2013-08-31 05:20:24.000000000 +0200
|
|
+++ makefile 2013-09-11 13:10:02.007909736 +0200
|
|
@@ -7,14 +7,7 @@
|
|
# Also works with ming32-make on Windows.
|
|
|
|
.SUFFIXES: .cxx .c .o .h .a
|
|
-ifdef CLANG
|
|
-CC = clang
|
|
-CCOMP = clang
|
|
-else
|
|
-CC = g++
|
|
-CCOMP = gcc
|
|
-endif
|
|
-AR = ar
|
|
+AR = $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared
|
|
RANLIB = touch
|
|
|
|
ifdef GTK3
|
|
@@ -36,7 +29,8 @@
|
|
COMPLIB=..\bin\scintilla.a
|
|
else
|
|
DEL = rm -f
|
|
-COMPLIB=../bin/scintilla.a
|
|
+COMPLIB=../bin/libscintilla.so.2
|
|
+LEXRLIB=../bin/libscintilla_lexers.so.2
|
|
endif
|
|
|
|
vpath %.h ../src ../include ../lexlib
|
|
@@ -68,16 +62,17 @@
|
|
CXXTFLAGS:=--std=c++0x $(CTFLAGS)
|
|
|
|
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
|
|
+CONFIGLIBS:=$(shell pkg-config --libs $(GTKVERSION))
|
|
MARSHALLER=scintilla-marshal.o
|
|
|
|
.cxx.o:
|
|
$(CC) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
|
|
.c.o:
|
|
- $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
|
|
+ $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) $(CXXFLAGS) -w -c $<
|
|
|
|
LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
|
|
|
|
-all: $(COMPLIB)
|
|
+all: $(COMPLIB) $(LEXRLIB)
|
|
|
|
clean:
|
|
$(DEL) *.o $(COMPLIB) *.plist
|
|
@@ -93,9 +88,11 @@
|
|
ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \
|
|
KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \
|
|
RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
|
|
- $(MARSHALLER) $(LEXOBJS)
|
|
- $(AR) rc $@ $^
|
|
- $(RANLIB) $@
|
|
+ $(MARSHALLER)
|
|
+ $(AR) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
|
|
+
|
|
+$(LEXRLIB): $(LEXOBJS)
|
|
+ $(AR) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
|
|
|
|
# Automatically generate header dependencies with "make deps"
|
|
include deps.mak
|