Ticket #25261: patch-compiler.diff

File patch-compiler.diff, 1.6 KB (added by ryandesign (Ryan Carsten Schmidt), 11 years ago)

  • src/gtkscintilla2/Makefile

    old new  
    1010SCINTILLA_LIB = $(SCINTILLA_DIR)/bin/scintilla.a
    1111SCINTILLA_IFACE = $(SCINTILLA_INCLUDE)/Scintilla.iface
    1212LEXERS = $(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
     13CFLAGS = $(shell pkg-config --cflags gtk+-2.0) -g -Wall -DGTK -DSCI_LEXER -fPIC @ARCHFLAGS@
     14LDFLAGS_PRE = $(shell pkg-config --libs gtk+-2.0) -DGTK2 @ARCHFLAGS@
    1515LDFLAGS_POST =  $(LEXERS)  $(SCINTILLA_LIB) -lstdc++
    1616
    17 ARCH=-arch i386
    18 CC = gcc
    19 LD = gcc
     17CC = @CC@
     18LD = @CC@
    2019AR = ar
    2120
    2221STATIC_LIB = lib$(LIB_NAME).a

  • src/gtkscintilla2/scintilla/gtk/makefile

    old new  
    77# Also works with ming32-make on Windows.
    88
    99.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
     10CC = @CXX@
     11CCOMP = @CC@
    1712AR = ar
    1813RANLIB = touch
    1914
    … …  
    3025
    3126INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
    3227#~ 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)
     28CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED) @ARCHFLAGS@
    3429
    3530ifdef NOTHREADS
    3631THREADFLAGS=-DG_THREADS_IMPL_NONE