react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/C/Util/7z/makefile.gcc

@@ -1,32 +1,75 @@
-PROG = 7zdec
-
-LOCAL_FLAGS = -DZ7_PPMD_SUPPORT -DZ7_EXTRACT_ONLY
-
-include ../../../CPP/7zip/LzmaDec_gcc.mak
-
-
-OBJS = \
-  $(LZMA_DEC_OPT_OBJS) \
-  $O/Bcj2.o \
-  $O/Bra.o \
-  $O/Bra86.o \
-  $O/BraIA64.o \
-  $O/CpuArch.o \
-  $O/Delta.o \
-  $O/Lzma2Dec.o \
-  $O/LzmaDec.o \
-  $O/Ppmd7.o \
-  $O/Ppmd7Dec.o \
-  $O/7zCrc.o \
-  $O/7zCrcOpt.o \
-  $O/7zAlloc.o \
-  $O/7zArcIn.o \
-  $O/7zBuf.o \
-  $O/7zBuf2.o \
-  $O/7zDec.o \
-  $O/7zMain.o \
-  $O/7zFile.o \
-  $O/7zStream.o \
-
-
-include ../../7zip_gcc_c.mak
+PROG = 7zDec
+CXX = gcc
+LIB =
+RM = rm -f
+CFLAGS = -c -O2 -Wall
+
+OBJS = 7zMain.o 7zAlloc.o 7zArcIn.o 7zBuf.o 7zBuf2.o 7zCrc.o 7zCrcOpt.o 7zDec.o CpuArch.o Delta.o LzmaDec.o Lzma2Dec.o Bra.o Bra86.o BraIA64.o Bcj2.o Ppmd7.o Ppmd7Dec.o 7zFile.o 7zStream.o
+
+all: $(PROG)
+
+$(PROG): $(OBJS)
+	$(CXX) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIB)
+
+7zMain.o: 7zMain.c
+	$(CXX) $(CFLAGS) 7zMain.c
+
+7zAlloc.o: ../../7zAlloc.c
+	$(CXX) $(CFLAGS) ../../7zAlloc.c
+
+7zArcIn.o: ../../7zArcIn.c
+	$(CXX) $(CFLAGS) ../../7zArcIn.c
+
+7zBuf.o: ../../7zBuf.c
+	$(CXX) $(CFLAGS) ../../7zBuf.c
+
+7zBuf2.o: ../../7zBuf2.c
+	$(CXX) $(CFLAGS) ../../7zBuf2.c
+
+7zCrc.o: ../../7zCrc.c
+	$(CXX) $(CFLAGS) ../../7zCrc.c
+
+7zCrcOpt.o: ../../7zCrc.c
+	$(CXX) $(CFLAGS) ../../7zCrcOpt.c
+
+7zDec.o: ../../7zDec.c
+	$(CXX) $(CFLAGS) -D_7ZIP_PPMD_SUPPPORT ../../7zDec.c
+
+CpuArch.o: ../../CpuArch.c
+	$(CXX) $(CFLAGS) ../../CpuArch.c
+
+Delta.o: ../../Delta.c
+	$(CXX) $(CFLAGS) ../../Delta.c
+
+LzmaDec.o: ../../LzmaDec.c
+	$(CXX) $(CFLAGS) ../../LzmaDec.c
+
+Lzma2Dec.o: ../../Lzma2Dec.c
+	$(CXX) $(CFLAGS) ../../Lzma2Dec.c
+
+Bra.o: ../../Bra.c
+	$(CXX) $(CFLAGS) ../../Bra.c
+
+Bra86.o: ../../Bra86.c
+	$(CXX) $(CFLAGS) ../../Bra86.c
+
+BraIA64.o: ../../BraIA64.c
+	$(CXX) $(CFLAGS) ../../BraIA64.c
+
+Bcj2.o: ../../Bcj2.c
+	$(CXX) $(CFLAGS) ../../Bcj2.c
+
+Ppmd7.o: ../../Ppmd7.c
+	$(CXX) $(CFLAGS) ../../Ppmd7.c
+
+Ppmd7Dec.o: ../../Ppmd7Dec.c
+	$(CXX) $(CFLAGS) ../../Ppmd7Dec.c
+
+7zFile.o: ../../7zFile.c
+	$(CXX) $(CFLAGS) ../../7zFile.c
+
+7zStream.o: ../../7zStream.c
+	$(CXX) $(CFLAGS) ../../7zStream.c
+
+clean:
+	-$(RM) $(PROG) $(OBJS)

package/harmony/pushy/src/main/cpp/lzma/C/Util/Lzma/LzmaUtil.c

@@ -1,7 +1,7 @@
 /* LzmaUtil.c -- Test application for LZMA compression
-2023-03-07 : Igor Pavlov : Public domain */
+2018-07-04 : Igor Pavlov : Public domain */
 
-#include "Precomp.h"
+#include "../../Precomp.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -12,89 +12,40 @@
 #include "../../Alloc.h"
 #include "../../7zFile.h"
 #include "../../7zVersion.h"
-#include "../../LzFind.h"
 #include "../../LzmaDec.h"
 #include "../../LzmaEnc.h"
 
-static const char * const kCantReadMessage = "Cannot read input file";
-static const char * const kCantWriteMessage = "Cannot write output file";
-static const char * const kCantAllocateMessage = "Cannot allocate memory";
+static const char * const kCantReadMessage = "Can not read input file";
+static const char * const kCantWriteMessage = "Can not write output file";
+static const char * const kCantAllocateMessage = "Can not allocate memory";
 static const char * const kDataErrorMessage = "Data error";
 
-static void Print(const char *s)
+static void PrintHelp(char *buffer)
 {
-  fputs(s, stdout);
+  strcat(buffer,
+    "\nLZMA-C " MY_VERSION_CPU " : " MY_COPYRIGHT_DATE "\n\n"
+    "Usage:  lzma <e|d> inputFile outputFile\n"
+    "  e: encode file\n"
+    "  d: decode file\n");
 }
 
-static void PrintHelp(void)
+static int PrintError(char *buffer, const char *message)
 {
-  Print(
-    "\n" "LZMA-C " MY_VERSION_CPU " : " MY_COPYRIGHT_DATE
-    "\n"
-    "\n" "Usage:  lzma <e|d> inputFile outputFile"
-    "\n" "  e: encode file"
-    "\n" "  d: decode file"
-    "\n");
-}
-
-static int PrintError(const char *message)
-{
-  Print("\nError: ");
-  Print(message);
-  Print("\n");
-  return 1;
-}
-
-#define CONVERT_INT_TO_STR(charType, tempSize) \
-  unsigned char temp[tempSize]; unsigned i = 0; \
-  while (val >= 10) { temp[i++] = (unsigned char)('0' + (unsigned)(val % 10)); val /= 10; } \
-  *s++ = (charType)('0' + (unsigned)val); \
-  while (i != 0) { i--; *s++ = (charType)temp[i]; } \
-  *s = 0; \
-  return s;
-
-static char * Convert_unsigned_To_str(unsigned val, char *s)
-{
-  CONVERT_INT_TO_STR(char, 32)
-}
-
-static void Print_unsigned(unsigned code)
-{
-  char str[32];
-  Convert_unsigned_To_str(code, str);
-  Print(str);
-}
-
-static int PrintError_WRes(const char *message, WRes wres)
-{
-  PrintError(message);
-  Print("\nSystem error code: ");
-  Print_unsigned((unsigned)wres);
-  #ifndef _WIN32
-  {
-    const char *s = strerror(wres);
-    if (s)
-    {
-      Print(" : ");
-      Print(s);
-    }
-  }
-  #endif
-  Print("\n");
+  strcat(buffer, "\nError: ");
+  strcat(buffer, message);
+  strcat(buffer, "\n");
   return 1;
 }
 
-static int PrintErrorNumber(SRes val)
+static int PrintErrorNumber(char *buffer, SRes val)
 {
-  Print("\n7-Zip error code: ");
-  Print_unsigned((unsigned)val);
-  Print("\n");
+  sprintf(buffer + strlen(buffer), "\nError code: %x\n", (unsigned)val);
   return 1;
 }
 
-static int PrintUserError(void)
+static int PrintUserError(char *buffer)
 {
-  return PrintError("Incorrect command");
+  return PrintError(buffer, "Incorrect command");
 }
 
 
@@ -102,10 +53,10 @@ static int PrintUserError(void)
 #define OUT_BUF_SIZE (1 << 16)
 
 
-static SRes Decode2(CLzmaDec *state, ISeqOutStreamPtr outStream, ISeqInStreamPtr inStream,
+static SRes Decode2(CLzmaDec *state, ISeqOutStream *outStream, ISeqInStream *inStream,
     UInt64 unpackSize)
 {
-  const int thereIsSize = (unpackSize != (UInt64)(Int64)-1);
+  int thereIsSize = (unpackSize != (UInt64)(Int64)-1);
   Byte inBuf[IN_BUF_SIZE];
   Byte outBuf[OUT_BUF_SIZE];
   size_t inPos = 0, inSize = 0, outPos = 0;
@@ -115,7 +66,7 @@ static SRes Decode2(CLzmaDec *state, ISeqOutStreamPtr outStream, ISeqInStreamPtr
     if (inPos == inSize)
     {
       inSize = IN_BUF_SIZE;
-      RINOK(inStream->Read(inStream, inBuf, &inSize))
+      RINOK(inStream->Read(inStream, inBuf, &inSize));
       inPos = 0;
     }
     {
@@ -156,7 +107,7 @@ static SRes Decode2(CLzmaDec *state, ISeqOutStreamPtr outStream, ISeqInStreamPtr
 }
 
 
-static SRes Decode(ISeqOutStreamPtr outStream, ISeqInStreamPtr inStream)
+static SRes Decode(ISeqOutStream *outStream, ISeqInStream *inStream)
 {
   UInt64 unpackSize;
   int i;
@@ -169,29 +120,27 @@ static SRes Decode(ISeqOutStreamPtr outStream, ISeqInStreamPtr inStream)
 
   /* Read and parse header */
 
-  {
-    size_t size = sizeof(header);
-    RINOK(SeqInStream_ReadMax(inStream, header, &size))
-    if (size != sizeof(header))
-      return SZ_ERROR_INPUT_EOF;
-  }
+  RINOK(SeqInStream_Read(inStream, header, sizeof(header)));
+
   unpackSize = 0;
   for (i = 0; i < 8; i++)
     unpackSize += (UInt64)header[LZMA_PROPS_SIZE + i] << (i * 8);
 
-  LzmaDec_CONSTRUCT(&state)
-  RINOK(LzmaDec_Allocate(&state, header, LZMA_PROPS_SIZE, &g_Alloc))
+  LzmaDec_Construct(&state);
+  RINOK(LzmaDec_Allocate(&state, header, LZMA_PROPS_SIZE, &g_Alloc));
   res = Decode2(&state, outStream, inStream, unpackSize);
   LzmaDec_Free(&state, &g_Alloc);
   return res;
 }
 
-static SRes Encode(ISeqOutStreamPtr outStream, ISeqInStreamPtr inStream, UInt64 fileSize)
+static SRes Encode(ISeqOutStream *outStream, ISeqInStream *inStream, UInt64 fileSize, char *rs)
 {
   CLzmaEncHandle enc;
   SRes res;
   CLzmaEncProps props;
 
+  UNUSED_VAR(rs);
+
   enc = LzmaEnc_Create(&g_Alloc);
   if (enc == 0)
     return SZ_ERROR_MEM;
@@ -221,7 +170,7 @@ static SRes Encode(ISeqOutStreamPtr outStream, ISeqInStreamPtr inStream, UInt64
 }
 
 
-int Z7_CDECL main(int numArgs, const char *args[])
+static int main2(int numArgs, const char *args[], char *rs)
 {
   CFileSeqInStream inStream;
   CFileOutStream outStream;
@@ -230,63 +179,50 @@ int Z7_CDECL main(int numArgs, const char *args[])
   int encodeMode;
   BoolInt useOutFile = False;
 
-  LzFindPrepare();
-
   FileSeqInStream_CreateVTable(&inStream);
   File_Construct(&inStream.file);
-  inStream.wres = 0;
 
   FileOutStream_CreateVTable(&outStream);
   File_Construct(&outStream.file);
-  outStream.wres = 0;
 
   if (numArgs == 1)
   {
-    PrintHelp();
+    PrintHelp(rs);
     return 0;
   }
 
   if (numArgs < 3 || numArgs > 4 || strlen(args[1]) != 1)
-    return PrintUserError();
+    return PrintUserError(rs);
 
   c = args[1][0];
   encodeMode = (c == 'e' || c == 'E');
   if (!encodeMode && c != 'd' && c != 'D')
-    return PrintUserError();
+    return PrintUserError(rs);
 
-  /*
   {
     size_t t4 = sizeof(UInt32);
     size_t t8 = sizeof(UInt64);
     if (t4 != 4 || t8 != 8)
-      return PrintError("Incorrect UInt32 or UInt64");
+      return PrintError(rs, "Incorrect UInt32 or UInt64");
   }
-  */
 
-  {
-    const WRes wres = InFile_Open(&inStream.file, args[2]);
-    if (wres != 0)
-      return PrintError_WRes("Cannot open input file", wres);
-  }
+  if (InFile_Open(&inStream.file, args[2]) != 0)
+    return PrintError(rs, "Can not open input file");
 
   if (numArgs > 3)
   {
-    WRes wres;
     useOutFile = True;
-    wres = OutFile_Open(&outStream.file, args[3]);
-    if (wres != 0)
-      return PrintError_WRes("Cannot open output file", wres);
+    if (OutFile_Open(&outStream.file, args[3]) != 0)
+      return PrintError(rs, "Can not open output file");
   }
   else if (encodeMode)
-    PrintUserError();
+    PrintUserError(rs);
 
   if (encodeMode)
   {
     UInt64 fileSize;
-    const WRes wres = File_GetLength(&inStream.file, &fileSize);
-    if (wres != 0)
-      return PrintError_WRes("Cannot get file length", wres);
-    res = Encode(&outStream.vt, &inStream.vt, fileSize);
+    File_GetLength(&inStream.file, &fileSize);
+    res = Encode(&outStream.vt, &inStream.vt, fileSize, rs);
   }
   else
   {
@@ -300,14 +236,23 @@ int Z7_CDECL main(int numArgs, const char *args[])
   if (res != SZ_OK)
   {
     if (res == SZ_ERROR_MEM)
-      return PrintError(kCantAllocateMessage);
+      return PrintError(rs, kCantAllocateMessage);
     else if (res == SZ_ERROR_DATA)
-      return PrintError(kDataErrorMessage);
+      return PrintError(rs, kDataErrorMessage);
     else if (res == SZ_ERROR_WRITE)
-      return PrintError_WRes(kCantWriteMessage, outStream.wres);
+      return PrintError(rs, kCantWriteMessage);
     else if (res == SZ_ERROR_READ)
-      return PrintError_WRes(kCantReadMessage, inStream.wres);
-    return PrintErrorNumber(res);
+      return PrintError(rs, kCantReadMessage);
+    return PrintErrorNumber(rs, res);
   }
   return 0;
 }
+
+
+int MY_CDECL main(int numArgs, const char *args[])
+{
+  char rs[800] = { 0 };
+  int res = main2(numArgs, args, rs);
+  fputs(rs, stdout);
+  return res;
+}

package/harmony/pushy/src/main/cpp/lzma/C/Util/Lzma/LzmaUtil.dsp

@@ -106,10 +106,6 @@ SOURCE=..\..\7zVersion.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7zWindows.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Alloc.c
 # End Source File
 # Begin Source File
@@ -118,14 +114,6 @@ SOURCE=..\..\Alloc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Compiler.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\CpuArch.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\CpuArch.h
 # End Source File
 # Begin Source File
@@ -146,10 +134,6 @@ SOURCE=..\..\LzFindMt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\LzFindOpt.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\LzHash.h
 # End Source File
 # Begin Source File
@@ -174,14 +158,6 @@ SOURCE=.\LzmaUtil.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Precomp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Precomp.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Threads.c
 # End Source File
 # Begin Source File

package/harmony/pushy/src/main/cpp/lzma/C/Util/Lzma/makefile

@@ -8,10 +8,8 @@ LIB_OBJS = \
 
 C_OBJS = \
   $O\Alloc.obj \
-  $O\CpuArch.obj \
   $O\LzFind.obj \
   $O\LzFindMt.obj \
-  $O\LzFindOpt.obj \
   $O\LzmaDec.obj \
   $O\LzmaEnc.obj \
   $O\7zFile.obj \

package/harmony/pushy/src/main/cpp/lzma/C/Util/Lzma/makefile.gcc

@@ -1,21 +1,44 @@
-PROG = 7lzma
+PROG = lzma
+CXX = g++
+LIB =
+RM = rm -f
+CFLAGS = -c -O2 -Wall -D_7ZIP_ST
 
-include ../../../CPP/7zip/LzmaDec_gcc.mak
+OBJS = \
+  LzmaUtil.o \
+  Alloc.o \
+  LzFind.o \
+  LzmaDec.o \
+  LzmaEnc.o \
+  7zFile.o \
+  7zStream.o \
 
 
-OBJS = \
-  $(LZMA_DEC_OPT_OBJS) \
-  $O/7zFile.o \
-  $O/7zStream.o \
-  $O/Alloc.o \
-  $O/CpuArch.o \
-  $O/LzFind.o \
-  $O/LzFindMt.o \
-  $O/LzFindOpt.o \
-  $O/LzmaDec.o \
-  $O/LzmaEnc.o \
-  $O/LzmaUtil.o \
-  $O/Threads.o \
-
-
-include ../../7zip_gcc_c.mak
+all: $(PROG)
+
+$(PROG): $(OBJS)
+	$(CXX) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIB) $(LIB2)
+
+LzmaUtil.o: LzmaUtil.c
+	$(CXX) $(CFLAGS) LzmaUtil.c
+
+Alloc.o: ../../Alloc.c
+	$(CXX) $(CFLAGS) ../../Alloc.c
+
+LzFind.o: ../../LzFind.c
+	$(CXX) $(CFLAGS) ../../LzFind.c
+
+LzmaDec.o: ../../LzmaDec.c
+	$(CXX) $(CFLAGS) ../../LzmaDec.c
+
+LzmaEnc.o: ../../LzmaEnc.c
+	$(CXX) $(CFLAGS) ../../LzmaEnc.c
+
+7zFile.o: ../../7zFile.c
+	$(CXX) $(CFLAGS) ../../7zFile.c
+
+7zStream.o: ../../7zStream.c
+	$(CXX) $(CFLAGS) ../../7zStream.c
+
+clean:
+	-$(RM) $(PROG) $(OBJS)

package/harmony/pushy/src/main/cpp/lzma/C/Util/LzmaLib/LzmaLib.dsp

@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LZMALIB_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /Gr /MT /W4 /WX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LZMALIB_EXPORTS" /FD /c
+# ADD CPP /nologo /Gr /MT /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LZMALIB_EXPORTS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LZMALIB_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /WX /Gm /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LZMALIB_EXPORTS" /D "COMPRESS_MF_MT" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LZMALIB_EXPORTS" /D "COMPRESS_MF_MT" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -101,10 +101,6 @@ SOURCE=.\LzmaLib.def
 
 SOURCE=.\LzmaLibExports.c
 # End Source File
-# Begin Source File
-
-SOURCE=.\Precomp.h
-# End Source File
 # End Group
 # Begin Source File
 
@@ -112,10 +108,6 @@ SOURCE=..\..\7zTypes.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7zWindows.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Alloc.c
 # End Source File
 # Begin Source File
@@ -124,18 +116,6 @@ SOURCE=..\..\Alloc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Compiler.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\CpuArch.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\CpuArch.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\IStream.h
 # End Source File
 # Begin Source File
@@ -156,10 +136,6 @@ SOURCE=..\..\LzFindMt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\LzFindOpt.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\LzHash.h
 # End Source File
 # Begin Source File
@@ -188,10 +164,6 @@ SOURCE=..\..\LzmaLib.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Precomp.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\resource.rc
 # End Source File
 # Begin Source File

package/harmony/pushy/src/main/cpp/lzma/C/Util/LzmaLib/LzmaLibExports.c

@@ -1,15 +1,14 @@
 /* LzmaLibExports.c -- LZMA library DLL Entry point
-2023-03-05 : Igor Pavlov : Public domain */
+2015-11-08 : Igor Pavlov : Public domain */
 
-#include "Precomp.h"
+#include "../../Precomp.h"
 
-#include "../../7zWindows.h"
+#include <windows.h>
 
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved);
 BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 {
-  UNUSED_VAR(hInstance)
-  UNUSED_VAR(dwReason)
-  UNUSED_VAR(lpReserved)
+  UNUSED_VAR(hInstance);
+  UNUSED_VAR(dwReason);
+  UNUSED_VAR(lpReserved);
   return TRUE;
 }

package/harmony/pushy/src/main/cpp/lzma/C/Util/LzmaLib/makefile

@@ -11,7 +11,6 @@ LIB_OBJS = \
 
 C_OBJS = \
   $O\Alloc.obj \
-  $O\CpuArch.obj \
   $O\LzFind.obj \
   $O\LzFindMt.obj \
   $O\LzmaDec.obj \
@@ -19,14 +18,9 @@ C_OBJS = \
   $O\LzmaLib.obj \
   $O\Threads.obj \
 
-!include "../../../CPP/7zip/LzFindOpt.mak"
-!include "../../../CPP/7zip/LzmaDec.mak"
-
 OBJS = \
-  $O\Precomp.obj \
   $(LIB_OBJS) \
   $(C_OBJS) \
-  $(ASM_OBJS) \
   $O\resource.res
 
 !include "../../../CPP/Build.mak"
@@ -34,26 +28,7 @@ OBJS = \
 $(SLIBPATH): $O $(OBJS)
 	lib -out:$(SLIBPATH) $(OBJS) $(LIBS)
 
-
-MAK_SINGLE_FILE = 1
-
-$O\Precomp.obj: Precomp.c
-	$(CCOMPL_PCH)
-
-!IFDEF MAK_SINGLE_FILE
-
 $(LIB_OBJS): $(*B).c
-	$(CCOMPL_USE)
+	$(COMPL_O2)
 $(C_OBJS): ../../$(*B).c
-	$(CCOMPL_USE)
-
-!ELSE
-
-{.}.c{$O}.obj::
-	$(CCOMPLB_USE)
-{../../../C}.c{$O}.obj::
-	$(CCOMPLB_USE)
-
-!ENDIF
-
-!include "../../Asm_c.mak"
+	$(COMPL_O2)