From 49f4cb9a22375645cc6a914bff16329dde218e28 Mon Sep 17 00:00:00 2001 From: nhz2 Date: Thu, 23 Oct 2025 00:04:52 -0400 Subject: [PATCH] Fix header and library capitalization for cross compilation --- C/7zip_gcc_c.mak | 2 +- CPP/7zip/7zip_gcc.mak | 4 ++-- CPP/7zip/Crypto/RandGen.cpp | 2 +- CPP/Windows/SecurityUtils.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/C/7zip_gcc_c.mak b/C/7zip_gcc_c.mak index 195d23d..006cfe0 100644 --- a/C/7zip_gcc_c.mak +++ b/C/7zip_gcc_c.mak @@ -106,7 +106,7 @@ DEL_OBJ_EXE = -$(RM) $(O)\*.o $(O)\$(PROG).exe $(O)\$(PROG).dll endif -LIB2 = -lOle32 -loleaut32 -luuid -ladvapi32 -lUser32 -lShell32 +LIB2 = -lole32 -loleaut32 -luuid -ladvapi32 -luser32 -lshell32 CFLAGS_EXTRA = -DUNICODE -D_UNICODE # -Wno-delete-non-virtual-dtor diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak index 12f1ef2..a78c0fa 100644 --- a/CPP/7zip/7zip_gcc.mak +++ b/CPP/7zip/7zip_gcc.mak @@ -142,8 +142,8 @@ MY_MKDIR=mkdir DEL_OBJ_EXE = -$(RM) $(O)\*.o $(O)\$(PROG).exe $(O)\$(PROG).dll endif -LIB2_GUI = -lOle32 -lGdi32 -lComctl32 -lComdlg32 -lShell32 $(LIB_HTMLHELP) -LIB2 = -loleaut32 -luuid -ladvapi32 -lUser32 $(LIB2_GUI) +LIB2_GUI = -lole32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 $(LIB_HTMLHELP) +LIB2 = -loleaut32 -luuid -ladvapi32 -luser32 $(LIB2_GUI) # v24.00: -DUNICODE and -D_UNICODE are defined in precompilation header files # CXXFLAGS_EXTRA = -DUNICODE -D_UNICODE diff --git a/CPP/7zip/Crypto/RandGen.cpp b/CPP/7zip/Crypto/RandGen.cpp index 05a6c06..d0c2e64 100644 --- a/CPP/7zip/Crypto/RandGen.cpp +++ b/CPP/7zip/Crypto/RandGen.cpp @@ -19,7 +19,7 @@ #ifdef USE_STATIC_RtlGenRandom -// #include +// #include EXTERN_C_BEGIN #ifndef RtlGenRandom diff --git a/CPP/Windows/SecurityUtils.h b/CPP/Windows/SecurityUtils.h index 7219f06..0ed76cb 100644 --- a/CPP/Windows/SecurityUtils.h +++ b/CPP/Windows/SecurityUtils.h @@ -3,7 +3,7 @@ #ifndef ZIP7_INC_WINDOWS_SECURITY_UTILS_H #define ZIP7_INC_WINDOWS_SECURITY_UTILS_H -#include +#include #include "Defs.h"