View | Details | Raw Unified | Return to bug 160599
Collapse All | Expand All

(-)files/patch-aa (-13 / +6 lines)
Lines 1-6 Link Here
1
--- makefile.orig	2011-07-31 22:49:29.000000000 -0400
1
--- makefile.orig	2011-07-31 22:49:29.000000000 -0400
2
+++ makefile	2011-09-03 16:25:52.000000000 -0400
2
+++ makefile	2011-09-06 22:02:21.000000000 -0400
3
@@ -5,13 +5,13 @@
3
@@ -5,13 +5,6 @@
4
 # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
4
 # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
5
 
5
 
6
 .SUFFIXES: .cxx .o .h .a .c
6
 .SUFFIXES: .cxx .o .h .a .c
Lines 11-27 Link Here
11
-CC = g++
11
-CC = g++
12
-CCOMP = gcc
12
-CCOMP = gcc
13
-endif
13
-endif
14
+#ifdef CLANG
15
+#CC = clang
16
+#CCOMP = clang
17
+#else
18
+#CC = g++
19
+#CCOMP = gcc
20
+#endif
21
 AR = ar
14
 AR = ar
22
 
15
 
23
 ifdef GTK3
16
 ifdef GTK3
24
@@ -24,7 +24,7 @@
17
@@ -24,7 +17,7 @@
25
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
18
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
26
 CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0)
19
 CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0)
27
 CONFIGTHREADS:=
20
 CONFIGTHREADS:=
Lines 30-44 Link Here
30
 ifndef prefix
23
 ifndef prefix
31
 ifdef gnomeprefix
24
 ifdef gnomeprefix
32
   prefix=$(gnomeprefix)
25
   prefix=$(gnomeprefix)
33
@@ -102,8 +102,9 @@
26
@@ -102,8 +95,9 @@
34
 $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
27
 $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
35
 FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
28
 FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
36
 PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
29
 PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
37
-	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
30
-	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
38
-	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
31
-	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
39
+	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
32
+	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
40
+	$(CC) $(CONFIGLIB) -lscintilla -lscintilla_lexers -lstdc++ \
33
+	$(CC) -DGTK $(CXXFLAGS) -rdynamic -Wl,--version-script lua.vers $(LDFLAGS) \
41
+	-rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@
34
+	-o $@ $^ -Wl,--as-needed -lscintilla -lscintilla_lexers $(CONFIGLIB)
42
 
35
 
43
 # Automatically generate header dependencies with "make deps"
36
 # Automatically generate header dependencies with "make deps"
44
 include deps.mak
37
 include deps.mak
(-)files/patch-src__FilePath.h (+10 lines)
Added Link Here
1
--- ../src/FilePath.h.orig	2011-07-31 22:49:30.000000000 -0400
2
+++ ../src/FilePath.h	2011-09-06 21:43:03.000000000 -0400
3
@@ -13,6 +13,7 @@
4
 extern const GUI::gui_char fileWrite[];
5
 
6
 #if defined(__unix__)
7
+#include <cstdio>
8
 #include <limits.h>
9
 #ifdef PATH_MAX
10
 #define MAX_PATH PATH_MAX

Return to bug 160599