From 634dd5e319f686de5bdd94bdfeccf9b3759594f8 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 14 May 2017 09:44:57 +0000
Subject: [PATCH] ide: brc zstd option restored

git-svn-id: svn://ultimatepp.org/upp/trunk@11082 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/MacroManager.cpp | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/uppsrc/ide/Core/BinObj.cpp b/uppsrc/ide/Core/BinObj.cpp
index 8f78aa9e6..e61d4a938 100644
--- a/uppsrc/ide/Core/BinObj.cpp
+++ b/uppsrc/ide/Core/BinObj.cpp
@@ -11,8 +11,7 @@ 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; // Postponed until we
-//	have import.ext support in the MakeFile export
+	case BinObjInfo::Block::ENC_ZSTD: data = ZstdCompress(data); break;
 	}
 }
 
diff --git a/uppsrc/ide/Core/Core.h b/uppsrc/ide/Core/Core.h
index 92971224c..a87dcc931 100644
--- a/uppsrc/ide/Core/Core.h
+++ b/uppsrc/ide/Core/Core.h
@@ -5,7 +5,7 @@
 #include <plugin/bz2/bz2.h>
 #include <plugin/lz4/lz4.h>
 #include <plugin/lzma/lzma.h>
-// #include <plugin/zstd/zstd.h>
+#include <plugin/zstd/zstd.h>
 
 #include "Logger.h"
 
diff --git a/uppsrc/ide/Core/Core.upp b/uppsrc/ide/Core/Core.upp
index 696c35a01..5bd84b4fd 100644
--- a/uppsrc/ide/Core/Core.upp
+++ b/uppsrc/ide/Core/Core.upp
@@ -4,7 +4,8 @@ uses
 	Esc,
 	plugin/bz2,
 	plugin/lzma,
-	plugin/lz4;
+	plugin/lz4,
+	plugin/zstd;
 
 file
 	Core.h options(BUILDER_OPTION) PCH,
diff --git a/uppsrc/ide/MacroManager.cpp b/uppsrc/ide/MacroManager.cpp
index 9d8172fa0..d1da4206a 100644
--- a/uppsrc/ide/MacroManager.cpp
+++ b/uppsrc/ide/MacroManager.cpp
@@ -42,6 +42,7 @@ Image MacroElement::GetImage(Type type)
 		case(Type::UNKNOWN):
 			return Image();
 	}
+	return Image();
 }
 
 #define METHOD_NAME "MacroManagerWindow " << UPP_FUNCTION_NAME << "(): "