From 2d9390df9fc0f63eb3254c841fb6462782a24bd8 Mon Sep 17 00:00:00 2001 From: scribam Date: Fri, 24 Apr 2020 19:33:27 +0200 Subject: [PATCH] Enable 7zArchive for MSVC --- core/archive/7zArchive.h | 2 ++ core/archive/archive.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/archive/7zArchive.h b/core/archive/7zArchive.h index 2d6d52832..1e6e9ba60 100644 --- a/core/archive/7zArchive.h +++ b/core/archive/7zArchive.h @@ -24,6 +24,8 @@ #include "deps/lzma/7z.h" #include "deps/lzma/7zFile.h" +#include + class SzArchive : public Archive { public: diff --git a/core/archive/archive.cpp b/core/archive/archive.cpp index d6bb78ef3..973e320fe 100644 --- a/core/archive/archive.cpp +++ b/core/archive/archive.cpp @@ -20,8 +20,8 @@ */ #include "archive.h" -#ifndef _MSC_VER #include "7zArchive.h" +#ifndef _MSC_VER #include "ZipArchive.h" #endif @@ -29,12 +29,12 @@ Archive *OpenArchive(const char *path) { std::string base_path(path); -#ifndef _MSC_VER Archive *sz_archive = new SzArchive(); if (sz_archive->Open(base_path.c_str()) || sz_archive->Open((base_path + ".7z").c_str()) || sz_archive->Open((base_path + ".7Z").c_str())) return sz_archive; delete sz_archive; +#ifndef _MSC_VER Archive *zip_archive = new ZipArchive(); if (zip_archive->Open(base_path.c_str()) || zip_archive->Open((base_path + ".zip").c_str()) || zip_archive->Open((base_path + ".ZIP").c_str())) return zip_archive;