Commit 007be813bac4c5baf4a3963bf92898fd2e05449c - mozc

Move additional_defines to defines.gypi BUG= TEST= REF_BUG=27112494 REF_CL=115410998 REF_TIME=2016-02-24T12:49:23+09:00 REF_TIME_RAW=1456285763 +0900 Hiroyuki Komatsu 8 years ago

3 changed file(s) with 3 addition(s) and 7 deletion(s). Raw diff Collapse all Expand all

-6

src/gyp/common.gypi less more

107	107	'-pthread',
108	108	],
109	109
110		# Extra defines
111		'additional_defines%': [],
112
113	110	# Extra headers and libraries for Visual C++.
114	111	'msvs_includes%': [],
115	112	'msvs_libs_x86%': [],

432	429	],
433	430	},
434	431	'default_configuration': 'Debug',
435		'defines': [
436		'<@(additional_defines)',
437		],
438	432	'include_dirs': [
439	433	'<(abs_depth)',
440	434	'<(SHARED_INTERMEDIATE_DIR)',

-0

src/gyp/defines.gypi less more

81	81	'use_libibus%': '0',
82	82	},
83	83	'target_defaults': {
	84	'defines': [
	85	],
84	86	'conditions': [
85	87	['branding=="GoogleJapaneseInput"', {
86	88	'defines': ['GOOGLE_JAPANESE_INPUT_BUILD'],

-1

src/mozc_version_template.txt less more

0	0	MAJOR=2
1	1	MINOR=17
2		BUILD=2506
	2	BUILD=2507
3	3	REVISION=102
4	4	# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
5	5	# downloaded by NaCl Mozc.