mirror of
https://github.com/valinet/ExplorerPatcher.git
synced 2024-11-12 02:00:46 +01:00
Build: Try to fix ep_make ^2
This commit is contained in:
Amrsatrio
parent
126c024628
commit
c0201ff442
@ -4,10 +4,16 @@ rmdir /s /q libs\funchook\build-arm64
|
||||
rmdir /s /q libs\zlib\build-x64
|
||||
rmdir /s /q libs\zlib\build-arm64
|
||||
|
||||
cmake libs/funchook -Blibs/funchook/build-x64 -G "Visual Studio 17 2022" -A x64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DFUNCHOOK_CPU=x86 -DFUNCHOOK_BUILD_TESTS=OFF
|
||||
cmake libs/funchook -Blibs/funchook/build-arm64 -G "Visual Studio 17 2022" -A ARM64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DFUNCHOOK_CPU=arm64 -DFUNCHOOK_DISASM=capstone -DFUNCHOOK_BUILD_TESTS=OFF
|
||||
cmake libs/zlib -Blibs/zlib/build-x64 -G "Visual Studio 17 2022" -A x64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
|
||||
cmake libs/zlib -Blibs/zlib/build-arm64 -G "Visual Studio 17 2022" -A ARM64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
|
||||
if "%VSINSTALLDIR:~-1%"=="\" (
|
||||
set "EP_VSINSTALLDIR=%VSINSTALLDIR:~0,-1%"
|
||||
) else (
|
||||
set "EP_VSINSTALLDIR=%VSINSTALLDIR%"
|
||||
)
|
||||
|
||||
cmake libs/funchook -Blibs/funchook/build-x64 -G "Visual Studio 17 2022" -A x64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%EP_VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DFUNCHOOK_CPU=x86 -DFUNCHOOK_BUILD_TESTS=OFF
|
||||
cmake libs/funchook -Blibs/funchook/build-arm64 -G "Visual Studio 17 2022" -A ARM64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%EP_VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DFUNCHOOK_CPU=arm64 -DFUNCHOOK_DISASM=capstone -DFUNCHOOK_BUILD_TESTS=OFF
|
||||
cmake libs/zlib -Blibs/zlib/build-x64 -G "Visual Studio 17 2022" -A x64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%EP_VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
|
||||
cmake libs/zlib -Blibs/zlib/build-arm64 -G "Visual Studio 17 2022" -A ARM64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%EP_VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
|
||||
|
||||
cmake --build libs/funchook/build-x64 --config Debug
|
||||
cmake --build libs/funchook/build-arm64 --config Debug
|
||||
|
||||
@ -4,10 +4,16 @@ rmdir /s /q libs\funchook\build-arm64
|
||||
rmdir /s /q libs\zlib\build-x64
|
||||
rmdir /s /q libs\zlib\build-arm64
|
||||
|
||||
cmake libs/funchook -Blibs/funchook/build-x64 -G "Visual Studio 17 2022" -A x64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DFUNCHOOK_CPU=x86 -DFUNCHOOK_BUILD_TESTS=OFF
|
||||
cmake libs/funchook -Blibs/funchook/build-arm64 -G "Visual Studio 17 2022" -A ARM64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DFUNCHOOK_CPU=arm64 -DFUNCHOOK_DISASM=capstone -DFUNCHOOK_BUILD_TESTS=OFF
|
||||
cmake libs/zlib -Blibs/zlib/build-x64 -G "Visual Studio 17 2022" -A x64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
|
||||
cmake libs/zlib -Blibs/zlib/build-arm64 -G "Visual Studio 17 2022" -A ARM64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
|
||||
if "%VSINSTALLDIR:~-1%"=="\" (
|
||||
set "EP_VSINSTALLDIR=%VSINSTALLDIR:~0,-1%"
|
||||
) else (
|
||||
set "EP_VSINSTALLDIR=%VSINSTALLDIR%"
|
||||
)
|
||||
|
||||
cmake libs/funchook -Blibs/funchook/build-x64 -G "Visual Studio 17 2022" -A x64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%EP_VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DFUNCHOOK_CPU=x86 -DFUNCHOOK_BUILD_TESTS=OFF
|
||||
cmake libs/funchook -Blibs/funchook/build-arm64 -G "Visual Studio 17 2022" -A ARM64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%EP_VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DFUNCHOOK_CPU=arm64 -DFUNCHOOK_DISASM=capstone -DFUNCHOOK_BUILD_TESTS=OFF
|
||||
cmake libs/zlib -Blibs/zlib/build-x64 -G "Visual Studio 17 2022" -A x64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%EP_VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
|
||||
cmake libs/zlib -Blibs/zlib/build-arm64 -G "Visual Studio 17 2022" -A ARM64 -D"CMAKE_GENERATOR_INSTANCE:PATH=%EP_VSINSTALLDIR%" -D"CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
|
||||
|
||||
cmake --build libs/funchook/build-x64 --config Release
|
||||
cmake --build libs/funchook/build-arm64 --config Release
|
||||
|
||||
@ -149,7 +149,7 @@ BOOL SetupUninstallEntry(BOOL bInstall, WCHAR* wszPath)
|
||||
L"UninstallString",
|
||||
0,
|
||||
REG_SZ,
|
||||
wszPath,
|
||||
(const BYTE*)wszPath,
|
||||
(wcslen(wszPath) + 1) * sizeof(wchar_t)
|
||||
);
|
||||
}
|
||||
@ -160,7 +160,7 @@ BOOL SetupUninstallEntry(BOOL bInstall, WCHAR* wszPath)
|
||||
L"DisplayName",
|
||||
0,
|
||||
REG_SZ,
|
||||
_T(PRODUCT_NAME),
|
||||
(const BYTE*)_T(PRODUCT_NAME),
|
||||
(wcslen(_T(PRODUCT_NAME)) + 1) * sizeof(wchar_t)
|
||||
);
|
||||
}
|
||||
@ -171,7 +171,7 @@ BOOL SetupUninstallEntry(BOOL bInstall, WCHAR* wszPath)
|
||||
L"Publisher",
|
||||
0,
|
||||
REG_SZ,
|
||||
_T(PRODUCT_PUBLISHER),
|
||||
(const BYTE*)_T(PRODUCT_PUBLISHER),
|
||||
(wcslen(_T(PRODUCT_PUBLISHER)) + 1) * sizeof(wchar_t)
|
||||
);
|
||||
}
|
||||
@ -183,7 +183,7 @@ BOOL SetupUninstallEntry(BOOL bInstall, WCHAR* wszPath)
|
||||
L"NoModify",
|
||||
0,
|
||||
REG_DWORD,
|
||||
&dw1,
|
||||
(const BYTE*)&dw1,
|
||||
sizeof(DWORD)
|
||||
);
|
||||
}
|
||||
@ -195,7 +195,7 @@ BOOL SetupUninstallEntry(BOOL bInstall, WCHAR* wszPath)
|
||||
L"NoRepair",
|
||||
0,
|
||||
REG_DWORD,
|
||||
&dw1,
|
||||
(const BYTE*)&dw1,
|
||||
sizeof(DWORD)
|
||||
);
|
||||
}
|
||||
@ -227,7 +227,7 @@ BOOL SetupUninstallEntry(BOOL bInstall, WCHAR* wszPath)
|
||||
L"DisplayVersion",
|
||||
0,
|
||||
REG_SZ,
|
||||
wszBuf,
|
||||
(const BYTE*)wszBuf,
|
||||
(wcslen(wszBuf) + 1) * sizeof(wchar_t)
|
||||
);
|
||||
if (!dwLastError)
|
||||
@ -237,7 +237,7 @@ BOOL SetupUninstallEntry(BOOL bInstall, WCHAR* wszPath)
|
||||
L"VersionMajor",
|
||||
0,
|
||||
REG_DWORD,
|
||||
&dwSecondRight,
|
||||
(const BYTE*)&dwSecondRight,
|
||||
sizeof(DWORD)
|
||||
);
|
||||
if (!dwLastError)
|
||||
@ -247,7 +247,7 @@ BOOL SetupUninstallEntry(BOOL bInstall, WCHAR* wszPath)
|
||||
L"VersionMinor",
|
||||
0,
|
||||
REG_DWORD,
|
||||
&dwRightMost,
|
||||
(const BYTE*)&dwRightMost,
|
||||
sizeof(DWORD)
|
||||
);
|
||||
}
|
||||
@ -266,8 +266,8 @@ BOOL SetupUninstallEntry(BOOL bInstall, WCHAR* wszPath)
|
||||
L"DisplayIcon",
|
||||
0,
|
||||
REG_SZ,
|
||||
wszPath,
|
||||
(wcslen(wszPath) + 1) * sizeof(wchar_t)
|
||||
(const BYTE*)wszPath,
|
||||
(DWORD)((wcslen(wszPath) + 1) * sizeof(wchar_t))
|
||||
);
|
||||
}
|
||||
RegCloseKey(hKey);
|
||||
@ -328,7 +328,7 @@ uLong ZCALLBACK MemReadFile(voidpf opaque, voidpf stream, void* buf, uLong size)
|
||||
|
||||
if (pMem->curOffset + toRead > pMem->size)
|
||||
{
|
||||
toRead = pMem->size - pMem->curOffset;
|
||||
toRead = (uLong)(pMem->size - pMem->curOffset);
|
||||
}
|
||||
|
||||
if (toRead > 0)
|
||||
@ -528,7 +528,7 @@ BOOL InstallResourceHelper(BOOL bInstall, HMODULE hModule, unzFile zipFile, cons
|
||||
|
||||
BOOL bRet = FALSE;
|
||||
void* pRscr = malloc(fileInfo.uncompressed_size);
|
||||
DWORD cbRscr = fileInfo.uncompressed_size;
|
||||
DWORD cbRscr = (DWORD)fileInfo.uncompressed_size;
|
||||
if (pRscr)
|
||||
{
|
||||
if (unzReadCurrentFile(zipFile, pRscr, cbRscr) == cbRscr)
|
||||
@ -878,7 +878,7 @@ int WINAPI wWinMain(
|
||||
}
|
||||
}
|
||||
}
|
||||
PDWORD_PTR res = -1;
|
||||
DWORD_PTR res = -1;
|
||||
if (!SendMessageTimeoutW(hShellTrayWnd, 1460, 0, 0, SMTO_ABORTIFHUNG, 2000, &res) && res)
|
||||
{
|
||||
HANDLE hExplorerRestartThread = CreateThread(NULL, 0, BeginExplorerRestart, NULL, 0, NULL);
|
||||
@ -978,7 +978,7 @@ int WINAPI wWinMain(
|
||||
HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwGUIPid);
|
||||
if (hProcess)
|
||||
{
|
||||
DWORD dwSection = SendMessageW(hWnd, WM_MSG_GUI_SECTION, WM_MSG_GUI_SECTION_GET, 0);
|
||||
DWORD dwSection = (DWORD)SendMessageW(hWnd, WM_MSG_GUI_SECTION, WM_MSG_GUI_SECTION_GET, 0);
|
||||
|
||||
TerminateProcess(hProcess, 0);
|
||||
CloseHandle(hProcess);
|
||||
@ -1007,7 +1007,7 @@ int WINAPI wWinMain(
|
||||
TEXT("OpenPropertiesAtNextStart"),
|
||||
0,
|
||||
REG_DWORD,
|
||||
&dwSection,
|
||||
(const BYTE*)&dwSection,
|
||||
sizeof(DWORD)
|
||||
);
|
||||
RegCloseKey(hKey);
|
||||
@ -1196,9 +1196,9 @@ int WINAPI wWinMain(
|
||||
{
|
||||
GetSystemDirectoryW(wszPath, MAX_PATH);
|
||||
WCHAR* pArgs = NULL;
|
||||
DWORD dwLen = wcslen(wszPath);
|
||||
DWORD dwLen = (DWORD)wcslen(wszPath);
|
||||
wcscat_s(wszPath, MAX_PATH - dwLen, L"\\rundll32.exe \"");
|
||||
dwLen = wcslen(wszPath);
|
||||
dwLen = (DWORD)wcslen(wszPath);
|
||||
pArgs = wszPath + dwLen - 2;
|
||||
SHGetFolderPathW(NULL, SPECIAL_FOLDER, NULL, SHGFP_TYPE_CURRENT, wszPath + dwLen);
|
||||
wcscat_s(wszPath, MAX_PATH, _T(APP_RELATIVE_PATH) L"\\ep_gui.dll\",ZZGUI");
|
||||
@ -1398,7 +1398,7 @@ int WINAPI wWinMain(
|
||||
TEXT("IsUpdatePending"),
|
||||
0,
|
||||
REG_DWORD,
|
||||
&dwSize,
|
||||
(const BYTE*)&dwSize,
|
||||
sizeof(DWORD)
|
||||
);
|
||||
RegCloseKey(hKey);
|
||||
|
||||
@ -287,18 +287,19 @@
|
||||
<None Include="applicat.bin" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ExplorerPatcher.IA-32.dll" Condition="Exists('..\build\$(Configuration)\$(Platform)\ExplorerPatcher.IA-32.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ExplorerPatcher.amd64.dll" Condition="Exists('..\build\$(Configuration)\$(Platform)\ExplorerPatcher.amd64.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\WebView2Loader.dll" Condition="Exists('..\build\$(Configuration)\$(Platform)\WebView2Loader.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_dwm.exe" Condition="Exists('..\build\$(Configuration)\$(Platform)\ep_dwm.exe')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_gui.dll" Condition="Exists('..\build\$(Configuration)\$(Platform)\ep_gui.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_startmenu.dll" Condition="Exists('..\build\$(Configuration)\$(Platform)\ep_startmenu.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_taskbar.2.dll" Condition="Exists('..\build\$(Configuration)\$(Platform)\ep_taskbar.2.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_taskbar.3.dll" Condition="Exists('..\build\$(Configuration)\$(Platform)\ep_taskbar.3.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_taskbar.4.dll" Condition="Exists('..\build\$(Configuration)\$(Platform)\ep_taskbar.4.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_taskbar.5.dll" Condition="Exists('..\build\$(Configuration)\$(Platform)\ep_taskbar.5.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_weather_host.dll" Condition="Exists('..\build\$(Configuration)\$(Platform)\ep_weather_host.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_weather_host_stub.dll" Condition="Exists('..\build\$(Configuration)\$(Platform)\ep_weather_host_stub.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\Win32\ExplorerPatcher.IA-32.dll" Condition="Exists('$(SolutionDir)\build\$(Configuration)\Win32\ExplorerPatcher.IA-32.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\x64\ExplorerPatcher.amd64.dll" Condition="Exists('$(SolutionDir)\build\$(Configuration)\x64\ExplorerPatcher.amd64.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\ARM64\ExplorerPatcher.arm64.dll" Condition="Exists('$(SolutionDir)\build\$(Configuration)\ARM64\ExplorerPatcher.arm64.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\WebView2Loader.dll" Condition="Exists('$(SolutionDir)\build\$(Configuration)\$(Platform)\WebView2Loader.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_dwm.exe" Condition="Exists('$(SolutionDir)\build\$(Configuration)\$(Platform)\ep_dwm.exe')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_gui.dll" Condition="Exists('$(SolutionDir)\build\$(Configuration)\$(Platform)\ep_gui.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_startmenu.dll" Condition="Exists('$(SolutionDir)\build\$(Configuration)\$(Platform)\ep_startmenu.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_taskbar.2.dll" Condition="Exists('$(SolutionDir)\build\$(Configuration)\$(Platform)\ep_taskbar.2.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_taskbar.3.dll" Condition="Exists('$(SolutionDir)\build\$(Configuration)\$(Platform)\ep_taskbar.3.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_taskbar.4.dll" Condition="Exists('$(SolutionDir)\build\$(Configuration)\$(Platform)\ep_taskbar.4.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_taskbar.5.dll" Condition="Exists('$(SolutionDir)\build\$(Configuration)\$(Platform)\ep_taskbar.5.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_weather_host.dll" Condition="Exists('$(SolutionDir)\build\$(Configuration)\$(Platform)\ep_weather_host.dll')" />
|
||||
<PackFile Include="..\build\$(Configuration)\$(Platform)\ep_weather_host_stub.dll" Condition="Exists('$(SolutionDir)\build\$(Configuration)\$(Platform)\ep_weather_host_stub.dll')" />
|
||||
</ItemGroup>
|
||||
<Target Name="GetCommitHash" AfterTargets="PrepareForBuild">
|
||||
<Exec Command="git rev-parse --short HEAD" ConsoleToMSBuild="true" Condition="'$(GitCommitHashShort)' == '0000000'">
|
||||
@ -374,6 +375,7 @@
|
||||
</Task>
|
||||
</UsingTask>
|
||||
<Target Name="CreateZip" BeforeTargets="ResourceCompile">
|
||||
<MakeDir Directories="..\build\$(Configuration)\$(Platform)\ep_setup_files" />
|
||||
<Copy SourceFiles="@(PackFile)" DestinationFolder="..\build\$(Configuration)\$(Platform)\ep_setup_files" />
|
||||
<ZipDirectory SourceDirectory="..\build\$(Configuration)\$(Platform)\ep_setup_files" DestinationFile="..\build\$(Configuration)\$(Platform)\ep_setup_files.zip" Overwrite="true" />
|
||||
<EncryptFile OutputFile="..\build\$(Configuration)\$(Platform)\ep_setup_files.zip" EncryptionKey="$(ZipEncryptionKey)" Condition="'$(WithEncryption)' == 'true'" />
|
||||
|
||||
Loading…
Reference in New Issue
Block a user