summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Klinghed <the_jk@yahoo.com>2017-09-28 18:41:08 +0200
committerJoel Klinghed <the_jk@yahoo.com>2017-09-28 18:41:08 +0200
commitb9940e65f978b6a3980ae0b27169eb1e913fc39b (patch)
tree4ae6ed077e606c102bb8c733789ade5ecad03d8a
parentbad43b3899afd92738b5bfb4294f9c89e3677e7c (diff)
Update emacs-stark with chromium c++ fixes
Ignore unused parameter warnings, they are common in chromium header files Use new output directories used by gradle builds Remove unneccesary calls to make-local-variable
-rw-r--r--emacs-stark16
1 files changed, 7 insertions, 9 deletions
diff --git a/emacs-stark b/emacs-stark
index 3e85ce7..07ab0cb 100644
--- a/emacs-stark
+++ b/emacs-stark
@@ -258,6 +258,7 @@
(make-variable-buffer-local 'flycheck-clang-definitions)
(make-variable-buffer-local 'flycheck-clang-include-path)
(make-variable-buffer-local 'flycheck-clang-language-standard)
+(make-variable-buffer-local 'flycheck-clang-warnings)
(add-hook 'c++-mode-hook
(lambda()
@@ -268,27 +269,24 @@
(when (and buffer-file-name
(string-match "/chromium/src/" buffer-file-name))
(let ((base (get-base-dir (file-name-directory buffer-file-name) "src")))
- (make-local-variable 'flycheck-clang-language-standard)
- (make-local-variable 'flycheck-clang-include-path)
(setq flycheck-clang-language-standard "c++11"
flycheck-clang-definitions (list "OS_ANDROID")
+ flycheck-clang-warnings (list "no-unused-parameter")
flycheck-clang-include-path (list base
- (concat base "/out_wam_armv7/Debug/gen")
- (concat base "/out_wam_armv7/Release/gen"))))
+ (concat base "/out_gradle/BetaArm7Debug/gen")
+ (concat base "/out_gradle/BetaArm7Release/gen"))))
(require 'google-c-style)
(c-add-style "Google" google-c-style t))
;; ofa hook
(when (and buffer-file-name
(string-match "/mobile/mobile/" buffer-file-name))
(let ((base (get-base-dir (file-name-directory buffer-file-name) "mobile")))
- (make-local-variable 'flycheck-clang-language-standard)
- (make-local-variable 'flycheck-clang-definitions)
- (make-local-variable 'flycheck-clang-include-path)
(setq flycheck-clang-language-standard "c++11"
flycheck-clang-definitions (list "OS_ANDROID")
+ flycheck-clang-warnings (list "no-unused-parameter")
flycheck-clang-include-path (list base (concat base "/../../chromium/src")
- (concat base "/../../chromium/src/out_wam_armv7/Debug/gen")
- (concat base "/../../chromium/src/out_wam_armv7/Release/gen"))))
+ (concat base "/../../chromium/src/out_gradle/BetaArm7Debug/gen")
+ (concat base "/../../chromium/src/out_gradle/BetaArm7Release/gen"))))
(require 'google-c-style)
(c-add-style "Google" google-c-style t))))