Shell script to build Windows binaries in workflow

tfpf · Nov 1, 2024 · ea3da10 · ea3da10
1 parent a35190e
commit ea3da10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -19,15 +19,8 @@ jobs:
           msystem: ucrt64
           install: git make
           pacboy: cmake gcc pkgconf
-      - run: |
-          git clone https://github.com/libgit2/libgit2.git
-          mkdir libgit2/build
-          cd libgit2/build
-          cmake .. -DCMAKE_INSTALL_PREFIX='C:/ProgramData/libgit2' -DBUILD_CLI=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF
-          cmake --build . --target install --parallel 4
       - uses: actions/checkout@v4
-      - run: PKG_CONFIG_PATH='C:/ProgramData/libgit2/lib/pkgconfig' make -j release
-        working-directory: custom-prompt
+      - run: .github/workflows/build_windows.sh
       - uses: actions/upload-artifact@v4
         with:
           name: custom-prompt-amd64-windows

diff --git a/custom-prompt/Makefile b/custom-prompt/Makefile
@@ -11,10 +11,7 @@ MainZshObject = custom-zsh-prompt.o
 MainZshExecutable = bin/$(MainZshObject:.o=)
 GetActiveWidObjects = get_active_wid_linux.o get_active_wid_windows.o
 
-ifeq "$(OS)" "Windows_NT"
-	LDFLAGS += -static
-    LDLIBS += -lws2_32 -lwinhttp -lcrypt32 -lrpcrt4 -lole32 -lz
-else
+ifneq "$(OS)" "Windows_NT"
     UNAME = $(shell uname)
     ifeq "$(UNAME)" "Linux"
         CPPFLAGS += $(shell pkg-config --cflags glib-2.0 libnotify x11)