Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Side by Side Diff: build/build_config.h

Issue 10704039: Add iOS support to common.gypi (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixing branch diffing Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | build/common.gypi » ('j') | build/common.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file adds defines about the platform we're currently building on. 5 // This file adds defines about the platform we're currently building on.
6 // Operating System: 6 // Operating System:
7 // OS_WIN / OS_MACOSX / OS_LINUX / OS_POSIX (MACOSX or LINUX) 7 // OS_WIN / OS_MACOSX / OS_LINUX / OS_POSIX (MACOSX or LINUX)
8 // Compiler: 8 // Compiler:
9 // COMPILER_MSVC / COMPILER_GCC 9 // COMPILER_MSVC / COMPILER_GCC
10 // Processor: 10 // Processor:
11 // ARCH_CPU_X86 / ARCH_CPU_X86_64 / ARCH_CPU_X86_FAMILY (X86 or X86_64) 11 // ARCH_CPU_X86 / ARCH_CPU_X86_64 / ARCH_CPU_X86_FAMILY (X86 or X86_64)
12 // ARCH_CPU_32_BITS / ARCH_CPU_64_BITS 12 // ARCH_CPU_32_BITS / ARCH_CPU_64_BITS
13 13
14 #ifndef BUILD_BUILD_CONFIG_H_ 14 #ifndef BUILD_BUILD_CONFIG_H_
15 #define BUILD_BUILD_CONFIG_H_ 15 #define BUILD_BUILD_CONFIG_H_
16 16
17 // A set of macros to use for platform detection. 17 // A set of macros to use for platform detection.
18 #if defined(__APPLE__) 18 #if defined(__APPLE__)
19 #define OS_MACOSX 1 19 #define OS_MACOSX 1
20 #if defined(MAC_TGT_IOS)
Mark Mentovai 2012/06/29 13:31:25 Who defines this?
21 #define OS_IOS 1
22 #endif // defined(MAC_TGT_IOS)
20 #elif defined(ANDROID) 23 #elif defined(ANDROID)
21 #define OS_ANDROID 1 24 #define OS_ANDROID 1
22 #elif defined(__native_client__) 25 #elif defined(__native_client__)
23 #define OS_NACL 1 26 #define OS_NACL 1
24 #elif defined(__linux__) 27 #elif defined(__linux__)
25 #define OS_LINUX 1 28 #define OS_LINUX 1
26 // Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined. 29 // Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined.
27 #if !defined(TOOLKIT_VIEWS) 30 #if !defined(TOOLKIT_VIEWS)
28 #define TOOLKIT_GTK 31 #define TOOLKIT_GTK
29 #endif 32 #endif
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 #elif defined(_M_IX86) || defined(__i386__) 95 #elif defined(_M_IX86) || defined(__i386__)
93 #define ARCH_CPU_X86_FAMILY 1 96 #define ARCH_CPU_X86_FAMILY 1
94 #define ARCH_CPU_X86 1 97 #define ARCH_CPU_X86 1
95 #define ARCH_CPU_32_BITS 1 98 #define ARCH_CPU_32_BITS 1
96 #define ARCH_CPU_LITTLE_ENDIAN 1 99 #define ARCH_CPU_LITTLE_ENDIAN 1
97 #elif defined(__ARMEL__) 100 #elif defined(__ARMEL__)
98 #define ARCH_CPU_ARM_FAMILY 1 101 #define ARCH_CPU_ARM_FAMILY 1
99 #define ARCH_CPU_ARMEL 1 102 #define ARCH_CPU_ARMEL 1
100 #define ARCH_CPU_32_BITS 1 103 #define ARCH_CPU_32_BITS 1
101 #define ARCH_CPU_LITTLE_ENDIAN 1 104 #define ARCH_CPU_LITTLE_ENDIAN 1
105 #if !defined(OS_IOS)
102 #define WCHAR_T_IS_UNSIGNED 1 106 #define WCHAR_T_IS_UNSIGNED 1
Mark Mentovai 2012/06/29 13:31:25 I don’t think this belong in this section to begin
stuartmorgan 2012/06/29 14:58:25 Done
107 #endif
103 #elif defined(__pnacl__) 108 #elif defined(__pnacl__)
104 #define ARCH_CPU_32_BITS 1 109 #define ARCH_CPU_32_BITS 1
105 #elif defined(__MIPSEL__) 110 #elif defined(__MIPSEL__)
106 #define ARCH_CPU_MIPS_FAMILY 1 111 #define ARCH_CPU_MIPS_FAMILY 1
107 #define ARCH_CPU_MIPSEL 1 112 #define ARCH_CPU_MIPSEL 1
108 #define ARCH_CPU_32_BITS 1 113 #define ARCH_CPU_32_BITS 1
109 #define ARCH_CPU_LITTLE_ENDIAN 1 114 #define ARCH_CPU_LITTLE_ENDIAN 1
110 #define WCHAR_T_IS_UNSIGNED 0 115 #define WCHAR_T_IS_UNSIGNED 0
111 #else 116 #else
112 #error Please add support for your architecture in build/build_config.h 117 #error Please add support for your architecture in build/build_config.h
(...skipping 27 matching lines...) Expand all
140 #if defined(OS_ANDROID) 145 #if defined(OS_ANDROID)
141 // The compiler thinks std::string::const_iterator and "const char*" are 146 // The compiler thinks std::string::const_iterator and "const char*" are
142 // equivalent types. 147 // equivalent types.
143 #define STD_STRING_ITERATOR_IS_CHAR_POINTER 148 #define STD_STRING_ITERATOR_IS_CHAR_POINTER
144 // The compiler thinks base::string16::const_iterator and "char16*" are 149 // The compiler thinks base::string16::const_iterator and "char16*" are
145 // equivalent types. 150 // equivalent types.
146 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER 151 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER
147 #endif 152 #endif
148 153
149 #endif // BUILD_BUILD_CONFIG_H_ 154 #endif // BUILD_BUILD_CONFIG_H_
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698