blob: 948e504a8d990e4c1e673b812f663f9578d984de (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
--- a/scintilla/scinterm/Makefile 2012-12-11 01:26:02.000000000 +0100
+++ b/scintilla/scinterm/Makefile 2013-01-24 01:30:55.806042954 +0100
@@ -4,8 +4,8 @@
CXX = g++
INCLUDEDIRS = -I ../include -I ../src -I ../lexlib
-CXXFLAGS = -Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long \
- -pedantic -DNCURSES -DSCI_LEXER $(INCLUDEDIRS)
+CXXFLAGS += -Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long \
+ -pedantic -DNCURSES -DSCI_LEXER $(INCLUDEDIRS)
ifdef DEBUG
CXXFLAGS += -DDEBUG -g
else
@@ -30,7 +30,7 @@
CharacterSet.o LexerBase.o LexerModule.o LexerNoExceptions.o \
LexerSimple.o PropSetSimple.o StyleContext.o WordList.o \
$(lexers) ScintillaTerm.o
- ar rc $@ $^
+ $(AR) rc $@ $^
touch $@
clean:
rm -f *.o $(scintilla)
|
