Merge pull request #21 from Artoria2e5/msys2

Thanks for this PR !

Author: cherubrock-seb

.gitignore

@@ -27,4 +27,13 @@ logs/
 stage1_result_*.txt
 worktodo*.txt
 *.save
+<<<<<<< HEAD
 *.ckpt
+||||||| parent of 7a412ca (gitignore)
+=======
+/vcpkg
+/prmers.exe
+/*.zip
+/package
+/.vscode
+>>>>>>> 7a412ca (gitignore)

CMakeLists.txt

@@ -26,7 +26,7 @@ target_include_directories(prmers PRIVATE
 
 target_compile_options(prmers PRIVATE
   $<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:
-    -Wall -Wextra -Wsign-conversion -ffinite-math-only -O2 -O3>
+    -Wall -Wextra -Wsign-conversion -ffinite-math-only -O3>
 )
 
 target_compile_definitions(prmers PRIVATE
@@ -45,6 +45,10 @@ target_link_libraries(prmers PRIVATE
   PkgConfig::GMPXX
 )
 
+if (WIN32)
+  target_link_libraries(prmers PRIVATE ws2_32)
+endif()
+
 if (USE_CURL)
   target_link_libraries(prmers PRIVATE CURL::libcurl)
 endif()

Makefile

@@ -1,42 +1,55 @@
 PREFIX      ?= /usr/local
 TARGET      := prmers
-KERNEL_PATH ?= $(PREFIX)/share/$(TARGET)/
 
 SRC_DIR     := src
 INC_DIR     := include
 
 SRCS        := $(shell find $(SRC_DIR) -type f -name '*.cpp')
 OBJS        := $(patsubst $(SRC_DIR)/%.cpp,$(SRC_DIR)/%.o,$(SRCS))
 
-CFLAGS      := -Wall -Wextra -Wsign-conversion -ffinite-math-only
-FLAGS_CPU   := -O3
-FLAGS_GPU   := -O2 -DGPU
+UNAME_S := $(shell uname -s)
+VERSION := $(shell git describe --tags --always)
+PACKAGE := prmers-$(VERSION)
+
+WARN        := -Wall -Wextra -Wsign-conversion
+CPPFLAGS    := -I$(INC_DIR) -I$(INC_DIR)/marin -DGPU
+MARCH       := native
+OPT         := -O3 -ffinite-math-only -march=$(MARCH)
 
 CXX         := g++
-CXXFLAGS    := -std=c++20 -O3 -Wall -I$(INC_DIR) -march=native -flto -I$(INC_DIR)/marin $(CFLAGS) $(FLAGS_GPU) $(FLAGS_CPU)
-LDFLAGS     := -flto
+CXXFLAGS    := -std=c++20 $(WARN) $(OPT) -flto=auto
+LDFLAGS     := -flto=auto
 
-UNAME_S := $(shell uname -s)
+
+# Mac
 ifeq ($(UNAME_S),Darwin)
-  CXXFLAGS += -I/System/Library/Frameworks/OpenCL.framework/Headers
+  CPPFLAGS += -I/System/Library/Frameworks/OpenCL.framework/Headers
   LDFLAGS  += -framework OpenCL
 else
   LDFLAGS  += -lOpenCL
 endif
 
+# Windows
+ifeq ($(shell case $(UNAME_S) in (*_NT*) echo 1;; esac),1)
+  LDFLAGS  += -lWs2_32
+  KERNEL_PATH ?= ./kernels/
+else
+  KERNEL_PATH ?= $(PREFIX)/share/$(TARGET)/
+endif
+
 LDFLAGS += -lgmpxx -lgmp
 
 USE_CURL ?= 1
 ifeq ($(USE_CURL),1)
-  CXXFLAGS += -DHAS_CURL=1
+  CPPFLAGS += -DHAS_CURL=1
   LDFLAGS  += -lcurl
 else
-  CXXFLAGS += -DNO_CURL=1
+  CPPFLAGS += -DNO_CURL=1
 endif
 
-CPPFLAGS   := -DKERNEL_PATH=\"$(KERNEL_PATH)\"
+CPPFLAGS   += -DKERNEL_PATH=\"$(KERNEL_PATH)\"
 
-.PHONY: all clean install uninstall
+.PHONY: all clean install uninstall package
 
 all: $(TARGET)
 
@@ -48,13 +61,28 @@ $(SRC_DIR)/%.o: $(SRC_DIR)/%.cpp
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
 
 install: $(TARGET)
+	@if [ "$(KERNEL_PATH)" = "./kernels/" ]; then \
+		echo "Installation not supported with portable kernel path."; \
+		exit 1; \
+	fi
 	@echo "Installation de $(TARGET) dans $(PREFIX)/bin"
 	install -d $(DESTDIR)$(PREFIX)/bin
 	install -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin/
 	@echo "Installation des kernels dans $(KERNEL_PATH)"
 	install -d $(DESTDIR)$(KERNEL_PATH)
 	install -m 644 kernels/*.cl $(DESTDIR)$(KERNEL_PATH)
 
+package: $(TARGET)
+	@if [ "$(KERNEL_PATH)" != "./kernels/" ]; then \
+		echo "Packaging only supported with portable kernel path."; \
+		exit 1; \
+	fi
+	mkdir -p package/$(PACKAGE)
+	cp $(TARGET) package/$(PACKAGE)
+	cp -r kernels package/$(PACKAGE)
+	ldd $(TARGET) | grep "=> /.[^/]" | awk '{print $$3}' | xargs -- cp -t package/$(PACKAGE)
+	bsdtar -czvf $(PACKAGE).zip -C package $(PACKAGE)
+
 uninstall:
 	@echo "Désinstallation de $(TARGET)"
 	rm -f $(DESTDIR)$(PREFIX)/bin/$(TARGET)

README.md

@@ -136,29 +136,49 @@ Requirements
 
 Quick Start
 -----------
-Build from source
+4. Build from source
    * Linux/macOS (example):
      ```sh
-     make
+     make -j$(nproc)
      ```
    * Windows (recommended): CMake + vcpkg + Visual Studio
      ```cmd
      cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release
      cmake --build build --config Release
      ```
-
-Run a PRP test
+   * Windows: MSYS2 UCRT64
+     * Install MSYS2
+     * Click open "MSYS2 UCRT64"
+      * Install dependencies:
+        ```sh
+        pacman -Syu
+        pacman -S --noconfirm make mingw-w64-ucrt-x86_64-{gcc,opencl-headers,gmp,curl,opencl-icd}
+        ```
+      * Build:
+        ```sh
+        make -j$(nproc)
+        ```
+        (Hint: add `MARCH=xxx` after `make` to select the CPU architecture to optimize for. The default is `MARCH=native`, which is good for
+        your current CPU but may not work when you want to build for others.)
+      * Package:
+        ```sh
+        make package
+        ```
+        (This takes care of copying the required DLLs next to the executable.)
+
+
+5. Run a PRP test
    ```sh
    ./prmers 136279841
    ```
    (Default: PRP mode, Marin backend on)
 
-4. Disable Marin (use legacy internal backend)
+6. Disable Marin (use legacy internal backend)
    ```sh
    ./prmers 136279841 -marin
    ```
 
-6. P-1 stage-1 + stage-2
+7. P-1 stage-1 + stage-2
    ```sh
    ./prmers 367 -pm1 -b1 11981 -b2 38971
    ```

src/ui/WebGuiServer.cpp

@@ -11,7 +11,6 @@
 #define NOMINMAX
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#pragma comment(lib,"Ws2_32.lib")
 #else
 #include <sys/types.h>
 #include <sys/socket.h>