seven-zip 1.4.2 → 1.7.0.rc1

data/ext/p7zip/makefile.oldmake

@@ -1,89 +1,63 @@
-MKDIR = mkdir -p
 
-DEST_HOME=/usr/local
-DEST_BIN=$(DEST_HOME)/bin
-DEST_SHARE=$(DEST_HOME)/lib/p7zip
-DEST_SHARE_DOC=$(DEST_HOME)/share/doc/p7zip
-DEST_MAN=$(DEST_HOME)/man
+include makefile.common
 
-.PHONY: default all all2 7za 7zG 7zFM sfx 7z 7zr Client7z common common7z clean tar_bin depend test test_7z test_7zr test_7zG test_Client7z all_test app
+test_lib: common
+	cd CPP/myWindows              ; $(MAKE) all
 
-default:7za
+other: common
+	cd Utils/CPUTest/MemLat       ; $(MAKE) all
+	cd Utils/CPUTest/PipeLen      ; $(MAKE) all
+	cd CPP/7zip/UI/P7ZIP          ; $(MAKE) all
+	cd CPP/7zip/TEST/TestUI       ; $(MAKE) all
 
-all:7za sfx
-
-all2: 7za sfx 7z
-
-all3: 7za sfx 7z 7zr
-
-all4: 7za sfx 7z 7zr Client7z 7zG 7zFM
-
-all_test : test test_7z test_7zr test_Client7z
-	cd CPP/7zip/Compress/LZMA_Alone  ; $(MAKE) test
-
-common:
-	$(MKDIR) bin
+other2:
+	cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) all
 
 7za: common
 	cd CPP/7zip/Bundles/Alone ; $(MAKE) all
-	cd check/my_86_filter     ; $(MAKE) all
 
 7zr: common
 	cd CPP/7zip/Bundles/Alone7z ; $(MAKE) all
 
 Client7z: common
 	$(MKDIR) bin/Codecs
-	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all
-	cd CPP/7zip/UI/Client7z      ; $(MAKE) all
-
-app: common 7zFM 7zG 7z sfx
-	rm -fr               p7zip.app
-	$(MKDIR)             p7zip.app
-	cp -rp GUI/Contents  p7zip.app/
-	$(MKDIR)             p7zip.app/Contents/MacOS
-	cp bin/7zFM          p7zip.app/Contents/MacOS/
-	cp bin/7zG           p7zip.app/Contents/MacOS/
-	cp bin/7z.so         p7zip.app/Contents/MacOS/
-	cp bin/7zCon.sfx     p7zip.app/Contents/MacOS/
-	cp -rp bin/Codecs    p7zip.app/Contents/MacOS/
-	cp -rp GUI/Lang      p7zip.app/Contents/MacOS/
-	cp -rp GUI/help      p7zip.app/Contents/MacOS/
+	cd CPP/7zip/Bundles/Format7zFree  ; $(MAKE) all
+	cd CPP/7zip/UI/Client7z           ; $(MAKE) all
 
 depend:
-	cd CPP/7zip/Bundles/Alone        ; $(MAKE) depend
-	cd CPP/7zip/Bundles/Alone7z      ; $(MAKE) depend
-	cd CPP/7zip/Bundles/SFXCon       ; $(MAKE) depend
-	cd CPP/7zip/UI/Client7z          ; $(MAKE) depend
-	cd CPP/7zip/UI/Console           ; $(MAKE) depend
-	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend
-	cd CPP/7zip/Compress/Rar         ; $(MAKE) depend
-	cd CPP/7zip/UI/GUI               ; $(MAKE) depend
-	cd CPP/7zip/UI/FileManager       ; $(MAKE) depend
-	cd check/my_86_filter            ; $(MAKE) depend
+	cd CPP/7zip/Bundles/Alone         ; $(MAKE) depend
+	cd CPP/7zip/Bundles/Alone7z       ; $(MAKE) depend
+	cd CPP/7zip/Bundles/SFXCon        ; $(MAKE) depend
+	cd CPP/7zip/UI/Client7z           ; $(MAKE) depend
+	cd CPP/7zip/UI/Console            ; $(MAKE) depend
+	cd CPP/7zip/Bundles/Format7zFree  ; $(MAKE) depend
+	cd CPP/7zip/Compress/Rar          ; $(MAKE) depend
+	cd CPP/7zip/UI/GUI                ; $(MAKE) depend
+	cd CPP/7zip/UI/FileManager        ; $(MAKE) depend
 
 sfx: common
 	$(MKDIR) bin
-	cd CPP/7zip/Bundles/SFXCon ; $(MAKE) all
+	cd CPP/7zip/Bundles/SFXCon  ; $(MAKE) all
 
 common7z:common
 	$(MKDIR) bin/Codecs
 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all
 	cd CPP/7zip/Compress/Rar         ; $(MAKE) all
 
+lzham:common
+	$(MKDIR) bin/Codecs
+	cd CPP/7zip/Compress/Lzham all
+
 7z: common7z
 	cd CPP/7zip/UI/Console           ; $(MAKE) all
 
-7zG: common7z
-	cd bin ; rm -f Lang ; ln -s ../GUI/Lang .
-	cd bin ; rm -f help ; ln -s ../GUI/help .
+7zG: common7z LangAndHelp
 	cd CPP/7zip/UI/GUI               ; $(MAKE) all
 
-7zFM: common7z
-	cd bin ; rm -f Lang ; ln -s ../GUI/Lang .
-	cd bin ; rm -f help ; ln -s ../GUI/help .
+7zFM: common7z LangAndHelp
 	cd CPP/7zip/UI/FileManager       ; $(MAKE) all
 
-clean:
+clean_C:
 	cd CPP/myWindows                 ; $(MAKE) clean
 	cd CPP/7zip/Bundles/Alone        ; $(MAKE) clean
 	cd CPP/7zip/Bundles/Alone7z      ; $(MAKE) clean
@@ -94,81 +68,18 @@ clean:
 	cd CPP/7zip/UI/GUI               ; $(MAKE) clean
 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean
 	cd CPP/7zip/Compress/Rar         ; $(MAKE) clean
-	cd CPP/7zip/Compress/LZMA_Alone  ; $(MAKE) clean
+	cd CPP/7zip/Compress/Lzham       ; $(MAKE) clean
+	cd CPP/7zip/Bundles/LzmaCon      ; $(MAKE) clean2
 	cd CPP/7zip/Bundles/AloneGCOV    ; $(MAKE) clean
 	cd CPP/7zip/TEST/TestUI          ; $(MAKE) clean
-	cd check/my_86_filter            ; $(MAKE) clean
-	rm -fr bin
-	rm -fr p7zip.app
-	rm -fr CPP/7zip/P7ZIP.*
-	rm -fr CPP/7zip/CMAKE/P7ZIP.*
-	rm -fr CPP/7zip/PREMAKE/P7ZIP.*
-	rm -f  CPP/7zip/QMAKE/*/*.o
-	rm -f  CPP/7zip/QMAKE/*/Makefile
-	rm -f  CPP/7zip/QMAKE/*/*.pro.user
-	rm -f  CPP/7zip/QMAKE/*/*.x
-	rm -f make.log 1 2
-	rm -f check/7z.so
-	rm -fr p7zip.app/Contents/MacOS
-	find . -name "*~"        -exec rm -f {} \;
-	find . -name "*.orig"    -exec rm -fr {} \;
-	find . -name ".*.swp"    -exec rm -f {} \;
-	find . -name "*.[ch]"    -exec chmod -x {} \;
-	find . -name "*.cpp"     -exec chmod -x {} \;
-	find . -name "*.asm"     -exec chmod -x {} \;
-	find . -name "makefile*" -exec chmod -x {} \;
-	find . -name ".DS_Store" -exec rm -f {} \;
-	find . -name "._*"       -exec rm -f {} \;
-	chmod -x ChangeLog README TODO man1/* DOCS/*.txt
-	chmod +x contrib/VirtualFileSystemForMidnightCommander/u7z
-	chmod +x contrib/gzip-like_CLI_wrapper_for_7z/p7zip
-	chmod +x install.sh check/check.sh check/clean_all.sh check/check_7zr.sh 
-	cd check                  ; ./clean_all.sh
-
-test: 7za sfx
-	cd check ; ./check.sh ../bin/7za
-
-test_7z: 7z sfx
-	cd check ; ./check.sh ../bin/7z
-
-test_7zr: 7zr sfx
-	cd check ; ./check_7zr.sh ../bin/7zr
-
-test_7zG: 7zG sfx
-	cd check ; ./check.sh ../bin/7zG
-
-test_Client7z: Client7z
-	cd check ; ./check_Client7z.sh ../bin/Client7z
-
-install:
-	./install.sh $(DEST_BIN) $(DEST_SHARE) $(DEST_MAN) $(DEST_SHARE_DOC) $(DEST_DIR)
-
-REP=$(shell pwd)
-ARCHIVE=$(shell basename $(REP))
-
-.PHONY: tar_all tar_all2 src_7z tar_bin tar_bin2
-
-tar_all : clean
-	rm -f  ../$(ARCHIVE)_src_all.tar.bz2
-	cp makefile.linux_any_cpu makefile.machine
-	cd .. ; (tar cf - $(ARCHIVE) | bzip2 -9 > $(ARCHIVE)_src_all.tar.bz2)
-
-tar_all2 : clean
-	rm -f  ../$(ARCHIVE)_src_all.tar.bz2
-	cp makefile.linux_any_cpu makefile.machine
-	cd .. ; (tar cf - $(ARCHIVE) | 7za a -mx=9 -tbzip2 -si $(ARCHIVE)_src_all.tar.bz2 )
-
-src_7z : clean
-	rm -f  ../$(ARCHIVE)_src.7z
-	cd .. ; 7za a -mx=9 -m0=ppmd:mem=128m:o=32 $(ARCHIVE)_src.7z $(ARCHIVE)
-
-tar_bin:
-	rm -f  ../$(ARCHIVE)_x86_linux_bin.tar.bz2
-	chmod +x install.sh contrib/VirtualFileSystemForMidnightCommander/u7z contrib/gzip-like_CLI_wrapper_for_7z/p7zip
-	cd .. ; (tar cf - $(ARCHIVE)/bin $(ARCHIVE)/contrib $(ARCHIVE)/man1 $(ARCHIVE)/install.sh $(ARCHIVE)/ChangeLog $(ARCHIVE)/DOCS $(ARCHIVE)/README $(ARCHIVE)/TODO | bzip2 -9 > $(ARCHIVE)_x86_linux_bin.tar.bz2)
-
-tar_bin2:
-	rm -f  ../$(ARCHIVE)_x86_linux_bin.tar.bz2
-	chmod +x install.sh contrib/VirtualFileSystemForMidnightCommander/u7z contrib/gzip-like_CLI_wrapper_for_7z/p7zip
-	cd .. ; (tar cf - $(ARCHIVE)/bin $(ARCHIVE)/contrib $(ARCHIVE)/man1 $(ARCHIVE)/install.sh $(ARCHIVE)/ChangeLog $(ARCHIVE)/DOCS $(ARCHIVE)/README $(ARCHIVE)/TODO | 7za a -mx=9 -tbzip2 -si $(ARCHIVE)_x86_linux_bin.tar.bz2)
+	cd CPP/ANDROID                   ; $(MAKE) clean
+	cd Utils/CPUTest/MemLat          ; $(MAKE) clean
+	cd Utils/CPUTest/PipeLen         ; $(MAKE) clean
+	cd CPP/7zip/UI/P7ZIP             ; $(MAKE) clean
+
+LzmaCon:
+	cd CPP/7zip/Bundles/LzmaCon ; $(MAKE)
+
+test_LzmaCon:
+	cd CPP/7zip/Bundles/LzmaCon ; $(MAKE) test
 

data/ext/p7zip/makefile.openbsd

@@ -9,12 +9,16 @@ ALLFLAGS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
         -DNDEBUG -D_REENTRANT -DENV_UNIX -fPIC \
         $(LOCAL_FLAGS)
 
-CXX=$(MYCXX) $(ALLFLAGS) $(MYCXXFLAGS)
-CC=$(MYCC) $(ALLFLAGS) $(MYCFLAGS)
-LINK_SHARED=-shared
+ALLFLAGS_CPP=-DENV_HAVE_GCCVISIBILITYPATCH -fvisibility=hidden -fvisibility-inlines-hidden
+
+CXX=$(MYCXX) $(MYCXXFLAGS)
+CC=$(MYCC)  $(MYCFLAGS)
+CC_SHARED=-fPIC
+LINK_SHARED=-fPIC -shared
                                                                                                       
 LOCAL_LIBS=-lpthread
 LOCAL_LIBS_DLL=$(LOCAL_LIBS)
 
 OBJ_CRC32=$(OBJ_CRC32_C)
+OBJ_AES=
 

data/ext/p7zip/makefile.openbsd_no_port

@@ -2,19 +2,23 @@
 # makefile for OpenBSD (x86, PPC, alpha ...)
 #
 
-OPTFLAGS=-O
+OPTFLAGS=-O -s
 
-ALLFLAGS=${OPTFLAGS} -s \
+ALLFLAGS=${OPTFLAGS} \
         -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
         -DNDEBUG -D_REENTRANT -DENV_UNIX \
         $(LOCAL_FLAGS)
                                                                                                       
-CXX=g++ $(ALLFLAGS)
-CC=gcc $(ALLFLAGS)
-LINK_SHARED=-shared
+ALLFLAGS_CPP=-DENV_HAVE_GCCVISIBILITYPATCH -fvisibility=hidden -fvisibility-inlines-hidden
+
+CXX=g++
+CC=gcc
+CC_SHARED=-fPIC
+LINK_SHARED=-fPIC -shared
                                                                                                       
 LOCAL_LIBS=-lpthread
 LOCAL_LIBS_DLL=$(LOCAL_LIBS)
 
 OBJ_CRC32=$(OBJ_CRC32_C)
+OBJ_AES=
 

data/ext/p7zip/makefile.qnx_shared.bin

@@ -2,15 +2,15 @@
 # makefile.machine for "7z , 7za , 7zr , 7zCon.sfx " :
 # tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target
 
-OPTFLAGS=-O
+OPTFLAGS=-O -s
 
-ALLFLAGS=${OPTFLAGS} -s \
+ALLFLAGS=${OPTFLAGS} \
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
        -DNDEBUG -D_REENTRANT -DENV_UNIX \
        $(LOCAL_FLAGS)
 
-CXX=QCC -V3.3.5,gcc_ntox86 $(ALLFLAGS)
-CC=qcc -V3.3.5,gcc_ntox86 $(ALLFLAGS)
+CXX=QCC -V3.3.5,gcc_ntox86
+CC=qcc -V3.3.5,gcc_ntox86
 LINK_SHARED=-shared
 
 #LOCAL_LIBS=-lpthread
@@ -18,4 +18,5 @@ LINK_SHARED=-shared
 LOCAL_LIBS_DLL=$(LOCAL_LIBS)
 
 OBJ_CRC32=$(OBJ_CRC32_C)
+OBJ_AES=
 

data/ext/p7zip/makefile.qnx_static

@@ -2,15 +2,15 @@
 # makefile.machine for "static 7za 7zr 7zCon.sfx" :
 # tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target
 
-OPTFLAGS=-O
+OPTFLAGS=-O -s
 
-ALLFLAGS=${OPTFLAGS} -s \
+ALLFLAGS=${OPTFLAGS} \
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
        -DNDEBUG -D_REENTRANT -DENV_UNIX \
        $(LOCAL_FLAGS) -Bstatic
 
-CXX=QCC -V3.3.5,gcc_ntox86 $(ALLFLAGS)
-CC=qcc -V3.3.5,gcc_ntox86 $(ALLFLAGS)
+CXX=QCC -V3.3.5,gcc_ntox86
+CC=qcc -V3.3.5,gcc_ntox86
 LINK_SHARED=-Bstatic
 
 #LOCAL_LIBS=-lpthread
@@ -18,4 +18,5 @@ LINK_SHARED=-Bstatic
 LOCAL_LIBS_DLL=$(LOCAL_LIBS)
 
 OBJ_CRC32=$(OBJ_CRC32_C)
+OBJ_AES=
 

data/ext/p7zip/makefile.solaris_sparc_CC_32

@@ -1,15 +1,15 @@
 
-OPTFLAGS=-fast
+OPTFLAGS=-fast -s
 
-ALLFLAGS=${OPTFLAGS} -s -mt \
+ALLFLAGS=${OPTFLAGS} -mt \
         -DHAVE_LONG_LONG \
         -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
         -DENV_UNIX \
         -DNDEBUG -D_REENTRANT \
         $(LOCAL_FLAGS)
 
-CXX=CC $(ALLFLAGS)
-CC=cc $(ALLFLAGS)
+CXX=CC
+CC=cc
 CC_SHARED=-KPIC
 LINK_SHARED=-KPIC -G
 
@@ -18,4 +18,5 @@ LOCAL_LIBS=-lpthread -lCrun
 LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
 
 OBJ_CRC32=$(OBJ_CRC32_C)
+OBJ_AES=
 

data/ext/p7zip/makefile.solaris_sparc_CC_64

@@ -2,16 +2,17 @@
 #-fast -xarch=v9 => 64 bits
 # use "isainfo -v" to set the flag "-xarch"
 
-OPTFLAGS=-fast -xarch=v9
-ALLFLAGS=${OPTFLAGS} -s -mt \
+OPTFLAGS=-fast -xarch=v9 -s
+
+ALLFLAGS=${OPTFLAGS} -mt \
         -DHAVE_LONG_LONG \
         -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
         -DENV_UNIX \
         -DNDEBUG -D_REENTRANT \
         $(LOCAL_FLAGS)
 
-CXX=CC $(ALLFLAGS)
-CC=cc $(ALLFLAGS)
+CXX=CC
+CC=cc
 CC_SHARED=-KPIC
 LINK_SHARED=-KPIC -G
 
@@ -20,4 +21,5 @@ LOCAL_LIBS=-lpthread -lCrun
 LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
 
 OBJ_CRC32=$(OBJ_CRC32_C)
+OBJ_AES=
 

data/ext/p7zip/makefile.solaris_sparc_gcc

@@ -1,16 +1,16 @@
 
-OPTFLAGS=-O
+OPTFLAGS=-O -s
 
-ALLFLAGS=${OPTFLAGS} -s \
+ALLFLAGS=${OPTFLAGS} \
     	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
 	-DENV_UNIX \
 	-DNDEBUG -D_REENTRANT \
 	$(LOCAL_FLAGS)
 
-#CXX=/opt/sfw/bin/g++ $(ALLFLAGS)
-#CC=/opt/sfw/bin/gcc $(ALLFLAGS)
-CXX=g++ $(ALLFLAGS)
-CC=gcc $(ALLFLAGS)
+#CXX=/opt/sfw/bin/g++
+#CC=/opt/sfw/bin/gcc
+CXX=g++
+CC=gcc
 CC_SHARED=-fPIC
 LINK_SHARED=-fPIC -shared
 
@@ -18,4 +18,5 @@ LOCAL_LIBS=-lpthread -lrt
 LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
 
 OBJ_CRC32=$(OBJ_CRC32_C)
+OBJ_AES=
 

data/ext/p7zip/makefile.solaris_x86

@@ -1,14 +1,14 @@
 
-OPTFLAGS=-O
+OPTFLAGS=-O -s
 
-ALLFLAGS=${OPTFLAGS} -s \
+ALLFLAGS=${OPTFLAGS} \
     	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
 	-DENV_UNIX \
 	-DNDEBUG -D_REENTRANT \
 	$(LOCAL_FLAGS)
 
-CXX=g++ $(ALLFLAGS)
-CC=gcc $(ALLFLAGS)
+CXX=g++
+CC=gcc
 CC_SHARED=-fPIC
 LINK_SHARED=-fPIC -shared
 
@@ -16,4 +16,5 @@ LOCAL_LIBS=-lpthread -lrt
 LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
 
 OBJ_CRC32=$(OBJ_CRC32_C)
+OBJ_AES=
 

data/ext/p7zip/makefile.tru64

@@ -3,15 +3,15 @@
 # tested with OSF 5.1 and g++ 3.4.2
 #
 
-OPTFLAGS=-O
+OPTFLAGS=-O -s
 
-ALLFLAGS=${OPTFLAGS} -s \
+ALLFLAGS=${OPTFLAGS} \
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
        -DNDEBUG -D_REENTRANT -DENV_UNIX \
        $(LOCAL_FLAGS)
 
-CXX=g++ $(ALLFLAGS)
-CC=gcc $(ALLFLAGS)
+CXX=g++
+CC=gcc
 CC_SHARED=-fPIC
 LINK_SHARED=-fPIC -shared
 
@@ -19,4 +19,5 @@ LOCAL_LIBS=-lpthread
 LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
 
 OBJ_CRC32=$(OBJ_CRC32_C)
+OBJ_AES=
 

data/ext/seven_zip_ruby/extconf.rb

@@ -3,6 +3,68 @@
 require("mkmf")
 require("rbconfig")
 
+
+#SO_TARGET_DIR = File.expand_path(File.join(RbConfig::CONFIG["sitearchdir"], "seven_zip_ruby"))
+SO_TARGET_DIR = File.expand_path(File.dirname(__FILE__), "../../lib/seven_zip_ruby")
+
+def create_p7zip_makefile(type)
+  config = RbConfig::CONFIG
+
+  allflags = config["ARCH_FLAG"] + ' -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT -DENV_UNIX -v '
+  case(type)
+  when :macosx
+    allflags += ' -DENV_MACOSX '
+    # Add explicit arch flag and deployment target for arm64 support
+    if RUBY_PLATFORM.include?('arm64')
+      allflags += ' -arch arm64 '
+      # Set minimum deployment target to ensure arm64 compatibility
+      ENV['MACOSX_DEPLOYMENT_TARGET'] = '11.0'
+    end
+    cc_shared = nil
+    link_shared = "-bundle"
+    local_libs = "-framework CoreFoundation"
+    local_libs_dll = '$(LOCAL_LIBS)'
+  when :linux, :freebsd
+    allflags += ' -DNDEBUG -D_7ZIP_LARGE_PAGES -pipe -s '
+    cc_shared = "-fPIC"
+    link_shared = "-fPIC -shared"
+    local_libs = "-lpthread"
+    local_libs_dll = '$(LOCAL_LIBS) -ldl'
+  end
+
+  cc_shared_content = (cc_shared ? "CC_SHARED=#{cc_shared}" : "")
+
+  makefile_content = <<"EOS"
+ALLFLAGS=#{allflags} $(LOCAL_FLAGS)
+CXX=#{config['CXX']} $(ALLFLAGS) -Wall -Wextra
+CC=#{config['CC']} $(ALLFLAGS) -Wall -Wextra
+#{cc_shared_content}
+LINK_SHARED=#{link_shared}
+
+LOCAL_LIBS=#{local_libs}
+LOCAL_LIBS_DLL=#{local_libs_dll}
+OBJ_CRC32=$(OBJ_CRC32_C)
+EOS
+
+  File.open("makefile.machine", "w") do |file|
+    file.puts makefile_content
+  end
+end
+
+def check_ostype
+  if (RUBY_PLATFORM.include?("darwin"))
+    # Ensure proper flags are set for macOS compilation
+    ENV['SDKROOT'] = `xcrun --show-sdk-path`.chomp
+    return :macosx
+  elsif (RUBY_PLATFORM.include?("linux"))
+    return :linux
+  elsif (RUBY_PLATFORM.include?("freebsd"))
+    return :freebsd
+  else
+    raise "Unsupported platform"
+  end
+end
+
 def sample_cpp_source
   # Check the following features.
   #  - lambda
@@ -67,6 +129,7 @@ end
 def sample_for_nullptr
   return <<'EOS'
 #include <stdio.h>
+#include <cstddef>
 int main(int argc, char *argv[])
 {
     printf("%p\n", nullptr);
@@ -83,24 +146,27 @@ def main
   unless (try_compile(sample_for_rb_thread_call_without_gvl(th_h)))
     base_flag += " -DNO_RB_THREAD_CALL_WITHOUT_GVL"
   end
-  unless (try_compile(sample_for_nullptr))
+  unless (try_compile(sample_for_nullptr, "-x c++ "))
     base_flag += " -DNO_NULLPTR"
   end
+  if (have_header("wctype.h"))
+    base_flag += " -DENV_HAVE_WCTYPE_H"
+  end
 
   if (RUBY_PLATFORM.include?("mswin"))
     # mswin32
-    $LIBS = "oleaut32.lib"
-    $CPPFLAGS = "/I.. /EHsc /DNDEBUG /DUSE_WIN32_FILE_API #{base_flag} #{$CPPFLAGS} "
+    $LIBS = "oleaut32.lib shlwapi.lib"
+    $CPPFLAGS = "/I..\\p7zip /EHsc /DNDEBUG /DUSE_WIN32_FILE_API #{base_flag} #{$CPPFLAGS} "
   elsif (RUBY_PLATFORM.include?("mingw"))
     # MinGW
-    $LIBS = "-loleaut32 -static-libgcc -static-libstdc++"
+    $LIBS = "-loleaut32 -lshlwapi -static-libgcc -static-libstdc++"
 
     cpp0x_flag = [ "", "-std=gnu++11", "-std=c++11", "-std=gnu++0x", "-std=c++0x" ].find do |opt|
       try_compile(sample_cpp_source, "#{opt} -x c++ ")
     end
     raise "C++11 is not supported by the compiler." unless (cpp0x_flag)
 
-    $CPPFLAGS = "-I.. #{cpp0x_flag} -DNDEBUG -DUSE_WIN32_FILE_API #{base_flag} #{$CPPFLAGS} "
+    $CPPFLAGS = "-I../p7zip #{cpp0x_flag} -DNDEBUG -DUSE_WIN32_FILE_API #{base_flag} #{$CPPFLAGS} "
   else
     removed_flags = [ /\-mmacosx\-version\-min=[.0-9]+\b/ ]
     removed_flags.each do |flag|
@@ -118,8 +184,28 @@ def main
     end
     raise "C++11 is not supported by the compiler." unless (cpp0x_flag)
 
-    $CPPFLAGS = "-I.. -I../CPP/include_windows -I../CPP #{cpp0x_flag} -DNDEBUG #{base_flag} #{$CPPFLAGS} "
+    $CPPFLAGS = "-I../p7zip -I../p7zip/CPP/include_windows -I../p7zip/CPP #{cpp0x_flag} -DNDEBUG #{base_flag} #{$CPPFLAGS} "
+
+
+    ostype = check_ostype
 
+    Dir.chdir(File.expand_path("../../p7zip", __FILE__)) do
+      create_p7zip_makefile(ostype)
+
+      # Use ARM64-specific makefile for macOS arm64
+      if RUBY_PLATFORM.include?('darwin') && RUBY_PLATFORM.include?('arm64')
+        system("cp makefile.macosx_arm64 makefile.machine")
+      end
+
+      make_success = system("make common7z")
+      raise "Failed to make p7zip" unless (make_success)
+
+#      FileUtils.mkpath(SO_TARGET_DIR)
+      FileUtils.cp("./bin/7z.so", SO_TARGET_DIR)
+
+#      system("make clean")
+      system("rm -r bin CPP/7zip/Bundles/Format7zFree/*.o CPP/7zip/Compress/Rar/*.o")
+    end
   end
   mfile = create_makefile("seven_zip_ruby/seven_zip_archive")
 end