mirror of
https://github.com/RGBCube/serenity
synced 2025-10-17 16:22:25 +00:00
39 lines
1 KiB
Diff
39 lines
1 KiB
Diff
diff --git a/7zip/Archive/Zip/ZipItem.cpp b/7zip/Archive/Zip/ZipItem.cpp
|
|
index 353e895..ad0a3da 100644
|
|
--- a/7zip/Archive/Zip/ZipItem.cpp
|
|
+++ b/7zip/Archive/Zip/ZipItem.cpp
|
|
@@ -19,6 +19,7 @@
|
|
#include "../Common/ItemNameUtils.h"
|
|
|
|
#include "ZipItem.h"
|
|
+#include <strings.h>
|
|
|
|
namespace NArchive {
|
|
namespace NZip {
|
|
diff --git a/7zip/CMAKE/7za/CMakeLists.txt b/7zip/CMAKE/7za/CMakeLists.txt
|
|
index 469e325..32388ac 100644
|
|
--- a/7zip/CMAKE/7za/CMakeLists.txt
|
|
+++ b/7zip/CMAKE/7za/CMakeLists.txt
|
|
@@ -357,6 +357,9 @@ add_executable(7za
|
|
"../../../../myWindows/wine_date_and_time.cpp"
|
|
)
|
|
|
|
+IF(SERENITYOS)
|
|
+ TARGET_LINK_LIBRARIES(7za ${CMAKE_THREAD_LIBS_INIT} dl iconv)
|
|
+ENDIF(SERENITYOS)
|
|
|
|
IF(APPLE)
|
|
TARGET_LINK_LIBRARIES(7za ${COREFOUNDATION_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
|
|
diff --git a/myWindows/config.h b/myWindows/config.h
|
|
index 497d197..fa402c6 100644
|
|
--- a/myWindows/config.h
|
|
+++ b/myWindows/config.h
|
|
@@ -36,7 +36,7 @@
|
|
#define ENV_HAVE_TOWUPPER
|
|
#endif
|
|
|
|
-
|
|
+ #undef ENV_HAVE_WCTYPE_H
|
|
|
|
#if !defined(ENV_BEOS) && !defined(ANDROID_NDK)
|
|
|