Martijn Laan 1 an în urmă
părinte
comite
316935fa41

+ 6 - 6
Projects/Src/Setup/LZMADecomp.pas

@@ -122,6 +122,12 @@ procedure LzmaDec_Init; cdecl; external name '_LzmaDec_Init';
 procedure LzmaDec_InitDicAndState; cdecl; external name '_LzmaDec_InitDicAndState';
 procedure LzmaDec_InitDicAndState; cdecl; external name '_LzmaDec_InitDicAndState';
 procedure LzmaProps_Decode; cdecl; external name '_LzmaProps_Decode';
 procedure LzmaProps_Decode; cdecl; external name '_LzmaProps_Decode';
 
 
+function _memcpy(dest, src: Pointer; n: Cardinal): Pointer; cdecl;
+begin
+  Move(src^, dest^, n);
+  Result := dest;
+end;
+
 procedure LZMADecompInternalError(const Msg: String);
 procedure LZMADecompInternalError(const Msg: String);
 begin
 begin
   raise ECompressInternalError.CreateFmt('lzmadecomp: %s', [Msg]);
   raise ECompressInternalError.CreateFmt('lzmadecomp: %s', [Msg]);
@@ -149,12 +155,6 @@ end;
 const
 const
   LZMAAlloc: TLZMAISzAlloc = (Alloc: LZMAAllocFunc; Free: LZMAFreeFunc);
   LZMAAlloc: TLZMAISzAlloc = (Alloc: LZMAAllocFunc; Free: LZMAFreeFunc);
 
 
-function _memcpy(dest, src: Pointer; n: Cardinal): Pointer; cdecl;
-begin
-  Move(src^, dest^, n);
-  Result := dest;
-end;
-
 { TLZMACustomDecompressor }
 { TLZMACustomDecompressor }
 
 
 destructor TLZMACustomDecompressor.Destroy;
 destructor TLZMACustomDecompressor.Destroy;

+ 1 - 1
Projects/Src/Setup/Lzma2Decode/compile.bat

@@ -35,7 +35,7 @@ if errorlevel 1 goto exit
 echo.
 echo.
 
 
 echo - Compiling ISLzmaDec.c and ISLzma2Dec.c
 echo - Compiling ISLzmaDec.c and ISLzma2Dec.c
-cl /c /O2 /Gd /GS- ISLzmaDec.c ISLzma2Dec.c
+cl.exe /c /O2 /Gd /GS- ISLzmaDec.c ISLzma2Dec.c
 if errorlevel 1 goto failed
 if errorlevel 1 goto failed
 
 
 echo Success!
 echo Success!