diff options
| author | nyamatongwe <devnull@localhost> | 2004-04-04 09:59:37 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2004-04-04 09:59:37 +0000 |
| commit | db8c114fa3e0ddbed54b7b2bfb25918b6d346a8b (patch) | |
| tree | 882723e6662960cacd5433d36c0a6f431df2ef42 /gtk/makefile | |
| parent | 8e06a70ce520b8472118a719c51dfe9f59cb64de (diff) | |
| download | scintilla-mirror-db8c114fa3e0ddbed54b7b2bfb25918b6d346a8b.tar.gz | |
Patch from Johannes Schmid to make signals from Scintilla
work on AMD 64 where sizeof(int) != sizeof(void *).
Diffstat (limited to 'gtk/makefile')
| -rw-r--r-- | gtk/makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/makefile b/gtk/makefile index ba93f8dfc..a31c9a9de 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -7,8 +7,9 @@ # To force GTK+ 2 build, define GTK2 on the make command line. # To force GTK+ 1 build, define GTK1 on the make command line. -.SUFFIXES: .cxx .o .h .a +.SUFFIXES: .cxx .c .o .h .a CC = g++ +CCOMP = gcc AR = ar RANLIB = touch @@ -40,6 +41,7 @@ endif # pkg-config which is an OK indication that GTK2 is available ifdef GTK2 CONFIGFLAGS=pkg-config --cflags gtk+-2.0 +MARSHALLER=scintilla-marshal.o else ifdef GTK1 CONFIGFLAGS=gtk-config --cflags @@ -54,6 +56,8 @@ endif .cxx.o: $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< +.c.o: + $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $< #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=\\\n\(\*.o \) @@ -79,7 +83,7 @@ $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Docume ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \ KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ - $(LEXOBJS) + $(MARSHALLER) $(LEXOBJS) $(AR) rc $@ $^ $(RANLIB) $@ |