diff options
| author | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2024-05-14 00:00:00 +0000 |
|---|---|---|
| committer | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2024-05-15 23:55:04 +0500 |
| commit | fc662341e6f85da78ada0e443f6116b978f79f22 (patch) | |
| tree | 1be1cc402a7a9cbc18d4eeea6b141354c2d559e3 /C/Util/LzmaLib | |
| parent | 5b39dc76f1bc82f941d5c800ab9f34407a06b53a (diff) | |
| download | 7zip-24.05.tar.gz 7zip-24.05.tar.bz2 7zip-24.05.zip | |
24.0524.05
Diffstat (limited to '')
| -rw-r--r-- | C/Util/LzmaLib/Precomp.h | 13 | ||||
| -rw-r--r-- | C/Util/LzmaLib/makefile | 7 |
2 files changed, 12 insertions, 8 deletions
diff --git a/C/Util/LzmaLib/Precomp.h b/C/Util/LzmaLib/Precomp.h index bc8fa21..13a41ef 100644 --- a/C/Util/LzmaLib/Precomp.h +++ b/C/Util/LzmaLib/Precomp.h | |||
| @@ -1,14 +1,13 @@ | |||
| 1 | /* Precomp.h -- StdAfx | 1 | /* Precomp.h -- Precomp |
| 2 | 2023-03-04 : Igor Pavlov : Public domain */ | 2 | 2024-01-23 : Igor Pavlov : Public domain */ |
| 3 | 3 | ||
| 4 | #ifndef ZIP7_INC_PRECOMP_H | 4 | // #ifndef ZIP7_INC_PRECOMP_LOC_H |
| 5 | #define ZIP7_INC_PRECOMP_H | 5 | // #define ZIP7_INC_PRECOMP_LOC_H |
| 6 | 6 | ||
| 7 | #if defined(_MSC_VER) && _MSC_VER >= 1800 | 7 | #if defined(_MSC_VER) && _MSC_VER >= 1800 |
| 8 | #pragma warning(disable : 4464) // relative include path contains '..' | 8 | #pragma warning(disable : 4464) // relative include path contains '..' |
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | #include "../../Compiler.h" | 11 | #include "../../Precomp.h" |
| 12 | #include "../../7zTypes.h" | ||
| 13 | 12 | ||
| 14 | #endif | 13 | // #endif |
diff --git a/C/Util/LzmaLib/makefile b/C/Util/LzmaLib/makefile index b8e054e..9ed0aa4 100644 --- a/C/Util/LzmaLib/makefile +++ b/C/Util/LzmaLib/makefile | |||
| @@ -14,16 +14,19 @@ C_OBJS = \ | |||
| 14 | $O\CpuArch.obj \ | 14 | $O\CpuArch.obj \ |
| 15 | $O\LzFind.obj \ | 15 | $O\LzFind.obj \ |
| 16 | $O\LzFindMt.obj \ | 16 | $O\LzFindMt.obj \ |
| 17 | $O\LzFindOpt.obj \ | ||
| 18 | $O\LzmaDec.obj \ | 17 | $O\LzmaDec.obj \ |
| 19 | $O\LzmaEnc.obj \ | 18 | $O\LzmaEnc.obj \ |
| 20 | $O\LzmaLib.obj \ | 19 | $O\LzmaLib.obj \ |
| 21 | $O\Threads.obj \ | 20 | $O\Threads.obj \ |
| 22 | 21 | ||
| 22 | !include "../../../CPP/7zip/LzFindOpt.mak" | ||
| 23 | !include "../../../CPP/7zip/LzmaDec.mak" | ||
| 24 | |||
| 23 | OBJS = \ | 25 | OBJS = \ |
| 24 | $O\Precomp.obj \ | 26 | $O\Precomp.obj \ |
| 25 | $(LIB_OBJS) \ | 27 | $(LIB_OBJS) \ |
| 26 | $(C_OBJS) \ | 28 | $(C_OBJS) \ |
| 29 | $(ASM_OBJS) \ | ||
| 27 | $O\resource.res | 30 | $O\resource.res |
| 28 | 31 | ||
| 29 | !include "../../../CPP/Build.mak" | 32 | !include "../../../CPP/Build.mak" |
| @@ -52,3 +55,5 @@ $(C_OBJS): ../../$(*B).c | |||
| 52 | $(CCOMPLB_USE) | 55 | $(CCOMPLB_USE) |
| 53 | 56 | ||
| 54 | !ENDIF | 57 | !ENDIF |
| 58 | |||
| 59 | !include "../../Asm_c.mak" | ||