1722612409

Author: Oleh Kulykov

CMakeLists.txt

@@ -223,48 +223,43 @@ if (LIBPLZMA_OPT_ANDROID)
 endif()
 
 # ---- check include ----
-CHECK_INCLUDE_FILE("sys/types.h" LIBPLZMA_HAVE_SYS_TYPES_H)
-if (LIBPLZMA_HAVE_SYS_TYPES_H)
-  add_definitions(-DHAVE_SYS_TYPES_H=1)
-endif()
-
-CHECK_INCLUDE_FILE("sys/sys_types.h" LIBPLZMA_HAVE_SYS_SYS_TYPES_H)
-if (LIBPLZMA_HAVE_SYS_SYS_TYPES_H)
+CHECK_INCLUDE_FILE("sys/sys_types.h" HAVE_SYS_SYS_TYPES_H)
+if (HAVE_SYS_SYS_TYPES_H)
   add_definitions(-DHAVE_SYS_SYS_TYPES_H=1)
 endif()
 
-CHECK_INCLUDE_FILE("sys/sysmacros.h" LIBPLZMA_HAVE_SYS_SYSMACROS_H)
-if (LIBPLZMA_HAVE_SYS_SYSMACROS_H)
+CHECK_INCLUDE_FILE("sys/sysmacros.h" HAVE_SYS_SYSMACROS_H)
+if (HAVE_SYS_SYSMACROS_H)
   add_definitions(-DHAVE_SYS_SYSMACROS_H=1)
 endif()
 
-CHECK_INCLUDE_FILE("sys/utime.h" LIBPLZMA_HAVE_SYS_UTIME_H)
-if (LIBPLZMA_HAVE_SYS_UTIME_H)
+CHECK_INCLUDE_FILE("sys/utime.h" HAVE_SYS_UTIME_H)
+if (HAVE_SYS_UTIME_H)
   add_definitions(-DHAVE_SYS_UTIME_H=1)
 endif()
 
-CHECK_INCLUDE_FILE("utime.h" LIBPLZMA_HAVE_UTIME_H)
-if (LIBPLZMA_HAVE_UTIME_H)
+CHECK_INCLUDE_FILE("utime.h" HAVE_UTIME_H)
+if (HAVE_UTIME_H)
   add_definitions(-DHAVE_UTIME_H=1)
 endif()
 
-CHECK_INCLUDE_FILE("semaphore.h" LIBPLZMA_SEMAPHORE_H)
-if (LIBPLZMA_SEMAPHORE_H)
+CHECK_INCLUDE_FILE("semaphore.h" HAVE_SEMAPHORE_H)
+if (HAVE_SEMAPHORE_H)
   add_definitions(-DHAVE_SEMAPHORE_H=1)
 endif()
 
-CHECK_INCLUDE_FILE("unistd.h" LIBPLZMA_UNISTD_H)
-if (LIBPLZMA_UNISTD_H)
+CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
+if (HAVE_UNISTD_H)
   add_definitions(-DHAVE_UNISTD_H=1)
 endif()
 
-CHECK_INCLUDE_FILE("pthread.h" LIBPLZMA_PTHREAD_H)
-if (LIBPLZMA_PTHREAD_H)
+CHECK_INCLUDE_FILE("pthread.h" HAVE_PTHREAD_H)
+if (HAVE_PTHREAD_H)
   add_definitions(-DHAVE_PTHREAD_H=1)
 endif()
 
-CHECK_INCLUDE_FILE("android/api-level.h" LIBPLZMA_ANDROID_API_LEVEL_H)
-if (LIBPLZMA_ANDROID_API_LEVEL_H)
+CHECK_INCLUDE_FILE("android/api-level.h" HAVE_ANDROID_API_LEVEL_H)
+if (HAVE_ANDROID_API_LEVEL_H)
   add_definitions(-DHAVE_ANDROID_API_LEVEL_H=1)
 endif()
 

PLzmaSDK-ObjC.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
 
   s.source_files = 'libplzma.h', 'libplzma.hpp', 'src/**/*.{c,cpp,h,hpp}', 'objc/*.{mm,h,inl}'
   s.public_header_files = 'objc/*.h'
-  s.compiler_flags = '-fPIC -fno-rtti -DLIBPLZMA_VERSION_BUILD=946', '-DLIBPLZMA_NO_C_BINDINGS=1'
+  s.compiler_flags = '-fPIC -fno-rtti -DLIBPLZMA_VERSION_BUILD=1047', '-DLIBPLZMA_NO_C_BINDINGS=1'
   s.libraries = 'c++'
   s.requires_arc = true
 

PLzmaSDK.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.subspec 'libplzma' do |libplzma|
     libplzma.source_files = 'libplzma.h', 'libplzma.hpp', 'src/**/*.{c,cpp,h,hpp}'
     libplzma.public_header_files = 'libplzma.h'
-    libplzma.compiler_flags = '-fPIC -fno-rtti -DLIBPLZMA_VERSION_BUILD=946'
+    libplzma.compiler_flags = '-fPIC -fno-rtti -DLIBPLZMA_VERSION_BUILD=1047'
     libplzma.libraries = 'c++'
   end
 

Package.swift

@@ -13,11 +13,11 @@ let package = Package(
         .target(name: "libplzma",
                 path: "src",
                 cSettings: [
-                    .define("LIBPLZMA_VERSION_BUILD", to: "946"),
+                    .define("LIBPLZMA_VERSION_BUILD", to: "1047"),
                     .unsafeFlags(["-fPIC"])
                 ],
                 cxxSettings: [
-                    .define("LIBPLZMA_VERSION_BUILD", to: "946"),
+                    .define("LIBPLZMA_VERSION_BUILD", to: "1047"),
                     .unsafeFlags(["-fPIC", "-fno-rtti"])
                 ]),
         .target(name: "PLzmaSDK",

android/jni/Android.mk

@@ -158,7 +158,7 @@ ALL_INCLUDES := $(LOCAL_PATH)/../../../
 ALL_CFLAGS := \
     -DLIBPLZMA_BUILD=1 \
     -DLIBPLZMA_SHARED=1 \
-    -DLIBPLZMA_VERSION_BUILD=946 \
+    -DLIBPLZMA_VERSION_BUILD=1047 \
     -w
 
 

appveyor.yml

@@ -56,5 +56,5 @@ build_script:
   - cmake %CMAKE_ARGS% ..
   - cmake --build . --config Release --parallel 4
   - ctest --verbose
-  - cmake --build . --config Release --target Install
+  - cmake --build . --config Release --target install
   - cd ..

binding.gyp

@@ -3,7 +3,7 @@
     {
       'target_name': 'plzmasdk',
       'defines': [
-        'LIBPLZMA_VERSION_BUILD=946',
+        'LIBPLZMA_VERSION_BUILD=1047',
         'LIBPLZMA_SHARED=1',
         'LIBPLZMA_NO_C_BINDINGS=1',
         'LIBPLZMA_HAVE_STD=1',

build.gradle

@@ -22,7 +22,7 @@ android {
         versionName "1.4.6"
         externalNativeBuild {
             cmake {
-                arguments "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DLIBCLZMA_OPT_ANDROID:BOOL=ON", "-DLIBCLZMA_OPT_STATIC:BOOL=OFF", "-DLIBCLZMA_OPT_TESTS:BOOL=OFF", "-DLIBCLZMA_OPT_BUILD_NUMBER=946"
+                arguments "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DLIBCLZMA_OPT_ANDROID:BOOL=ON", "-DLIBCLZMA_OPT_STATIC:BOOL=OFF", "-DLIBCLZMA_OPT_TESTS:BOOL=OFF", "-DLIBCLZMA_OPT_BUILD_NUMBER=1047"
                 cppFlags "-fexceptions"
             }
         }

cmake_tests/CMakeLists.txt

@@ -34,7 +34,7 @@ remove_definitions(-DCMAKE_BUILD=1)
 remove_definitions(-DLIBPLZMA_BUILD=1)
 
 # ---- definitions ----
-if (WIN32 OR WIN64)
+if (WIN32)
   add_definitions(-DUNICODE=1)
   add_definitions(-D_UNICODE=1)
 endif()

src/plzma_path_utils.hpp

@@ -54,10 +54,10 @@
 #  include <sys/time.h>
 #  include <dirent.h>
 #  include <unistd.h>
-#  if __has_include(<direct.h>) || defined(LIBPLZMA_MINGW)
+#  if __has_include(<direct.h>) || defined(HAVE_DIRECT_H) || defined(LIBPLZMA_MINGW)
 #    include <direct.h>
 #  endif
-#  if __has_include(<io.h>) || defined(LIBPLZMA_MINGW)
+#  if __has_include(<io.h>) || defined(HAVE_IO_H) || defined(LIBPLZMA_MINGW)
 #    include <io.h>
 #  endif
 #  if defined(LIBPLZMA_MINGW)