mirror of
https://github.com/YACReader/yacreader
synced 2025-05-28 03:10:27 -04:00
Don't use p7zip in 7z_includes.h
This commit is contained in:
parent
27b7176e41
commit
c8dbbaecea
@ -1,8 +1,6 @@
|
||||
#ifndef _7Z_INCLUDES_H
|
||||
#define _7Z_INCLUDES_H
|
||||
|
||||
// WIN includes
|
||||
#ifdef Q_OS_WIN
|
||||
extern "C" {
|
||||
#include "lib7zip/C/Alloc.h"
|
||||
#include "lib7zip/C/7zTypes.h"
|
||||
@ -28,47 +26,4 @@ extern "C" {
|
||||
#include "lib7zip/CPP/7zip/Common/StreamObjects.h"
|
||||
#include "lib7zip/CPP/7zip/Common/StreamUtils.h"
|
||||
|
||||
#else
|
||||
// POSIX includes
|
||||
|
||||
extern "C" {
|
||||
#include "libp7zip/C/Alloc.h"
|
||||
#include "libp7zip/C/7zTypes.h"
|
||||
}
|
||||
|
||||
#include "libp7zip/CPP/Windows/Defs.h"
|
||||
|
||||
#include "libp7zip/CPP/Common/Common.h"
|
||||
#include "libp7zip/CPP/Common/MyCom.h"
|
||||
|
||||
// macos
|
||||
// typedef int BOOL; ---> typedef signed char BOOL;
|
||||
#include "libp7zip/CPP/include_windows/windows.h"
|
||||
#include "libp7zip/CPP/include_windows/basetyps.h"
|
||||
#include "libp7zip/CPP/include_windows/tchar.h"
|
||||
|
||||
#include "libp7zip/CPP/Common/MyWindows.h"
|
||||
|
||||
#include "libp7zip/CPP/Common/StringConvert.h"
|
||||
|
||||
#include "libp7zip/CPP/7zip/Archive/IArchive.h"
|
||||
|
||||
#include "libp7zip/CPP/7zip/IStream.h"
|
||||
#include "libp7zip/CPP/7zip/IPassword.h"
|
||||
#include "libp7zip/CPP/7zip/IProgress.h"
|
||||
|
||||
#include "libp7zip/CPP/7zip/Common/FileStreams.h"
|
||||
|
||||
#include "libp7zip/CPP/7zip/MyVersion.h"
|
||||
|
||||
#include "libp7zip/CPP/Windows/PropVariant.h"
|
||||
#include "libp7zip/CPP/Windows/PropVariantConv.h"
|
||||
|
||||
#include "libp7zip/CPP/7zip/Common/StreamObjects.h"
|
||||
#include "libp7zip/CPP/7zip/Common/StreamUtils.h"
|
||||
|
||||
#include "libp7zip/CPP/7zip/ICoder.h"
|
||||
|
||||
#endif
|
||||
|
||||
#endif // _7Z_INCLUDES_H
|
||||
|
Loading…
Reference in New Issue
Block a user