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

Commit db6e33e

Browse files
sisongsisong
committed
update vc builder version to vc2022; update makefile for new lzma version; update xcode build sets;
1 parent 1e00b08 commit db6e33e

File tree

5 files changed

+57
-40
lines changed

5 files changed

+57
-40
lines changed

‎VirtualApkPatch/builds_test/vc/VirtualApkPatch.vcxproj‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,30 @@
3030
<UseDebugLibraries>true</UseDebugLibraries>
3131
<CLRSupport>false</CLRSupport>
3232
<CharacterSet>Unicode</CharacterSet>
33+
<PlatformToolset>v143</PlatformToolset>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3536
<ConfigurationType>Application</ConfigurationType>
3637
<UseDebugLibraries>true</UseDebugLibraries>
3738
<CLRSupport>false</CLRSupport>
3839
<CharacterSet>Unicode</CharacterSet>
40+
<PlatformToolset>v143</PlatformToolset>
3941
</PropertyGroup>
4042
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4143
<ConfigurationType>Application</ConfigurationType>
4244
<UseDebugLibraries>false</UseDebugLibraries>
4345
<CLRSupport>false</CLRSupport>
4446
<CharacterSet>Unicode</CharacterSet>
4547
<WholeProgramOptimization>true</WholeProgramOptimization>
48+
<PlatformToolset>v143</PlatformToolset>
4649
</PropertyGroup>
4750
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4851
<ConfigurationType>Application</ConfigurationType>
4952
<UseDebugLibraries>false</UseDebugLibraries>
5053
<CLRSupport>false</CLRSupport>
5154
<CharacterSet>Unicode</CharacterSet>
5255
<WholeProgramOptimization>true</WholeProgramOptimization>
56+
<PlatformToolset>v143</PlatformToolset>
5357
</PropertyGroup>
5458
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5559
<ImportGroup Label="ExtensionSettings">
@@ -119,7 +123,7 @@
119123
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
120124
</ClCompile>
121125
<Link>
122-
<GenerateDebugInformation>true</GenerateDebugInformation>
126+
<GenerateDebugInformation>false</GenerateDebugInformation>
123127
<AdditionalDependencies>
124128
</AdditionalDependencies>
125129
</Link>
@@ -134,7 +138,7 @@
134138
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
135139
</ClCompile>
136140
<Link>
137-
<GenerateDebugInformation>true</GenerateDebugInformation>
141+
<GenerateDebugInformation>false</GenerateDebugInformation>
138142
<AdditionalDependencies>
139143
</AdditionalDependencies>
140144
</Link>
@@ -149,8 +153,6 @@
149153
<ClCompile Include="..\..\..\ApkDiffPatch\HDiffPatch\libHDiffPatch\HPatch\patch.c" />
150154
<ClCompile Include="..\..\..\ApkDiffPatch\HDiffPatch\libParallel\parallel_channel.cpp" />
151155
<ClCompile Include="..\..\..\ApkDiffPatch\HDiffPatch\libParallel\parallel_import.cpp" />
152-
<ClCompile Include="..\..\..\ApkDiffPatch\lzma\C\Lzma2Dec.c" />
153-
<ClCompile Include="..\..\..\ApkDiffPatch\lzma\C\LzmaDec.c" />
154156
<ClCompile Include="..\..\..\ApkDiffPatch\src\patch\NewStream.cpp" />
155157
<ClCompile Include="..\..\..\ApkDiffPatch\src\patch\OldStream.cpp" />
156158
<ClCompile Include="..\..\..\ApkDiffPatch\src\patch\Patcher.cpp" />
@@ -180,6 +182,11 @@
180182
<ClInclude Include="..\..\..\ApkDiffPatch\src\patch\Zipper.h" />
181183
<ClInclude Include="..\..\patch\virtual_apk_patch.h" />
182184
</ItemGroup>
185+
<ItemGroup>
186+
<ProjectReference Include="..\..\..\ApkDiffPatch\HDiffPatch\builds\vc\lzma.vcxproj">
187+
<Project>{0849cd0e-1b9b-44eb-8937-a278b6a7e2cf}</Project>
188+
</ProjectReference>
189+
</ItemGroup>
183190
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
184191
<ImportGroup Label="ExtensionTargets">
185192
</ImportGroup>

‎VirtualApkPatch/builds_test/vc/VirtualApkPatch.vcxproj.filters‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
<ClCompile Include="..\..\..\ApkDiffPatch\src\patch\Zipper.cpp">
1919
<Filter>ApkDiffPatch</Filter>
2020
</ClCompile>
21-
<ClCompile Include="..\..\..\ApkDiffPatch\lzma\C\LzFind.c">
22-
<Filter>lzma</Filter>
23-
</ClCompile>
24-
<ClCompile Include="..\..\..\ApkDiffPatch\lzma\C\LzmaDec.c">
25-
<Filter>lzma</Filter>
26-
</ClCompile>
2721
<ClCompile Include="..\..\..\ApkDiffPatch\zlib1.2.11\adler32.c">
2822
<Filter>zlib</Filter>
2923
</ClCompile>
@@ -98,9 +92,6 @@
9892
<Filter Include="ApkDiffPatch">
9993
<UniqueIdentifier>{172e7ddf-de29-421e-a9bf-8f08b5bae838}</UniqueIdentifier>
10094
</Filter>
101-
<Filter Include="lzma">
102-
<UniqueIdentifier>{12a0cb01-8df8-41fa-a174-7094b245cfa4}</UniqueIdentifier>
103-
</Filter>
10495
<Filter Include="zlib">
10596
<UniqueIdentifier>{52c2d553-1c2e-46d7-853e-9fad42537d0e}</UniqueIdentifier>
10697
</Filter>

‎VirtualApkPatch/builds_test/xcode/VirtualApkPatch.xcodeproj/project.pbxproj‎

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
0DA952AD2AB02AD300C3A4F0 /* liblzma.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DA952AA2AB02AA600C3A4F0 /* liblzma.a */; };
1011
D65C69D423293AFA00A3C89C /* virtual_apk_patch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D65C69D123293AFA00A3C89C /* virtual_apk_patch.cpp */; };
1112
D65C69E6232A0EA100A3C89C /* OldStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D65C69DE232A0EA100A3C89C /* OldStream.cpp */; };
1213
D65C69E7232A0EA100A3C89C /* ZipDiffData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D65C69DF232A0EA100A3C89C /* ZipDiffData.cpp */; };
@@ -17,19 +18,25 @@
1718
D65C6A03232A0F6900A3C89C /* parallel_import.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D65C69FB232A0F6900A3C89C /* parallel_import.cpp */; };
1819
D65C6A05232A0F6900A3C89C /* file_for_patch.c in Sources */ = {isa = PBXBuildFile; fileRef = D65C69FE232A0F6900A3C89C /* file_for_patch.c */; };
1920
D65C6A0C232A0F8200A3C89C /* patch.c in Sources */ = {isa = PBXBuildFile; fileRef = D65C6A09232A0F8200A3C89C /* patch.c */; };
20-
D65C6A0E232A0FBB00A3C89C /* liblzma.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D65C69F0232A0EF400A3C89C /* liblzma.a */; };
2121
D65C6A0F232A0FBB00A3C89C /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D65C69F6232A0EF400A3C89C /* libzlib.a */; };
2222
D698B4D0236AD0BB00FC04E9 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D698B4CF236AD0BB00FC04E9 /* main.cpp */; };
2323
/* End PBXBuildFile section */
2424

2525
/* Begin PBXContainerItemProxy section */
26-
D65C69EF232A0EF400A3C89C /* PBXContainerItemProxy */ = {
26+
0DA952A92AB02AA600C3A4F0 /* PBXContainerItemProxy */ = {
2727
isa = PBXContainerItemProxy;
28-
containerPortal = D65C69EB232A0EF400A3C89C /* lzma.xcodeproj */;
28+
containerPortal = 0DA952A42AB02AA600C3A4F0 /* lzma.xcodeproj */;
2929
proxyType = 2;
30-
remoteGlobalIDString = D68B02C7205A4409001F3C40;
30+
remoteGlobalIDString = D690ABCE1F208EA80089DC57;
3131
remoteInfo = lzma;
3232
};
33+
0DA952AB2AB02AA600C3A4F0 /* PBXContainerItemProxy */ = {
34+
isa = PBXContainerItemProxy;
35+
containerPortal = 0DA952A42AB02AA600C3A4F0 /* lzma.xcodeproj */;
36+
proxyType = 2;
37+
remoteGlobalIDString = 0D225ACF2A98EBB300DBD5B1;
38+
remoteInfo = lzma_arm64;
39+
};
3340
D65C69F5232A0EF400A3C89C /* PBXContainerItemProxy */ = {
3441
isa = PBXContainerItemProxy;
3542
containerPortal = D65C69F1232A0EF400A3C89C /* zlib.xcodeproj */;
@@ -52,6 +59,7 @@
5259
/* End PBXCopyFilesBuildPhase section */
5360

5461
/* Begin PBXFileReference section */
62+
0DA952A42AB02AA600C3A4F0 /* lzma.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = lzma.xcodeproj; path = ../../../ApkDiffPatch/HDiffPatch/builds/xcode/lzma.xcodeproj; sourceTree = "<group>"; };
5563
D65C69C523293AB300A3C89C /* VirtualApkPatch */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = VirtualApkPatch; sourceTree = BUILT_PRODUCTS_DIR; };
5664
D65C69D123293AFA00A3C89C /* virtual_apk_patch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = virtual_apk_patch.cpp; sourceTree = "<group>"; };
5765
D65C69D223293AFA00A3C89C /* virtual_apk_patch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = virtual_apk_patch.h; sourceTree = "<group>"; };
@@ -66,7 +74,6 @@
6674
D65C69E3232A0EA100A3C89C /* Patcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Patcher.cpp; sourceTree = "<group>"; };
6775
D65C69E4232A0EA100A3C89C /* ZipDiffData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipDiffData.h; sourceTree = "<group>"; };
6876
D65C69E5232A0EA100A3C89C /* NewStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewStream.h; sourceTree = "<group>"; };
69-
D65C69EB232A0EF400A3C89C /* lzma.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = lzma.xcodeproj; path = ../../../ApkDiffPatch/builds/xcode/lzma.xcodeproj; sourceTree = "<group>"; };
7077
D65C69F1232A0EF400A3C89C /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = ../../../ApkDiffPatch/builds/xcode/zlib.xcodeproj; sourceTree = "<group>"; };
7178
D65C69F9232A0F6900A3C89C /* parallel_channel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = parallel_channel.cpp; sourceTree = "<group>"; };
7279
D65C69FA232A0F6900A3C89C /* parallel_import.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parallel_import.h; sourceTree = "<group>"; };
@@ -90,17 +97,28 @@
9097
isa = PBXFrameworksBuildPhase;
9198
buildActionMask = 2147483647;
9299
files = (
93-
D65C6A0E232A0FBB00A3C89C /* liblzma.a in Frameworks */,
94100
D65C6A0F232A0FBB00A3C89C /* libzlib.a in Frameworks */,
101+
0DA952AD2AB02AD300C3A4F0 /* liblzma.a in Frameworks */,
95102
);
96103
runOnlyForDeploymentPostprocessing = 0;
97104
};
98105
/* End PBXFrameworksBuildPhase section */
99106

100107
/* Begin PBXGroup section */
108+
0DA952A52AB02AA600C3A4F0 /* Products */ = {
109+
isa = PBXGroup;
110+
children = (
111+
0DA952AA2AB02AA600C3A4F0 /* liblzma.a */,
112+
0DA952AC2AB02AA600C3A4F0 /* liblzma_arm64.a */,
113+
);
114+
name = Products;
115+
sourceTree = "<group>";
116+
};
101117
D65C69BC23293AB300A3C89C = {
102118
isa = PBXGroup;
103119
children = (
120+
0DA952A42AB02AA600C3A4F0 /* lzma.xcodeproj */,
121+
D65C69F1232A0EF400A3C89C /* zlib.xcodeproj */,
104122
D65C69D9232A0E5900A3C89C /* ApkDiffPatch */,
105123
D65C69D023293AFA00A3C89C /* patch */,
106124
D698B4CF236AD0BB00FC04E9 /* main.cpp */,
@@ -130,8 +148,6 @@
130148
D65C69D9232A0E5900A3C89C /* ApkDiffPatch */ = {
131149
isa = PBXGroup;
132150
children = (
133-
D65C69EB232A0EF400A3C89C /* lzma.xcodeproj */,
134-
D65C69F1232A0EF400A3C89C /* zlib.xcodeproj */,
135151
D65C69F7232A0F0D00A3C89C /* hpatch */,
136152
D65C69DA232A0EA100A3C89C /* patch */,
137153
);
@@ -158,14 +174,6 @@
158174
path = ../../../ApkDiffPatch/src/patch;
159175
sourceTree = "<group>";
160176
};
161-
D65C69EC232A0EF400A3C89C /* Products */ = {
162-
isa = PBXGroup;
163-
children = (
164-
D65C69F0232A0EF400A3C89C /* liblzma.a */,
165-
);
166-
name = Products;
167-
sourceTree = "<group>";
168-
};
169177
D65C69F2232A0EF400A3C89C /* Products */ = {
170178
isa = PBXGroup;
171179
children = (
@@ -274,8 +282,8 @@
274282
projectDirPath = "";
275283
projectReferences = (
276284
{
277-
ProductGroup = D65C69EC232A0EF400A3C89C /* Products */;
278-
ProjectRef = D65C69EB232A0EF400A3C89C /* lzma.xcodeproj */;
285+
ProductGroup = 0DA952A52AB02AA600C3A4F0 /* Products */;
286+
ProjectRef = 0DA952A42AB02AA600C3A4F0 /* lzma.xcodeproj */;
279287
},
280288
{
281289
ProductGroup = D65C69F2232A0EF400A3C89C /* Products */;
@@ -290,11 +298,18 @@
290298
/* End PBXProject section */
291299

292300
/* Begin PBXReferenceProxy section */
293-
D65C69F0232A0EF400A3C89C /* liblzma.a */ = {
301+
0DA952AA2AB02AA600C3A4F0 /* liblzma.a */ = {
294302
isa = PBXReferenceProxy;
295303
fileType = archive.ar;
296304
path = liblzma.a;
297-
remoteRef = D65C69EF232A0EF400A3C89C /* PBXContainerItemProxy */;
305+
remoteRef = 0DA952A92AB02AA600C3A4F0 /* PBXContainerItemProxy */;
306+
sourceTree = BUILT_PRODUCTS_DIR;
307+
};
308+
0DA952AC2AB02AA600C3A4F0 /* liblzma_arm64.a */ = {
309+
isa = PBXReferenceProxy;
310+
fileType = archive.ar;
311+
path = liblzma_arm64.a;
312+
remoteRef = 0DA952AB2AB02AA600C3A4F0 /* PBXContainerItemProxy */;
298313
sourceTree = BUILT_PRODUCTS_DIR;
299314
};
300315
D65C69F6232A0EF400A3C89C /* libzlib.a */ = {
@@ -332,7 +347,7 @@
332347
isa = XCBuildConfiguration;
333348
buildSettings = {
334349
ALWAYS_SEARCH_USER_PATHS = NO;
335-
ARCHS = x86_64;
350+
ARCHS = "$(ARCHS_STANDARD)";
336351
CLANG_ANALYZER_NONNULL = YES;
337352
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
338353
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -394,7 +409,7 @@
394409
isa = XCBuildConfiguration;
395410
buildSettings = {
396411
ALWAYS_SEARCH_USER_PATHS = NO;
397-
ARCHS = x86_64;
412+
ARCHS = "$(ARCHS_STANDARD)";
398413
CLANG_ANALYZER_NONNULL = YES;
399414
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
400415
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";

‎project_fix_unity_jar/fix_unity_jar/builds/vc/FixUnityJar/FixUnityJar.vcxproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,30 @@
3030
<UseDebugLibraries>true</UseDebugLibraries>
3131
<CLRSupport>false</CLRSupport>
3232
<CharacterSet>Unicode</CharacterSet>
33+
<PlatformToolset>v143</PlatformToolset>
3334
</PropertyGroup>
3435
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3536
<ConfigurationType>Application</ConfigurationType>
3637
<UseDebugLibraries>true</UseDebugLibraries>
3738
<CLRSupport>false</CLRSupport>
3839
<CharacterSet>Unicode</CharacterSet>
40+
<PlatformToolset>v143</PlatformToolset>
3941
</PropertyGroup>
4042
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4143
<ConfigurationType>Application</ConfigurationType>
4244
<UseDebugLibraries>false</UseDebugLibraries>
4345
<CLRSupport>false</CLRSupport>
4446
<CharacterSet>Unicode</CharacterSet>
4547
<WholeProgramOptimization>true</WholeProgramOptimization>
48+
<PlatformToolset>v143</PlatformToolset>
4649
</PropertyGroup>
4750
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4851
<ConfigurationType>Application</ConfigurationType>
4952
<UseDebugLibraries>false</UseDebugLibraries>
5053
<CLRSupport>false</CLRSupport>
5154
<CharacterSet>Unicode</CharacterSet>
5255
<WholeProgramOptimization>true</WholeProgramOptimization>
56+
<PlatformToolset>v143</PlatformToolset>
5357
</PropertyGroup>
5458
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5559
<ImportGroup Label="ExtensionSettings">
@@ -122,7 +126,7 @@
122126
</PrecompiledHeaderFile>
123127
</ClCompile>
124128
<Link>
125-
<GenerateDebugInformation>true</GenerateDebugInformation>
129+
<GenerateDebugInformation>false</GenerateDebugInformation>
126130
<AdditionalDependencies>
127131
</AdditionalDependencies>
128132
</Link>
@@ -136,7 +140,7 @@
136140
</PrecompiledHeaderFile>
137141
</ClCompile>
138142
<Link>
139-
<GenerateDebugInformation>true</GenerateDebugInformation>
143+
<GenerateDebugInformation>false</GenerateDebugInformation>
140144
<AdditionalDependencies>
141145
</AdditionalDependencies>
142146
</Link>

‎project_hook_unity_jni/build_libs/Android.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ Src_Files := $(LOCAL_PATH)/../src/hook_unity.cpp \
5151

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

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

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

6363
include $(BUILD_SHARED_LIBRARY)

0 commit comments

Comments
 (0)