Parcourir la source

Rename to better match the SDK and also LZMADecode/ISLzmaDec.

Martijn Laan il y a 11 mois
Parent
commit
85a426d199

+ 3 - 3
Projects/Src/Compression.SevenZipDecoder.pas

@@ -20,9 +20,9 @@ implementation
 uses
   Windows, SysUtils, Setup.LoggingFunc;
 
-{$L Src\Compression.SevenZipDecoder\7ZipDecode\IS7ZipDec.obj}
+{$L Src\Compression.SevenZipDecoder\7zDecode\IS7zDec.obj}
 
-function IS_7ZipDec(const fileName: PChar; const fullPaths: Bool): Integer; cdecl; external name '_IS_7ZipDec';
+function IS_7zDec(const fileName: PChar; const fullPaths: Bool): Integer; cdecl; external name '_IS_7zDec';
 
 {.$DEFINE VISUALSTUDIO}
 
@@ -76,7 +76,7 @@ procedure SevenZipDecode(const FileName, DestDir: String;
 begin
   var SaveCurDir := GetCurrentDir;
   SetCurrentDir(DestDir);
-  IS_7ZipDec(PChar(FileName), FullPaths);
+  IS_7zDec(PChar(FileName), FullPaths);
   SetCurrentDir(SaveCurDir);
 end;
 

+ 2 - 2
Projects/Src/Compression.SevenZipDecoder/7ZipDecode/IS7ZipDec.c → Projects/Src/Compression.SevenZipDecoder/7zDecode/IS7zDec.c

@@ -1,5 +1,5 @@
 /*
-  IS7ZipDec.c, by Martijn Laan for Inno Setup
+  IS7zDec.c, by Martijn Laan for Inno Setup
   This file is public domain (like the LZMA SDK)
 */
 
@@ -20,7 +20,7 @@
 #include "../../../../Components/Lzma2/LzmaDec.c"
 #include "../../../../Components/Lzma2/Lzma2Dec.c"
 
-int IS_7ZipDec(WCHAR *fileName, BOOL fullPaths)
+int IS_7zDec(WCHAR *fileName, BOOL fullPaths)
 {
   WCHAR* args[3];
   args[0] = L"";

BIN
Projects/Src/Compression.SevenZipDecoder/7ZipDecode/IS7ZipDec.obj → Projects/Src/Compression.SevenZipDecoder/7zDecode/IS7zDec.obj


+ 3 - 3
Projects/Src/Compression.SevenZipDecoder/7ZipDecode/compile-bcc32c.bat → Projects/Src/Compression.SevenZipDecoder/7zDecode/compile-bcc32c.bat

@@ -5,7 +5,7 @@ rem  Copyright (C) 1997-2024 Jordan Russell
 rem  Portions by Martijn Laan
 rem  For conditions of distribution and use, see LICENSE.TXT.
 rem
-rem  Batch file to compile IS7ZipDec.c using Embarcadero's free
+rem  Batch file to compile IS7zDec.c using Embarcadero's free
 rem  C++ compiler from https://www.embarcadero.com/free-tools/ccompiler
 rem  with source debugging turned on
 
@@ -28,8 +28,8 @@ if "%BCCROOT%"=="" goto compilesettingserror
 
 rem -------------------------------------------------------------------------
 
-echo - Compiling IS7ZipDec.c
-"%BCCROOT%\bin\bcc32c.exe" -c -O2 -v IS7ZipDec.c
+echo - Compiling IS7zDec.c
+"%BCCROOT%\bin\bcc32c.exe" -c -O2 -v IS7zDec.c
 if errorlevel 1 goto failed
 
 echo Success!

+ 3 - 3
Projects/Src/Compression.SevenZipDecoder/7ZipDecode/compile.bat → Projects/Src/Compression.SevenZipDecoder/7zDecode/compile.bat

@@ -5,7 +5,7 @@ rem  Copyright (C) 1997-2024 Jordan Russell
 rem  Portions by Martijn Laan
 rem  For conditions of distribution and use, see LICENSE.TXT.
 rem
-rem  Batch file to compile IS7ZipDec.c
+rem  Batch file to compile IS7zDec.c
 
 setlocal
 
@@ -34,8 +34,8 @@ call "%VSTOOLSROOT%\VsDevCmd.bat"
 if errorlevel 1 goto exit
 echo.
 
-echo - Compiling IS7ZipDec.c
-cl.exe /c /O2 /GS- IS7ZipDec.c
+echo - Compiling IS7zDec.c
+cl.exe /c /O2 /GS- IS7zDec.c
 if errorlevel 1 goto failed
 
 echo Success!