|
Lines 1-7
Link Here
|
| 1 |
--- makefile.orig 2009-08-12 21:35:23.000000000 -0400 |
1 |
--- makefile.orig 2010-03-25 19:49:46.000000000 -0400 |
| 2 |
+++ makefile 2009-08-21 01:58:12.000000000 -0400 |
2 |
+++ makefile 2010-04-05 07:36:46.000000000 -0400 |
| 3 |
@@ -8,16 +8,17 @@ |
3 |
@@ -7,9 +7,9 @@ |
| 4 |
# To force GTK+ 1 build, define GTK1 on the make command line. |
4 |
# Also works with ming32-make on Windows. |
| 5 |
|
5 |
|
| 6 |
.SUFFIXES: .cxx .c .o .h .a |
6 |
.SUFFIXES: .cxx .c .o .h .a |
| 7 |
-CC = g++ |
7 |
-CC = g++ |
|
Lines 12-19
Link Here
|
| 12 |
+AR = $(CXX) -shared |
12 |
+AR = $(CXX) -shared |
| 13 |
RANLIB = touch |
13 |
RANLIB = touch |
| 14 |
|
14 |
|
| 15 |
ifeq ($(shell uname),Darwin) |
15 |
ifndef windir |
| 16 |
RANLIB = ranlib |
16 |
@@ -18,7 +18,8 @@ |
|
|
17 |
endif |
| 17 |
endif |
18 |
endif |
| 18 |
|
19 |
|
| 19 |
-COMPLIB=../bin/scintilla.a |
20 |
-COMPLIB=../bin/scintilla.a |
|
Lines 22-28
Link Here
|
| 22 |
|
23 |
|
| 23 |
vpath %.h ../src ../include |
24 |
vpath %.h ../src ../include |
| 24 |
vpath %.cxx ../src |
25 |
vpath %.cxx ../src |
| 25 |
@@ -32,33 +33,33 @@ |
26 |
@@ -33,18 +34,18 @@ |
| 26 |
endif |
27 |
endif |
| 27 |
|
28 |
|
| 28 |
ifdef DEBUG |
29 |
ifdef DEBUG |
|
Lines 33-59
Link Here
|
| 33 |
+CXXFLAGS+=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) |
34 |
+CXXFLAGS+=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) |
| 34 |
endif |
35 |
endif |
| 35 |
|
36 |
|
| 36 |
# If explicit setting of GTK1 or GTK2 then use that else look for |
|
|
| 37 |
# pkg-config which is an OK indication that GTK2 is available |
| 38 |
ifdef GTK2 |
| 39 |
-CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0) |
| 40 |
+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0) |
| 41 |
MARSHALLER=scintilla-marshal.o |
| 42 |
else |
| 43 |
ifdef GTK1 |
| 44 |
-CONFIGFLAGS:=$(shell gtk-config --cflags) |
| 45 |
+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+ gthread) |
| 46 |
else |
| 47 |
ifneq (,$(findstring /,$(shell whereis pkg-config))) |
| 48 |
-CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0) |
37 |
-CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0) |
| 49 |
+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0) |
38 |
+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0) |
| 50 |
MARSHALLER=scintilla-marshal.o |
39 |
MARSHALLER=scintilla-marshal.o |
| 51 |
else |
|
|
| 52 |
-CONFIGFLAGS:=$(shell gtk-config --cflags) |
| 53 |
+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+ gthread) |
| 54 |
endif |
| 55 |
endif |
| 56 |
endif |
| 57 |
|
40 |
|
| 58 |
.cxx.o: |
41 |
.cxx.o: |
| 59 |
- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< |
42 |
- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< |
|
Lines 64-71
Link Here
|
| 64 |
|
47 |
|
| 65 |
#++Autogenerated -- run src/LexGen.py to regenerate |
48 |
#++Autogenerated -- run src/LexGen.py to regenerate |
| 66 |
#**LEXOBJS=\\\n\(\*.o \) |
49 |
#**LEXOBJS=\\\n\(\*.o \) |
| 67 |
@@ -76,7 +77,7 @@ |
50 |
@@ -63,7 +64,7 @@ |
| 68 |
LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o |
51 |
LexVHDL.o LexYAML.o |
| 69 |
#--Autogenerated -- end of automatically generated section |
52 |
#--Autogenerated -- end of automatically generated section |
| 70 |
|
53 |
|
| 71 |
-all: $(COMPLIB) |
54 |
-all: $(COMPLIB) |
|
Lines 73-79
Link Here
|
| 73 |
|
56 |
|
| 74 |
clean: |
57 |
clean: |
| 75 |
rm -f *.o $(COMPLIB) |
58 |
rm -f *.o $(COMPLIB) |
| 76 |
@@ -89,9 +90,11 @@ |
59 |
@@ -76,9 +77,11 @@ |
| 77 |
ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \ |
60 |
ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \ |
| 78 |
KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ |
61 |
KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ |
| 79 |
RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ |
62 |
RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ |