summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-31 21:02:47 +0000
committerevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-31 21:02:47 +0000
commite466e1397d0462ed58e3307cec829d75bac6ed55 (patch)
tree3c39a13aa700a123d30b29891b59b438e2da2c7f /third_party
parentb97675f4c7d3c951145ded0a60223ed3bb3193b7 (diff)
downloadchromium_src-e466e1397d0462ed58e3307cec829d75bac6ed55.zip
chromium_src-e466e1397d0462ed58e3307cec829d75bac6ed55.tar.gz
chromium_src-e466e1397d0462ed58e3307cec829d75bac6ed55.tar.bz2
Linux SCons fix for LZMA.
Now everything in third_party but libxml builds. (libxml will require some effort.) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/lzma_sdk/SConscript7
1 files changed, 6 insertions, 1 deletions
diff --git a/third_party/lzma_sdk/SConscript b/third_party/lzma_sdk/SConscript
index 74fb2de..537d45f 100644
--- a/third_party/lzma_sdk/SConscript
+++ b/third_party/lzma_sdk/SConscript
@@ -28,6 +28,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Import('env')
+Import('PLATFORM')
env = env.Clone(
)
@@ -44,11 +45,15 @@ env.Append(
'_LZMA_PROB32',
'_LZMA_IN_CB',
],
+)
+
+if PLATFORM == 'WINDOWS':
+ env.Append(
CCFLAGS = [
'/TC',
'/wd4800',
],
-)
+ )
input_files = [
'Compress/Lzma/LzmaDecode.c',