Browse Source

Clarify locations of our own LZMA files.

Martijn Laan 1 year ago
parent
commit
2aa750d35b

+ 2 - 2
Projects/Src/LZMADecomp.pas

@@ -93,8 +93,8 @@ const
     size the compiler currently allows. }
   MaxDictionarySize = 1024 shl 20;  { 1 GB }
 
-{$L Src\Lzma2\Decoder\ISLzmaDec.obj}
-{$L Src\Lzma2\Decoder\ISLzma2Dec.obj}
+{$L Src\Setup\Lzma2Decode\ISLzmaDec.obj}
+{$L Src\Setup\Lzma2Decode\ISLzma2Dec.obj}
 
 function IS_LzmaDec_Init(var state: TLZMA1InternalDecoderState;
   stateSize: Cardinal; const props; propsSize: Cardinal;

+ 1 - 1
Projects/Src/LZMADecompSmall.pas

@@ -80,7 +80,7 @@ end;
 
 { TLZMA1SmallDecompressor }
 
-{$L Src\LzmaDecode\LzmaDecodeInno.obj}
+{$L Src\SetupLdr\LzmaDecode\LzmaDecodeInno.obj}
 
 type
   TLzmaInCallback = record

+ 0 - 0
Projects/Src/Lzma2/Decoder/ISLzma2Dec.c → Projects/Src/Setup/Lzma2Decode/ISLzma2Dec.c


+ 0 - 0
Projects/Src/Lzma2/Decoder/ISLzma2Dec.obj → Projects/Src/Setup/Lzma2Decode/ISLzma2Dec.obj


+ 0 - 0
Projects/Src/Lzma2/Decoder/ISLzmaDec.c → Projects/Src/Setup/Lzma2Decode/ISLzmaDec.c


+ 0 - 0
Projects/Src/Lzma2/Decoder/ISLzmaDec.obj → Projects/Src/Setup/Lzma2Decode/ISLzmaDec.obj


+ 0 - 0
Projects/Src/Lzma2/Decoder/compiling.txt → Projects/Src/Setup/Lzma2Decode/compiling.txt


+ 0 - 0
Projects/Src/LzmaDecode/LzmaDecode.h → Projects/Src/SetupLdr/LzmaDecode/LzmaDecode.h


+ 0 - 0
Projects/Src/LzmaDecode/LzmaDecodeInno.c → Projects/Src/SetupLdr/LzmaDecode/LzmaDecodeInno.c


+ 0 - 0
Projects/Src/LzmaDecode/LzmaDecodeInno.obj → Projects/Src/SetupLdr/LzmaDecode/LzmaDecodeInno.obj


+ 0 - 0
Projects/Src/LzmaDecode/LzmaDecodeSize.c → Projects/Src/SetupLdr/LzmaDecode/LzmaDecodeSize.c


+ 0 - 0
Projects/Src/LzmaDecode/LzmaTypes.h → Projects/Src/SetupLdr/LzmaDecode/LzmaTypes.h


+ 0 - 0
Projects/Src/LzmaDecode/compiling.txt → Projects/Src/SetupLdr/LzmaDecode/compiling.txt


+ 0 - 0
Projects/Src/Lzma2/Encoder/islzma.c → Projects/islzma/islzma.c


+ 0 - 0
Projects/Src/Lzma2/Encoder/islzma.def → Projects/islzma/islzma.def


+ 0 - 0
Projects/Src/Lzma2/Encoder/islzma.h → Projects/islzma/islzma.h


+ 0 - 0
Projects/Src/Lzma2/Encoder/islzma.sln → Projects/islzma/islzma.sln


+ 0 - 0
Projects/Src/Lzma2/Encoder/islzma.vcproj → Projects/islzma/islzma.vcproj


+ 0 - 0
Projects/Src/Lzma2/Encoder/islzma_dll.c → Projects/islzma/islzma_dll.c


+ 0 - 0
Projects/Src/Lzma2/Encoder/islzma_exe.c → Projects/islzma/islzma_exe.c


+ 0 - 0
Projects/Src/Lzma2/Encoder/islzma_exe.vcproj → Projects/islzma/islzma_exe.vcproj


+ 7 - 7
README.md

@@ -203,7 +203,7 @@ from the bzlib directory in the iscompress repository.
 from the zlib-dll directory in the iscompress repository.
 
 **Files\islzma.dll**, **Files\islzma32.exe**, **Files\islzma64.exe** - Compiled
-by Visual Studio 2005 from the [Projects\Src\Lzma2\Encoder] directory.
+by Visual Studio 2005 from the [Projects\islzma] directory.
 
 **Files\isscint.dll** - Compiled by Visual Studio 2022 from Scintilla source
 code in the isscint repository.
@@ -212,10 +212,10 @@ code in the isscint repository.
 Compiled by Visual Studio 2005 from the [Projects\Helper] directory and then
 stored in a compiled resource file.
 
-**Projects\Src\LzmaDecode\LzmaDecodeInno.obj** - See [Projects\Src\LzmaDecode\compiling.txt].
+**Projects\Src\Setup\Lzma2Decode\ISLzmaDec.obj**, **Projects\Src\Setup\Lzma2Decode\ISLzma2Dec.obj** -
+See [Projects\Src\Setup\Lzma2Decode\compiling.txt].
 
-**Projects\Src\Lzma2\Decoder\ISLzmaDec.obj**, **Projects\Src\Lzma2\Decoder\ISLzma2Dec.obj** -
-See [Projects\Src\Lzma2\Decoder\compiling.txt].
+**Projects\Src\SetupLdr\LzmaDecode\LzmaDecodeInno.obj** - See [Projects\Src\SetupLdr\LzmaDecode\compiling.txt].
 
 **Examples\MyProg.exe**, **Examples\MyProg-x64.exe**, **Examples\MyProg-Arm64.exe** -
 Compiled by Visual Studio 2022 from the [Examples\MyProg] directory.
@@ -273,10 +273,10 @@ workflow will be triggered automatically.
 [Projects\Bin]: <Projects/Bin>
 [Components]: <Components>
 [Files]: <Files>
-[Projects\Src\Lzma2\Encoder]: <Projects/Src/Lzma2/Encoder>
+[Projects\islzma]: <Projects/islzma>
 [Projects\Helper]: <Projects/Helper>
 [Examples\MyProg]: <Examples/MyProg>
-[Projects\Src\LzmaDecode\compiling.txt]: <Projects/Src/LzmaDecode/compiling.txt>
-[Projects\Src\Lzma2\Decoder\compiling.txt]: <Projects/Src/Lzma2/Decoder/compiling.txt>
+[Projects\Src\Setup\Lzma2Decode\compiling.txt]: <Projects/Src/Setup/Lzma2Decode/compiling.txt>
+[Projects\Src\SetupLdr\LzmaDecode\compiling.txt]: <Projects/Src/SetupLdr/LzmaDecode/compiling.txt>
 [7-Zip]: https://www.7-zip.org/
 [secret]: https://docs.github.com/en/actions/security-guides/encrypted-secrets