From 07443630146ddfd28f7f372701fc368aaae9572a Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Wed, 12 Aug 2020 13:17:47 -0700 Subject: [PATCH] Try getting out of the cmake business --- esy/configure-windows.sh | 4 +--- package.json | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/esy/configure-windows.sh b/esy/configure-windows.sh index db4b2a64..0fc4fe77 100755 --- a/esy/configure-windows.sh +++ b/esy/configure-windows.sh @@ -2,6 +2,4 @@ cd _build INSTALL_PATH="$(cygpath -u $cur__install)" -echo "Install: $INSTALL_PATH" - -cmake -G "Unix Makefiles" ../harfbuzz-2.6.8 -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DCMAKE_LINKER=/usr/bin/x86_64-w64-mingw32-ld -DCMAKE_AR=/usr/bin/x86_64-w64-mingw32-ar -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH +./configure --prefix=$cur__install --host=x86_64-w64-mingw32 diff --git a/package.json b/package.json index c2a04efb..538efc36 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "esy": { "build": [ ["./esy/prep.sh"], - ["/usr/bin/cmake.exe"], ["bash", "-c", "#{os == 'windows' ? './esy/configure-windows.sh' : 'echo'}"], ["bash", "-c", "#{os == 'darwin' ? './esy/configure-osx.sh' : 'echo'}"], ["bash", "-c", "#{os == 'linux' ? './esy/configure-linux.sh' : 'echo'}"],