Skip to content

Commit

Permalink
Remove support for Windows versions without ICU
Browse files Browse the repository at this point in the history
We now require Windows 10 version 1903, which comes bundled with ICU.
  • Loading branch information
triplef committed Jun 20, 2024
1 parent 9d8909e commit 9d4b852
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 103 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

This project comprises a collection of scripts to build a modern GNUstep toolchain for x64 or arm64 architectures using the Visual Studio toolchain and LLVM/Clang. The toolchain supports Objective-C 2.0 features like blocks and Automatic Reference Counting (ARC) and can be used to integrate Objective-C code in any native Windows app — including Visual Studio projects — using LLVM/Clang (without using MinGW).

The toolchain supports Windows 10 version 1903 or later.


## Libraries

Expand All @@ -19,7 +21,6 @@ The toolchain consists of the following libraries:
- [libxml2](https://github.com/GNOME/libxml2)
- [libxslt](https://github.com/GNOME/libxslt)
- [libcurl](https://github.com/curl/curl)
- [ICU](https://docs.microsoft.com/en-us/windows/win32/intl/international-components-for-unicode--icu-) (using system-provided DLL on Windows 10 version 1903 or later)


## Installation
Expand Down
File renamed without changes.
91 changes: 0 additions & 91 deletions phases/15-icu.bat

This file was deleted.

12 changes: 1 addition & 11 deletions phases/16-libxml2.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,6 @@ for /f "usebackq delims=" %%i in (`call %BASH% '../scripts/get-latest-github-rel
call "%~dp0\..\scripts\common.bat" prepare_project || exit /b 1

cd "%SRCROOT%\%PROJECT%" || exit \b 1

:: check which ICU libraries to link
if exist "%INSTALL_PREFIX%\lib\icuin.lib" (
set "LIBS_PRIVATE=-licuin -licuuc -licudt"
) else (
echo Using system-provided ICU DLL ^(requires Windows 10 version 1903 or later^)
git apply "%ROOT_DIR%\patches\opt-libxml2-windows-icu.patch" || exit /b 1
set "LIBS_PRIVATE=-licu"
)

cd "win32" || exit /b 1

echo.
Expand Down Expand Up @@ -55,4 +45,4 @@ xcopy /Y /F "bin.msvc\libxml2_a.lib" "%INSTALL_PREFIX%\lib\xml2.lib*" || exit /b
xcopy /Y /F "%SRCROOT%\%PROJECT%\include\libxml\*.h" "%INSTALL_PREFIX%\include\libxml\" || exit /b 1

:: write pkgconfig file
call "%~dp0\..\scripts\common.bat" write_pkgconfig libxml-2.0 %TAG% -DLIBXML_STATIC -lxml2 "%LIBS_PRIVATE%" || exit /b 1
call "%~dp0\..\scripts\common.bat" write_pkgconfig libxml-2.0 %TAG% -DLIBXML_STATIC -lxml2 -licu || exit /b 1

0 comments on commit 9d4b852

Please sign in to comment.