Try getting out of the cmake business

revery-ui · Aug 12, 2020 · 0744363 · 0744363
1 parent c5b7803
commit 0744363
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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'}"],