diff options
Diffstat (limited to 'editors/scite/files/patch-aa')
| -rw-r--r-- | editors/scite/files/patch-aa | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa index ae7318997dc8..da177cfec78f 100644 --- a/editors/scite/files/patch-aa +++ b/editors/scite/files/patch-aa @@ -1,6 +1,6 @@ --- makefile.orig 2011-07-31 22:49:29.000000000 -0400 -+++ makefile 2011-09-03 16:25:52.000000000 -0400 -@@ -5,13 +5,13 @@ ++++ makefile 2011-09-06 22:02:21.000000000 -0400 +@@ -5,13 +5,6 @@ # GNU make does not like \r\n line endings so should be saved to CVS in binary form. .SUFFIXES: .cxx .o .h .a .c @@ -11,17 +11,10 @@ -CC = g++ -CCOMP = gcc -endif -+#ifdef CLANG -+#CC = clang -+#CCOMP = clang -+#else -+#CC = g++ -+#CCOMP = gcc -+#endif AR = ar ifdef GTK3 -@@ -24,7 +24,7 @@ +@@ -24,7 +17,7 @@ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0) CONFIGTHREADS:= @@ -30,15 +23,15 @@ ifndef prefix ifdef gnomeprefix prefix=$(gnomeprefix) -@@ -102,8 +102,9 @@ +@@ -102,8 +95,9 @@ $(PROG): SciTEGTK.o GUIGTK.o Widget.o \ FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \ - JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS) - $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++ + JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS) -+ $(CC) $(CONFIGLIB) -lscintilla -lscintilla_lexers -lstdc++ \ -+ -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ ++ $(CC) -DGTK $(CXXFLAGS) -rdynamic -Wl,--version-script lua.vers $(LDFLAGS) \ ++ -o $@ $^ -Wl,--as-needed -lscintilla -lscintilla_lexers $(CONFIGLIB) # Automatically generate header dependencies with "make deps" include deps.mak |