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

Unified Diff: build/SConscript.main

Issue 21401: Eliminate need for build_config.h for OS_* defines. (Closed)
Patch Set: Created 11 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/build_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/SConscript.main
diff --git a/build/SConscript.main b/build/SConscript.main
index c91ab4fc9e5da87d08d5e606a6ba084b0271b5ac..e276535b867a7a95d4b2b3df5bc5ec13d64495dd 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -311,6 +311,7 @@ windows_env.Replace(
CPPDEFINES = [
'_UNICODE',
'UNICODE',
+ 'OS_WIN',
],
@@ -464,6 +465,11 @@ linux_env.Append(
)
linux_env.Replace(
+ CPPDEFINES = [
+ 'OS_LINUX',
+ 'OS_POSIX',
+ ],
+
# Linking of large files uses lots of RAM, so serialize links
# using the handy flock command from util-linux.
LINK = 'flock $TARGET_ROOT/linker.lock ' + linux_env['LINK'],
@@ -672,6 +678,8 @@ mac_env.Append(
],
CPPDEFINES = [
'DEBUG',
+ 'OS_MACOSX',
+ 'OS_POSIX',
],
FRAMEWORKPATH = [
« no previous file with comments | « no previous file | build/build_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698