From ae0c9e742c50df9abdd7a9ae26c681ee808c7922 Mon Sep 17 00:00:00 2001 From: "H. Utku Maden" Date: Wed, 13 Sep 2023 21:38:38 +0300 Subject: [PATCH] Begin working on freetype bindings, again. --- Dockerfile | 3 ++- Quik.FreeType/Quik.Freetype.csproj | 10 ++++++++++ Quik.FreeType/build_native.sh | 3 +++ lib/README.md | 5 +++++ sh/quik_build_native.sh | 5 +++-- 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 Quik.FreeType/Quik.Freetype.csproj create mode 100755 Quik.FreeType/build_native.sh create mode 100644 lib/README.md diff --git a/Dockerfile b/Dockerfile index eafcc94..b5790f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,6 +33,7 @@ WORKDIR /root lzma-dev \ mingw-w64 \ nuget \ + ninja-build \ patch \ python3 \ xz-utils \ @@ -44,7 +45,7 @@ WORKDIR /root # Setup interactive shell. # Setup sudo. Remove password prompt for group "wheel". - # RUN echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/quik_sudo_conf + RUN echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/quik_sudo_conf # Create a default user and switch. RUN adduser --comment "" --disabled-password quik diff --git a/Quik.FreeType/Quik.Freetype.csproj b/Quik.FreeType/Quik.Freetype.csproj new file mode 100644 index 0000000..cfb0a01 --- /dev/null +++ b/Quik.FreeType/Quik.Freetype.csproj @@ -0,0 +1,10 @@ + + + + net6.0 + disable + 7.3 + True + + + diff --git a/Quik.FreeType/build_native.sh b/Quik.FreeType/build_native.sh new file mode 100755 index 0000000..26f43c8 --- /dev/null +++ b/Quik.FreeType/build_native.sh @@ -0,0 +1,3 @@ +#!/bin/bash +cd $(dirname "$0") +../sh/quik_build_native.sh . \ No newline at end of file diff --git a/lib/README.md b/lib/README.md new file mode 100644 index 0000000..084e60e --- /dev/null +++ b/lib/README.md @@ -0,0 +1,5 @@ +Quik/lib +======== +This is where the git submodules of 3rd party native dependencies are supposed +to end up at. Also note `lib/quik` is where all common headers go for building +these libraries and their distributions. diff --git a/sh/quik_build_native.sh b/sh/quik_build_native.sh index eeabe30..e0a3997 100755 --- a/sh/quik_build_native.sh +++ b/sh/quik_build_native.sh @@ -32,11 +32,12 @@ for ARCH in $ARCHS; do mkdir -p $PREFIX $BUILD # Configure CMAKE. cmake -B $BUILD -S . \ + -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN # Build and install. - make -C $BUILD all - make -C $BUILD install + ninja -C $BUILD all + ninja -C $BUILD install done