From 6890f5ddb7501c781a882da00fa188fdf486facc Mon Sep 17 00:00:00 2001 From: hev Date: Sun, 27 Jul 2025 22:14:18 +0800 Subject: [PATCH] Build: Make building on Windows easier. --- .github/workflows/build.yaml | 2 +- Makefile | 4 ++++ README.md | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 75f4a1e..1a27a1b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -144,7 +144,7 @@ jobs: run: | export MSYS=winsymlinks:native git clone --depth=1 --recursive file://`pwd` work; cd work - make LFLAGS="-lmsys-2.0 -lws2_32" -j`nproc` + make -j`nproc` mkdir natmap cp bin/natmap* natmap wget -P natmap https://github.com/heiher/msys2/releases/latest/download/msys-2.0.dll diff --git a/Makefile b/Makefile index bf40a72..5c57d9b 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,10 @@ LINKMSG="\e[1;34mLINK\e[0m \e[1;32m%s\e[0m\n" STRIPMSG="\e[1;34mSTRIP\e[0m \e[1;32m%s\e[0m\n" CLEANMSG="\e[1;34mCLEAN\e[0m %s\n" +ifeq ($(MSYSTEM),MSYS) + LDFLAGS+=-lmsys-2.0 -lws2_32 +endif + ENABLE_DEBUG := ifeq ($(ENABLE_DEBUG),1) CCFLAGS+=-g -O0 -DENABLE_DEBUG diff --git a/README.md b/README.md index c0290f4..156e852 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ ndk-build export MSYS=winsymlinks:native git clone --recursive https://github.com/heiher/natmap.git cd natmap -make LFLAGS="-lmsys-2.0 -lws2_32" +make ``` ## How to Use