Skip to content
This repository has been archived by the owner on Jun 8, 2024. It is now read-only.

Commit

Permalink
update vc builder version to vc2022; update makefile for new lzma ver…
Browse files Browse the repository at this point in the history 
…sion; update xcode build sets;
  • Loading branch information
@sisong
sisong committed Oct 8, 2023
1 parent 1e00b08 commit db6e33e
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 40 deletions.
15 changes: 11 additions & 4 deletions VirtualApkPatch/builds_test/vc/VirtualApkPatch.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,30 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -119,7 +123,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>
</AdditionalDependencies>
</Link>
Expand All @@ -134,7 +138,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>
</AdditionalDependencies>
</Link>
Expand All @@ -149,8 +153,6 @@
<ClCompile Include="..\..\..\ApkDiffPatch\HDiffPatch\libHDiffPatch\HPatch\patch.c" />
<ClCompile Include="..\..\..\ApkDiffPatch\HDiffPatch\libParallel\parallel_channel.cpp" />
<ClCompile Include="..\..\..\ApkDiffPatch\HDiffPatch\libParallel\parallel_import.cpp" />
<ClCompile Include="..\..\..\ApkDiffPatch\lzma\C\Lzma2Dec.c" />
<ClCompile Include="..\..\..\ApkDiffPatch\lzma\C\LzmaDec.c" />
<ClCompile Include="..\..\..\ApkDiffPatch\src\patch\NewStream.cpp" />
<ClCompile Include="..\..\..\ApkDiffPatch\src\patch\OldStream.cpp" />
<ClCompile Include="..\..\..\ApkDiffPatch\src\patch\Patcher.cpp" />
Expand Down Expand Up @@ -180,6 +182,11 @@
<ClInclude Include="..\..\..\ApkDiffPatch\src\patch\Zipper.h" />
<ClInclude Include="..\..\patch\virtual_apk_patch.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\ApkDiffPatch\HDiffPatch\builds\vc\lzma.vcxproj">
<Project>{0849cd0e-1b9b-44eb-8937-a278b6a7e2cf}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
9 changes: 0 additions & 9 deletions VirtualApkPatch/builds_test/vc/VirtualApkPatch.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@
<ClCompile Include="..\..\..\ApkDiffPatch\src\patch\Zipper.cpp">
<Filter>ApkDiffPatch</Filter>
</ClCompile>
<ClCompile Include="..\..\..\ApkDiffPatch\lzma\C\LzFind.c">
<Filter>lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\..\ApkDiffPatch\lzma\C\LzmaDec.c">
<Filter>lzma</Filter>
</ClCompile>
<ClCompile Include="..\..\..\ApkDiffPatch\zlib1.2.11\adler32.c">
<Filter>zlib</Filter>
</ClCompile>
Expand Down Expand Up @@ -98,9 +92,6 @@
<Filter Include="ApkDiffPatch">
<UniqueIdentifier>{172e7ddf-de29-421e-a9bf-8f08b5bae838}</UniqueIdentifier>
</Filter>
<Filter Include="lzma">
<UniqueIdentifier>{12a0cb01-8df8-41fa-a174-7094b245cfa4}</UniqueIdentifier>
</Filter>
<Filter Include="zlib">
<UniqueIdentifier>{52c2d553-1c2e-46d7-853e-9fad42537d0e}</UniqueIdentifier>
</Filter>
Expand Down
59 changes: 37 additions & 22 deletions VirtualApkPatch/builds_test/xcode/VirtualApkPatch.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
0DA952AD2AB02AD300C3A4F0 /* liblzma.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DA952AA2AB02AA600C3A4F0 /* liblzma.a */; };
D65C69D423293AFA00A3C89C /* virtual_apk_patch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D65C69D123293AFA00A3C89C /* virtual_apk_patch.cpp */; };
D65C69E6232A0EA100A3C89C /* OldStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D65C69DE232A0EA100A3C89C /* OldStream.cpp */; };
D65C69E7232A0EA100A3C89C /* ZipDiffData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D65C69DF232A0EA100A3C89C /* ZipDiffData.cpp */; };
Expand All @@ -17,19 +18,25 @@
D65C6A03232A0F6900A3C89C /* parallel_import.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D65C69FB232A0F6900A3C89C /* parallel_import.cpp */; };
D65C6A05232A0F6900A3C89C /* file_for_patch.c in Sources */ = {isa = PBXBuildFile; fileRef = D65C69FE232A0F6900A3C89C /* file_for_patch.c */; };
D65C6A0C232A0F8200A3C89C /* patch.c in Sources */ = {isa = PBXBuildFile; fileRef = D65C6A09232A0F8200A3C89C /* patch.c */; };
D65C6A0E232A0FBB00A3C89C /* liblzma.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D65C69F0232A0EF400A3C89C /* liblzma.a */; };
D65C6A0F232A0FBB00A3C89C /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D65C69F6232A0EF400A3C89C /* libzlib.a */; };
D698B4D0236AD0BB00FC04E9 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D698B4CF236AD0BB00FC04E9 /* main.cpp */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
D65C69EF232A0EF400A3C89C /* PBXContainerItemProxy */ = {
0DA952A92AB02AA600C3A4F0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D65C69EB232A0EF400A3C89C /* lzma.xcodeproj */;
containerPortal = 0DA952A42AB02AA600C3A4F0 /* lzma.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = D68B02C7205A4409001F3C40;
remoteGlobalIDString = D690ABCE1F208EA80089DC57;
remoteInfo = lzma;
};
0DA952AB2AB02AA600C3A4F0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0DA952A42AB02AA600C3A4F0 /* lzma.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 0D225ACF2A98EBB300DBD5B1;
remoteInfo = lzma_arm64;
};
D65C69F5232A0EF400A3C89C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D65C69F1232A0EF400A3C89C /* zlib.xcodeproj */;
Expand All @@ -52,6 +59,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
0DA952A42AB02AA600C3A4F0 /* lzma.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = lzma.xcodeproj; path = ../../../ApkDiffPatch/HDiffPatch/builds/xcode/lzma.xcodeproj; sourceTree = "<group>"; };
D65C69C523293AB300A3C89C /* VirtualApkPatch */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = VirtualApkPatch; sourceTree = BUILT_PRODUCTS_DIR; };
D65C69D123293AFA00A3C89C /* virtual_apk_patch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = virtual_apk_patch.cpp; sourceTree = "<group>"; };
D65C69D223293AFA00A3C89C /* virtual_apk_patch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = virtual_apk_patch.h; sourceTree = "<group>"; };
Expand All @@ -66,7 +74,6 @@
D65C69E3232A0EA100A3C89C /* Patcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Patcher.cpp; sourceTree = "<group>"; };
D65C69E4232A0EA100A3C89C /* ZipDiffData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipDiffData.h; sourceTree = "<group>"; };
D65C69E5232A0EA100A3C89C /* NewStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewStream.h; sourceTree = "<group>"; };
D65C69EB232A0EF400A3C89C /* lzma.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = lzma.xcodeproj; path = ../../../ApkDiffPatch/builds/xcode/lzma.xcodeproj; sourceTree = "<group>"; };
D65C69F1232A0EF400A3C89C /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = ../../../ApkDiffPatch/builds/xcode/zlib.xcodeproj; sourceTree = "<group>"; };
D65C69F9232A0F6900A3C89C /* parallel_channel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parallel_channel.cpp; sourceTree = "<group>"; };
D65C69FA232A0F6900A3C89C /* parallel_import.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parallel_import.h; sourceTree = "<group>"; };
Expand All @@ -90,17 +97,28 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D65C6A0E232A0FBB00A3C89C /* liblzma.a in Frameworks */,
D65C6A0F232A0FBB00A3C89C /* libzlib.a in Frameworks */,
0DA952AD2AB02AD300C3A4F0 /* liblzma.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
0DA952A52AB02AA600C3A4F0 /* Products */ = {
isa = PBXGroup;
children = (
0DA952AA2AB02AA600C3A4F0 /* liblzma.a */,
0DA952AC2AB02AA600C3A4F0 /* liblzma_arm64.a */,
);
name = Products;
sourceTree = "<group>";
};
D65C69BC23293AB300A3C89C = {
isa = PBXGroup;
children = (
0DA952A42AB02AA600C3A4F0 /* lzma.xcodeproj */,
D65C69F1232A0EF400A3C89C /* zlib.xcodeproj */,
D65C69D9232A0E5900A3C89C /* ApkDiffPatch */,
D65C69D023293AFA00A3C89C /* patch */,
D698B4CF236AD0BB00FC04E9 /* main.cpp */,
Expand Down Expand Up @@ -130,8 +148,6 @@
D65C69D9232A0E5900A3C89C /* ApkDiffPatch */ = {
isa = PBXGroup;
children = (
D65C69EB232A0EF400A3C89C /* lzma.xcodeproj */,
D65C69F1232A0EF400A3C89C /* zlib.xcodeproj */,
D65C69F7232A0F0D00A3C89C /* hpatch */,
D65C69DA232A0EA100A3C89C /* patch */,
);
Expand All @@ -158,14 +174,6 @@
path = ../../../ApkDiffPatch/src/patch;
sourceTree = "<group>";
};
D65C69EC232A0EF400A3C89C /* Products */ = {
isa = PBXGroup;
children = (
D65C69F0232A0EF400A3C89C /* liblzma.a */,
);
name = Products;
sourceTree = "<group>";
};
D65C69F2232A0EF400A3C89C /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -274,8 +282,8 @@
projectDirPath = "";
projectReferences = (
{
ProductGroup = D65C69EC232A0EF400A3C89C /* Products */;
ProjectRef = D65C69EB232A0EF400A3C89C /* lzma.xcodeproj */;
ProductGroup = 0DA952A52AB02AA600C3A4F0 /* Products */;
ProjectRef = 0DA952A42AB02AA600C3A4F0 /* lzma.xcodeproj */;
},
{
ProductGroup = D65C69F2232A0EF400A3C89C /* Products */;
Expand All @@ -290,11 +298,18 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
D65C69F0232A0EF400A3C89C /* liblzma.a */ = {
0DA952AA2AB02AA600C3A4F0 /* liblzma.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = liblzma.a;
remoteRef = D65C69EF232A0EF400A3C89C /* PBXContainerItemProxy */;
remoteRef = 0DA952A92AB02AA600C3A4F0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0DA952AC2AB02AA600C3A4F0 /* liblzma_arm64.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = liblzma_arm64.a;
remoteRef = 0DA952AB2AB02AA600C3A4F0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
D65C69F6232A0EF400A3C89C /* libzlib.a */ = {
Expand Down Expand Up @@ -332,7 +347,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = x86_64;
ARCHS = "$(ARCHS_STANDARD)";
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
Expand Down Expand Up @@ -394,7 +409,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = x86_64;
ARCHS = "$(ARCHS_STANDARD)";
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
Expand Down
8 changes: 6 additions & 2 deletions project_fix_unity_jar/fix_unity_jar/builds/vc/FixUnityJar/FixUnityJar.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,30 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -122,7 +126,7 @@
</PrecompiledHeaderFile>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>
</AdditionalDependencies>
</Link>
Expand All @@ -136,7 +140,7 @@
</PrecompiledHeaderFile>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>
</AdditionalDependencies>
</Link>
Expand Down
6 changes: 3 additions & 3 deletions project_hook_unity_jni/build_libs/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ Src_Files := $(LOCAL_PATH)/../src/hook_unity.cpp \

LOCAL_SRC_FILES := $(Src_Files) $(xHook_Files) $(Lzma_Files) $(Zlib_Files) $(Hdp_Files) $(Adp_Files)

DEF_FLAGS := -O2 -D_7ZIP_ST -D_IS_USED_MULTITHREAD=1 -D_IS_USED_PTHREAD=1 \
DEF_FLAGS := -DZ7_ST -D_IS_USED_MULTITHREAD=1 -D_IS_USED_PTHREAD=1 -D_IS_NEED_CACHE_OLD_BY_COVERS=0 \
-D_IS_NEED_FIXED_ZLIB_VERSION=1 -D_IS_NEED_VIRTUAL_ZIP=1
ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
DEF_FLAGS += -D_LZMA_DEC_OPT
DEF_FLAGS += -DZ7_LZMA_DEC_OPT
endif

LOCAL_LDLIBS := -llog -landroid
LOCAL_CFLAGS := -DANDROID_NDK -DTARGET_ARCH_ABI=\"$(TARGET_ARCH_ABI)\" $(DEF_FLAGS)
LOCAL_CFLAGS := -Os -DANDROID_NDK -DNDEBUG -D_LARGEFILE_SOURCE -DTARGET_ARCH_ABI=\"$(TARGET_ARCH_ABI)\" $(DEF_FLAGS)

include $(BUILD_SHARED_LIBRARY)

0 comments on commit db6e33e

Please sign in to comment.