Ticket #25261: patch-compiler.diff
File patch-compiler.diff, 1.6 KB (added by ryandesign (Ryan Carsten Schmidt), 12 years ago) |
---|
-
src/gtkscintilla2/Makefile
old new 10 10 SCINTILLA_LIB = $(SCINTILLA_DIR)/bin/scintilla.a 11 11 SCINTILLA_IFACE = $(SCINTILLA_INCLUDE)/Scintilla.iface 12 12 LEXERS = $(wildcard $(SCINTILLA_DIR)/gtk/Lex*.o) 13 CFLAGS = $(shell pkg-config --cflags gtk+-2.0) -g -Wall -DGTK -DSCI_LEXER -fPIC 14 LDFLAGS_PRE = $(shell pkg-config --libs gtk+-2.0) -DGTK2 13 CFLAGS = $(shell pkg-config --cflags gtk+-2.0) -g -Wall -DGTK -DSCI_LEXER -fPIC @ARCHFLAGS@ 14 LDFLAGS_PRE = $(shell pkg-config --libs gtk+-2.0) -DGTK2 @ARCHFLAGS@ 15 15 LDFLAGS_POST = $(LEXERS) $(SCINTILLA_LIB) -lstdc++ 16 16 17 ARCH=-arch i386 18 CC = gcc 19 LD = gcc 17 CC = @CC@ 18 LD = @CC@ 20 19 AR = ar 21 20 22 21 STATIC_LIB = lib$(LIB_NAME).a -
src/gtkscintilla2/scintilla/gtk/makefile
old new 7 7 # Also works with ming32-make on Windows. 8 8 9 9 .SUFFIXES: .cxx .c .o .h .a 10 ifdef CLANG 11 CC = clang 12 CCOMP = clang 13 else 14 CC = g++ 15 CCOMP = gcc 16 endif 10 CC = @CXX@ 11 CCOMP = @CC@ 17 12 AR = ar 18 13 RANLIB = touch 19 14 … … 30 25 31 26 INCLUDEDIRS=-I ../include -I ../src -I ../lexlib 32 27 #~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT 33 CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED) 28 CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED) @ARCHFLAGS@ 34 29 35 30 ifdef NOTHREADS 36 31 THREADFLAGS=-DG_THREADS_IMPL_NONE