diff options
author | Brendan Taylor <whateley@gmail.com> | 2010-12-31 20:25:05 -0700 |
---|---|---|
committer | Brendan Taylor <whateley@gmail.com> | 2010-12-31 20:25:05 -0700 |
commit | 3fdac9c8bc8be051524ce09f6b0affd38f2d93f8 (patch) | |
tree | 60fab4f3769452c7d8d501c3ec1d77453d335b66 /Makefile | |
parent | 8c8bd0fbd5644d91ff3cdd2b13c07f28e7e0f716 (diff) | |
parent | 4164140730a92a5abfda5545a9ff5ce2e44776cb (diff) |
Merge remote branch 'keis/gtk3' into experimental
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -9,12 +9,12 @@ DOCDIR?=$(INSTALLDIR)/share/uzbl/docs RUN_PREFIX?=$(PREFIX) # gtk2 -REQ_PKGS = gtk+-2.0 webkit-1.0 +REQ_PKGS += gtk+-2.0 webkit-1.0 CPPFLAGS = # gtk3 -#REQ_PKGS = gtk+-3.0 webkitgtk-3.0 -#CPPFLAGS = -DGTK3 +#REQ_PKGS += gtk+-3.0 webkitgtk-3.0 +#CPPFLAGS = -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED # --- configuration ends here --- |