aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuto Ikuta <tikuta@chromium.org>2023-07-18 06:48:11 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-07-18 06:48:11 +0000
commit30bdb85e302ecfc52593636b2f44af438e05e784 (patch)
treef96d6154ada78be34d9049bc60699c87daa80665
parent98bd5133d667468d42fc37d565a2a78d3c7d8fee (diff)
parentd7331f4ee457c4fd4a5320e0fe8a7bab2f36ddfd (diff)
downloadlibjpeg-turbo-30bdb85e302ecfc52593636b2f44af438e05e784.tar.gz
Merge "fix inputs for some included files" into main
-rw-r--r--BUILD.gn11
1 files changed, 9 insertions, 2 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 524890a2..b39d2783 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -11,7 +11,9 @@ if (current_cpu == "arm" || current_cpu == "arm64") {
import("//build/config/arm.gni")
}
-assert(use_blink, "This is not used on if blink is not enabled, don't drag it in unintentionally")
+assert(
+ use_blink,
+ "This is not used if blink is not enabled, don't drag it in unintentionally")
source_set("libjpeg_headers") {
sources = [
@@ -31,6 +33,11 @@ if (current_cpu == "x86" || current_cpu == "x64") {
defines = []
include_dirs = [ "simd/nasm/" ]
+ inputs = [
+ "simd/nasm/jdct.inc",
+ "simd/nasm/jsimdext.inc",
+ ]
+
if (current_cpu == "x86") {
include_dirs += [ "simd/i386/" ]
sources = [
@@ -347,7 +354,7 @@ if (build_with_chromium) {
configs += [ "//build/config/compiler:no_chromium_code" ]
if (is_win) {
- cflags = ["-U_CRT_SECURE_NO_DEPRECATE"]
+ cflags = [ "-U_CRT_SECURE_NO_DEPRECATE" ]
}
}
}