windows build

Author: azahnen

libxtracfg/c/build.bat

@@ -32,23 +32,10 @@ cl.exe /MD /I./ /Fetest.exe /I%JAVA_HOME%/include /I%JAVA_HOME%/include/%PLATFOR
  ../wrapper/libxtracfg.c ^
  ../test/main.c ^
  libxtracfgjni_static.lib ^
- C:\hostedtoolcache\windows\graalvm-jdk-21_windows-x64_bin\21.0.0\x64\graalvm-jdk-21.0.9+7.1\lib\svm\clibraries\windows-amd64\libchelper.lib ^
- C:\hostedtoolcache\windows\graalvm-jdk-21_windows-x64_bin\21.0.0\x64\graalvm-jdk-21.0.9+7.1\lib\static\windows-amd64\net.lib ^
- C:\hostedtoolcache\windows\graalvm-jdk-21_windows-x64_bin\21.0.0\x64\graalvm-jdk-21.0.9+7.1\lib\static\windows-amd64\extnet.lib ^
- C:\hostedtoolcache\windows\graalvm-jdk-21_windows-x64_bin\21.0.0\x64\graalvm-jdk-21.0.9+7.1\lib\static\windows-amd64\nio.lib ^
- C:\hostedtoolcache\windows\graalvm-jdk-21_windows-x64_bin\21.0.0\x64\graalvm-jdk-21.0.9+7.1\lib\static\windows-amd64\management_ext.lib ^
- C:\hostedtoolcache\windows\graalvm-jdk-21_windows-x64_bin\21.0.0\x64\graalvm-jdk-21.0.9+7.1\lib\static\windows-amd64\java.lib ^
- C:\hostedtoolcache\windows\graalvm-jdk-21_windows-x64_bin\21.0.0\x64\graalvm-jdk-21.0.9+7.1\lib\static\windows-amd64\sunmscapi.lib ^
- C:\hostedtoolcache\windows\graalvm-jdk-21_windows-x64_bin\21.0.0\x64\graalvm-jdk-21.0.9+7.1\lib\static\windows-amd64\zip.lib ^
- C:\hostedtoolcache\windows\graalvm-jdk-21_windows-x64_bin\21.0.0\x64\graalvm-jdk-21.0.9+7.1\lib\svm\clibraries\windows-amd64\jvm.lib ^
  /link ^
   /NODEFAULTLIB:LIBCMT ^
   /FILEALIGN:4096 ^
   /LIBPATH:./ ^
-  /LIBPATH:%JAVA_HOME%/lib ^
-  /LIBPATH:%JAVA_HOME%/lib/svm/clibraries ^
-  /LIBPATH:%JAVA_HOME%/lib/svm/clibraries/windows-amd64 ^
-  /LIBPATH:%JAVA_HOME%/lib/static/windows-amd64 ^
   /WHOLEARCHIVE:libxtracfgjni_static.lib ^
   ncrypt.lib ^
   crypt32.lib ^

libxtracfg/c/native-image/static-compiler-windows.bat

@@ -28,7 +28,7 @@ if not exist %LOG_PATH% mkdir %LOG_PATH%
 REM Do a simple forward for any calls that are used to compile individual C files
 IF "%LIB_NAME%"=="" (
     echo Forwarding to cl.exe for compiling C file: %* >> %LOG_FILE%
-    cmd /c cl /MT %*
+    cmd /c cl.exe %*
     exit /b
 )
 
@@ -42,16 +42,15 @@ echo                   SHARED LIBRARY                      >> %LOG_FILE%
 echo ===================================================== >> %LOG_FILE%
 REM Modify the arguments if needed
 set CL_ARGS=%*
-set "CL_ARGS=%CL_ARGS:/MD /LD=/MT%"
-set "CL_ARGS=%CL_ARGS:/NODEFAULTLIB:LIBCMT=%"
+REM set "CL_ARGS=%CL_ARGS:/MD /LD=/MT%"
+REM set "CL_ARGS=%CL_ARGS:/NODEFAULTLIB:LIBCMT=%"
 echo cl.exe %CL_ARGS% >> %LOG_FILE%
 cmd /c cl.exe %CL_ARGS%
 
 echo ===================================================== >> %LOG_FILE%
 echo                   STATIC EXTERNAL                     >> %LOG_FILE%
 echo ===================================================== >> %LOG_FILE%
 set LIBS_EXT=
-set LIBS_EXT_DIRS=
 for %%P in (%*) do (
     echo %%P >> %LOG_FILE%
     echo %%P | findstr /R /C:"^C:.*\.lib" 1>nul
@@ -71,6 +70,6 @@ REM To create a static library on Windows we need to call lib.exe input.obj /OUT
 REM We don't want to overwrite the .lib needed to compile against the .dll, so
 REM we append "_s" to indicate that it is a static library.
 if not exist %OUTPUT_PATH% mkdir %OUTPUT_PATH%
-set LIB_ARGS=%LIB_NAME%.obj /OUT:%OUTPUT_PATH%\%LIB_NAME%_static.lib
+set LIB_ARGS=%LIB_NAME%.obj !LIBS_EXT! /OUT:%OUTPUT_PATH%\%LIB_NAME%_static.lib
 echo lib.exe %LIB_ARGS% >> %LOG_FILE%
 cmd /c lib.exe %LIB_ARGS%

libxtracfg/java/build.gradle

@@ -58,9 +58,6 @@ graalvmNative {
         if (targetos == 'darwin') {
             buildArgs('--native-compiler-options=-Wl,-framework,Security')
         }
-        if (targetos == 'windows') {
-            buildArgs('-H:+StaticExecutableWithDynamicLibC')
-        }
         //buildArgs('-march=native')
         buildArgs('-O2') //TODO -O3 image is 50% larger than -O2, test -Os with JDK 23
         //buildArgs('--pgo') see https://www.graalvm.org/latest/reference-manual/native-image/optimizations-and-performance/PGO/