From 72e7c17acc1f90aa443affb9670fd82d5054378d Mon Sep 17 00:00:00 2001 From: cxl Date: Fri, 12 May 2017 14:07:47 +0000 Subject: [PATCH] ide: Zstd option removed from brc options until makefile generation is resolved git-svn-id: svn://ultimatepp.org/upp/trunk@11076 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/Core/BinObj.cpp | 3 ++- uppsrc/ide/Core/Core.h | 2 +- uppsrc/ide/Core/Core.upp | 3 +-- uppsrc/ide/ide.upp | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/uppsrc/ide/Core/BinObj.cpp b/uppsrc/ide/Core/BinObj.cpp index e61d4a938..8f78aa9e6 100644 --- a/uppsrc/ide/Core/BinObj.cpp +++ b/uppsrc/ide/Core/BinObj.cpp @@ -11,7 +11,8 @@ void BinObjInfo::Block::Compress(String& data) case BinObjInfo::Block::ENC_ZIP: data = ZCompress(data); break; case BinObjInfo::Block::ENC_LZ4: data = LZ4Compress(data); break; case BinObjInfo::Block::ENC_LZMA: data = LZMACompress(data); break; - case BinObjInfo::Block::ENC_ZSTD: data = ZstdCompress(data); break; +// case BinObjInfo::Block::ENC_ZSTD: data = ZstdCompress(data); break; // Postponed until we +// have import.ext support in the MakeFile export } } diff --git a/uppsrc/ide/Core/Core.h b/uppsrc/ide/Core/Core.h index a87dcc931..92971224c 100644 --- a/uppsrc/ide/Core/Core.h +++ b/uppsrc/ide/Core/Core.h @@ -5,7 +5,7 @@ #include #include #include -#include +// #include #include "Logger.h" diff --git a/uppsrc/ide/Core/Core.upp b/uppsrc/ide/Core/Core.upp index 5bd84b4fd..696c35a01 100644 --- a/uppsrc/ide/Core/Core.upp +++ b/uppsrc/ide/Core/Core.upp @@ -4,8 +4,7 @@ uses Esc, plugin/bz2, plugin/lzma, - plugin/lz4, - plugin/zstd; + plugin/lz4; file Core.h options(BUILDER_OPTION) PCH, diff --git a/uppsrc/ide/ide.upp b/uppsrc/ide/ide.upp index 2d926a2b2..64333f929 100644 --- a/uppsrc/ide/ide.upp +++ b/uppsrc/ide/ide.upp @@ -19,8 +19,7 @@ uses TabBar, ide/Designers, ide/Android, - ide/Java, - plugin/zstd; + ide/Java; uses(POSIX) ide\SrcUpdater;