diff options
| author | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2023-06-21 00:00:00 +0000 |
|---|---|---|
| committer | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2023-12-17 14:59:19 +0500 |
| commit | 5b39dc76f1bc82f941d5c800ab9f34407a06b53a (patch) | |
| tree | fe5e17420300b715021a76328444088d32047963 /C/Util/LzmaLib | |
| parent | 93be7d4abfd4233228f58ee1fbbcd76d91be66a4 (diff) | |
| download | 7zip-23.01.tar.gz 7zip-23.01.tar.bz2 7zip-23.01.zip | |
23.0123.01
Diffstat (limited to 'C/Util/LzmaLib')
| -rw-r--r-- | C/Util/LzmaLib/LzmaLib.dsp | 20 | ||||
| -rw-r--r-- | C/Util/LzmaLib/LzmaLibExports.c | 13 | ||||
| -rw-r--r-- | C/Util/LzmaLib/Precomp.c | 4 | ||||
| -rw-r--r-- | C/Util/LzmaLib/Precomp.h | 14 | ||||
| -rw-r--r-- | C/Util/LzmaLib/makefile | 22 |
5 files changed, 65 insertions, 8 deletions
diff --git a/C/Util/LzmaLib/LzmaLib.dsp b/C/Util/LzmaLib/LzmaLib.dsp index 6ce91dc..bacd967 100644 --- a/C/Util/LzmaLib/LzmaLib.dsp +++ b/C/Util/LzmaLib/LzmaLib.dsp | |||
| @@ -101,6 +101,10 @@ SOURCE=.\LzmaLib.def | |||
| 101 | 101 | ||
| 102 | SOURCE=.\LzmaLibExports.c | 102 | SOURCE=.\LzmaLibExports.c |
| 103 | # End Source File | 103 | # End Source File |
| 104 | # Begin Source File | ||
| 105 | |||
| 106 | SOURCE=.\Precomp.h | ||
| 107 | # End Source File | ||
| 104 | # End Group | 108 | # End Group |
| 105 | # Begin Source File | 109 | # Begin Source File |
| 106 | 110 | ||
| @@ -108,6 +112,10 @@ SOURCE=..\..\7zTypes.h | |||
| 108 | # End Source File | 112 | # End Source File |
| 109 | # Begin Source File | 113 | # Begin Source File |
| 110 | 114 | ||
| 115 | SOURCE=..\..\7zWindows.h | ||
| 116 | # End Source File | ||
| 117 | # Begin Source File | ||
| 118 | |||
| 111 | SOURCE=..\..\Alloc.c | 119 | SOURCE=..\..\Alloc.c |
| 112 | # End Source File | 120 | # End Source File |
| 113 | # Begin Source File | 121 | # Begin Source File |
| @@ -116,6 +124,14 @@ SOURCE=..\..\Alloc.h | |||
| 116 | # End Source File | 124 | # End Source File |
| 117 | # Begin Source File | 125 | # Begin Source File |
| 118 | 126 | ||
| 127 | SOURCE=..\..\Compiler.h | ||
| 128 | # End Source File | ||
| 129 | # Begin Source File | ||
| 130 | |||
| 131 | SOURCE=..\..\CpuArch.h | ||
| 132 | # End Source File | ||
| 133 | # Begin Source File | ||
| 134 | |||
| 119 | SOURCE=..\..\IStream.h | 135 | SOURCE=..\..\IStream.h |
| 120 | # End Source File | 136 | # End Source File |
| 121 | # Begin Source File | 137 | # Begin Source File |
| @@ -168,6 +184,10 @@ SOURCE=..\..\LzmaLib.h | |||
| 168 | # End Source File | 184 | # End Source File |
| 169 | # Begin Source File | 185 | # Begin Source File |
| 170 | 186 | ||
| 187 | SOURCE=..\..\Precomp.h | ||
| 188 | # End Source File | ||
| 189 | # Begin Source File | ||
| 190 | |||
| 171 | SOURCE=.\resource.rc | 191 | SOURCE=.\resource.rc |
| 172 | # End Source File | 192 | # End Source File |
| 173 | # Begin Source File | 193 | # Begin Source File |
diff --git a/C/Util/LzmaLib/LzmaLibExports.c b/C/Util/LzmaLib/LzmaLibExports.c index 4a28a9a..a46c9a8 100644 --- a/C/Util/LzmaLib/LzmaLibExports.c +++ b/C/Util/LzmaLib/LzmaLibExports.c | |||
| @@ -1,14 +1,15 @@ | |||
| 1 | /* LzmaLibExports.c -- LZMA library DLL Entry point | 1 | /* LzmaLibExports.c -- LZMA library DLL Entry point |
| 2 | 2015-11-08 : Igor Pavlov : Public domain */ | 2 | 2023-03-05 : Igor Pavlov : Public domain */ |
| 3 | 3 | ||
| 4 | #include "../../Precomp.h" | 4 | #include "Precomp.h" |
| 5 | 5 | ||
| 6 | #include <windows.h> | 6 | #include "../../7zWindows.h" |
| 7 | 7 | ||
| 8 | BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved); | ||
| 8 | BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) | 9 | BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) |
| 9 | { | 10 | { |
| 10 | UNUSED_VAR(hInstance); | 11 | UNUSED_VAR(hInstance) |
| 11 | UNUSED_VAR(dwReason); | 12 | UNUSED_VAR(dwReason) |
| 12 | UNUSED_VAR(lpReserved); | 13 | UNUSED_VAR(lpReserved) |
| 13 | return TRUE; | 14 | return TRUE; |
| 14 | } | 15 | } |
diff --git a/C/Util/LzmaLib/Precomp.c b/C/Util/LzmaLib/Precomp.c new file mode 100644 index 0000000..01605e3 --- /dev/null +++ b/C/Util/LzmaLib/Precomp.c | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | /* Precomp.c -- StdAfx | ||
| 2 | 2013-01-21 : Igor Pavlov : Public domain */ | ||
| 3 | |||
| 4 | #include "Precomp.h" | ||
diff --git a/C/Util/LzmaLib/Precomp.h b/C/Util/LzmaLib/Precomp.h new file mode 100644 index 0000000..bc8fa21 --- /dev/null +++ b/C/Util/LzmaLib/Precomp.h | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | /* Precomp.h -- StdAfx | ||
| 2 | 2023-03-04 : Igor Pavlov : Public domain */ | ||
| 3 | |||
| 4 | #ifndef ZIP7_INC_PRECOMP_H | ||
| 5 | #define ZIP7_INC_PRECOMP_H | ||
| 6 | |||
| 7 | #if defined(_MSC_VER) && _MSC_VER >= 1800 | ||
| 8 | #pragma warning(disable : 4464) // relative include path contains '..' | ||
| 9 | #endif | ||
| 10 | |||
| 11 | #include "../../Compiler.h" | ||
| 12 | #include "../../7zTypes.h" | ||
| 13 | |||
| 14 | #endif | ||
diff --git a/C/Util/LzmaLib/makefile b/C/Util/LzmaLib/makefile index b36f1de..b8e054e 100644 --- a/C/Util/LzmaLib/makefile +++ b/C/Util/LzmaLib/makefile | |||
| @@ -21,6 +21,7 @@ C_OBJS = \ | |||
| 21 | $O\Threads.obj \ | 21 | $O\Threads.obj \ |
| 22 | 22 | ||
| 23 | OBJS = \ | 23 | OBJS = \ |
| 24 | $O\Precomp.obj \ | ||
| 24 | $(LIB_OBJS) \ | 25 | $(LIB_OBJS) \ |
| 25 | $(C_OBJS) \ | 26 | $(C_OBJS) \ |
| 26 | $O\resource.res | 27 | $O\resource.res |
| @@ -30,7 +31,24 @@ OBJS = \ | |||
| 30 | $(SLIBPATH): $O $(OBJS) | 31 | $(SLIBPATH): $O $(OBJS) |
| 31 | lib -out:$(SLIBPATH) $(OBJS) $(LIBS) | 32 | lib -out:$(SLIBPATH) $(OBJS) $(LIBS) |
| 32 | 33 | ||
| 34 | |||
| 35 | MAK_SINGLE_FILE = 1 | ||
| 36 | |||
| 37 | $O\Precomp.obj: Precomp.c | ||
| 38 | $(CCOMPL_PCH) | ||
| 39 | |||
| 40 | !IFDEF MAK_SINGLE_FILE | ||
| 41 | |||
| 33 | $(LIB_OBJS): $(*B).c | 42 | $(LIB_OBJS): $(*B).c |
| 34 | $(COMPL_O2) | 43 | $(CCOMPL_USE) |
| 35 | $(C_OBJS): ../../$(*B).c | 44 | $(C_OBJS): ../../$(*B).c |
| 36 | $(COMPL_O2) | 45 | $(CCOMPL_USE) |
| 46 | |||
| 47 | !ELSE | ||
| 48 | |||
| 49 | {.}.c{$O}.obj:: | ||
| 50 | $(CCOMPLB_USE) | ||
| 51 | {../../../C}.c{$O}.obj:: | ||
| 52 | $(CCOMPLB_USE) | ||
| 53 | |||
| 54 | !ENDIF | ||
