ip7z/7zip
1
0
Fork 0
mirror of https://github.com/ip7z/7zip.git synced 2026-01-21 15:30:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 49f4cb9a22 into 5e96a82794

Browse source
This commit is contained in:
Nathan Zimmerberg 2025-10-23 00:16:14 -04:00 committed by GitHub
parent 5e96a82794 49f4cb9a22
commit 5f86970417
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
C/7zip_gcc_c.mak
View file

@ -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

4
CPP/7zip/7zip_gcc.mak
View file

@ -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

2
CPP/7zip/Crypto/RandGen.cpp
View file

@ -19,7 +19,7 @@
#ifdef USE_STATIC_RtlGenRandom
// #include <NTSecAPI.h>
// #include <ntsecapi.h>
EXTERN_C_BEGIN
#ifndef RtlGenRandom

2
CPP/Windows/SecurityUtils.h
View file

@ -3,7 +3,7 @@
#ifndef ZIP7_INC_WINDOWS_SECURITY_UTILS_H
#define ZIP7_INC_WINDOWS_SECURITY_UTILS_H
#include <NTSecAPI.h>
#include <ntsecapi.h>
#include "Defs.h"