build.*: switch to DllMain in cpuid.c.

Author: dot-asm

build.bat

@@ -2,7 +2,7 @@
 SETLOCAL
 set PATH=%windir%\system32;%PATH% &:: override msys if it's on the PATH
 set TOP=%~dp0
-cl /nologo /c /O2 /Zi /Fdblst.pdb /W4 /MT /Zl %TOP%src\server.c || EXIT /B
+set CFLAGS=/nologo /c /O2 /Zi /Fdblst.pdb /W4
 cl 2>&1 | find "for ARM64" > nul:
 IF ERRORLEVEL 1 (
     set arm64=no
@@ -23,14 +23,16 @@ FOR %%O IN (%*) DO (
     set opt=%%O
     IF "!opt!" == "-shared" (
         IF [!shared!] EQU [] set shared=/out:blst.dll
+    ) ELSE IF "!opt!" == "-dll" (
+        IF [!shared!] EQU [] set shared=/out:blst.dll
     ) ELSE IF "!opt:~0,5!" == "/out:" (
 	IF "!opt:~-4!" == ".dll" (set shared=!opt!) ELSE (set static=!opt!)
     ) ELSE IF "!opt!" == "-arm64x" (
         set arm64x=%arm64%
     )
 )
 IF [%shared%] NEQ [] (
-    cl /nologo /c /O2 /Oi- /MD %TOP%build\win64\dll.c || EXIT /B
+    cl %CFLAGS% /MD /D__BLST_DLL_MAIN__ %TOP%src\server.c || EXIT /B
     set ld=
     FOR /F "usebackq delims=" %%F IN (`where link`) DO (
         IF "!ld!" == "" (
@@ -43,17 +45,17 @@ IF [%shared%] NEQ [] (
              /def:%TOP%build\win64\blst.def *.obj kernel32.lib && del *.obj
     ) ELSE (
         lib /nologo /out:blst_arm64.lib *.obj && del *.obj || EXIT /B
-        cl /nologo /arm64EC /c /O2 /Zi /Fdblst.pdb /W4 /MT /Zl %TOP%src\server.c || EXIT /B
         FOR %%F IN (%TOP%build\win64\*-armv8.asm) DO (
             armasm64 -nologo -machine arm64ec -nowarn %%F || EXIT /B
         )
-        cl /nologo /arm64EC /c /O2 /Oi- /MD %TOP%build\win64\dll.c || EXIT /B
+        cl /arm64EC %CFLAGS% /MD /D__BLST_DLL_MAIN__ %TOP%src\server.c || EXIT /B
         !ld! /nologo /machine:arm64x /dll /noentry %shared% ^
              /def:%TOP%build\win64\blst.def *.obj ^
              /defArm64Native:%TOP%build\win64\blst.def blst_arm64.lib ^
              kernel32.lib && del *.obj blst_arm64.lib
     )
 ) ELSE (
+    cl %CFLAGS% /MT /Zl %TOP%src\server.c || EXIT /B
     lib /nologo %static% *.obj && del *.obj
 )
 ENDLOCAL

build.sh

@@ -84,6 +84,9 @@ if [ -z "${flavour}" ]; then
         flavour=macosx
     elif echo ${predefs} | grep -q _WIN32; then
         flavour=mingw64
+        if [ $shared ]; then
+            cflags="$cflags -D__BLST_DLL_MAIN__"
+        fi
     else
         flavour=elf
     fi
@@ -121,8 +124,7 @@ if [ $shared ]; then
         macosx) (set -x; ${CC} -dynamiclib -o libblst$dll.dylib \
                                -all_load libblst.a ${CFLAGS}); exit 0;;
         mingw*) sharedlib="blst.dll ${TOP}/build/win64/blst.def"
-                CFLAGS="${CFLAGS} -Wl,--entry=DllMain ${TOP}/build/win64/dll.c"
-                CFLAGS="${CFLAGS} -nostartfiles";;
+                CFLAGS="${CFLAGS} -Wl,--entry=DllMain -nostartfiles";;
         *)      sharedlib=libblst$dll.so
                 CFLAGS="${CFLAGS} -Wl,-Bsymbolic";;
     esac