diff options
| author | nyamatongwe <devnull@localhost> | 2002-07-07 10:11:57 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2002-07-07 10:11:57 +0000 |
| commit | ecc91fddebf3ec7f027e1b1d1d5b6be47d1d87a9 (patch) | |
| tree | 75551c135f8808c8acf4b0dec6c7e0fef582cc0f /gtk/makefile | |
| parent | edf9afe6a888c751d33cde630a5a1bde5e265211 (diff) | |
| download | scintilla-mirror-ecc91fddebf3ec7f027e1b1d1d5b6be47d1d87a9.tar.gz | |
Made compatible with either GTK+ 1.x or GTK+ 2.x.
Diffstat (limited to 'gtk/makefile')
| -rw-r--r-- | gtk/makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gtk/makefile b/gtk/makefile index 7312ad14d..5b7a3cf28 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -29,8 +29,14 @@ else CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) endif +ifdef GTK2 +CONFIGFLAGS=pkg-config --cflags gtk+-2.0 +else +CONFIGFLAGS=gtk-config --cflags +endif + .cxx.o: - $(CC) `gtk-config --cflags` $(CXXFLAGS) -c $< + $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=\\\n\(\*.o \) @@ -48,7 +54,7 @@ clean: rm -f *.o $(COMPLIB) deps: - $(CC) -MM `gtk-config --cflags` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak + $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \ ScintillaBase.o ContractionState.o Editor.o PropSet.o PlatGTK.o \ |