Compare commits

..

No commits in common. "master" and "2.8.7" have entirely different histories.

4 changed files with 9 additions and 22 deletions

View File

@ -14,8 +14,8 @@
<a href="https://github.com/sponsors/xt-sys/">
<img alt="Sponsors" src="https://img.shields.io/badge/Sponsor-%E2%9D%A4-red?logo=GitHub">
</a>
<a href="https://discord.com/invite/zBzJ5qMGX7">
<img alt="Discord" src="https://img.shields.io/badge/Chat-Join%20Discord-success">
<a href="https://discord.com/invite/3zgjQDVmAe">
<img alt="Discord" src="https://img.shields.io/discord/723186294540206100?label=Chat">
</a>
</p>

View File

@ -18,12 +18,12 @@ GENERIC="generic-w64-mingw32"
# CMake Settings
CMAKEDIR="${SRCDIR}/cmake"
CMAKETAG="v3.31.3"
CMAKETAG="v3.29.3"
CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git"
# LLVM Settings
LLVMDIR="${SRCDIR}/llvm"
LLVMTAG="llvmorg-19.1.6"
LLVMTAG="llvmorg-18.1.5"
LLVMVCS="https://github.com/llvm/llvm-project.git"
# Make Settings
@ -46,7 +46,7 @@ NINJAVCS="https://github.com/ninja-build/ninja.git"
# Wine Settings
WINEDIR="${SRCDIR}/wine"
WINETAG="wine-9.8"
WINEVCS="https://github.com/wine-mirror/wine.git"
WINEVCS="git://source.winehq.org/git/wine.git"
# This function applies a patches to the 3rd party project
@ -363,7 +363,7 @@ mingw_build_libs()
# This function compiles and installs MINGW tools
mingw_build_tools()
{
for TOOL in gendef genidl genpeimg widl; do
for TOOL in gendef genidl genlib genpeimg widl; do
for ARCH in ${ARCHS}; do
echo ">>> Building Mingw-w64 (tools) for ${ARCH} ..."
[ -z ${CLEAN} ] || rm -rf ${MINGWDIR}/mingw-w64-tools/${TOOL}/build-${ARCH}

View File

@ -1,13 +0,0 @@
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 818109f0b7..749377d193 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -7,7 +7,7 @@ set(CMake_VERSION_IS_DIRTY 0)
# Start with the full version number used in tags. It has no dev info.
set(CMake_VERSION
- "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
+ "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}-XTC")
if(DEFINED CMake_VERSION_RC)
set(CMake_VERSION "${CMake_VERSION}-rc${CMake_VERSION_RC}")
endif()

View File

@ -169,9 +169,9 @@ void check_num_args(int arg,
int main(int argc,
char* argv[])
{
char *dir;
char *basename;
char *target;
const char *dir;
const char *basename;
const char *target;
split_argv(argv[0], &dir, &basename, &target, NULL);