Skip to content

Commit 6de90c3

Browse files
committed
windows build
1 parent e5cd69a commit 6de90c3

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

libxtracfg/c/build.bat

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,12 @@ cl.exe /MD /I./ /Fetest.exe /I%JAVA_HOME%/include /I%JAVA_HOME%/include/%PLATFOR
3232
../wrapper/libxtracfg.c ^
3333
../test/main.c ^
3434
libxtracfgjni_static.lib ^
35-
libxtracfgjni_static_java.lib ^
35+
libxtracfgjni_static_ext.lib ^
3636
/link ^
3737
/NODEFAULTLIB:LIBCMT ^
3838
/FILEALIGN:4096 ^
3939
/LIBPATH:./ ^
40-
/WHOLEARCHIVE:libxtracfgjni_static.lib ^
41-
ncrypt.lib ^
42-
crypt32.lib ^
43-
winhttp.lib ^
44-
psapi.lib ^
45-
version.lib ^
46-
advapi32.lib ^
47-
ws2_32.lib ^
48-
secur32.lib ^
49-
iphlpapi.lib ^
50-
userenv.lib ^
51-
mswsock.lib
52-
REM /verbose
53-
REM %JAVA_HOME%/lib/jvm.lib
40+
/WHOLEARCHIVE:libxtracfgjni_static.lib
5441

5542
ls -l
5643

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ echo ===================================================== >> %LOG_FILE%
5353
set LIBS_EXT=
5454
for %%P in (%*) do (
5555
echo %%P >> %LOG_FILE%
56-
echo %%P | findstr /R /C:"^C:.*\.lib" 1>nul
56+
echo %%P | findstr /R /C:"^[^/].*\.lib" 1>nul
5757
if !errorlevel!==0 (
5858
echo *** >> %LOG_FILE%
5959
echo !LIBS_EXT! | findstr /C:"%%P" >nul
@@ -76,6 +76,6 @@ if not exist %OUTPUT_PATH% mkdir %OUTPUT_PATH%
7676
set LIB_ARGS=%LIB_NAME%.obj /OUT:%OUTPUT_PATH%\%LIB_NAME%_static.lib
7777
echo lib.exe %LIB_ARGS% >> %LOG_FILE%
7878
cmd /c lib.exe %LIB_ARGS%
79-
set LIB_ARGS=!LIBS_EXT! /OUT:%OUTPUT_PATH%\%LIB_NAME%_static_java.lib
79+
set LIB_ARGS=!LIBS_EXT! /OUT:%OUTPUT_PATH%\%LIB_NAME%_static_ext.lib
8080
echo lib.exe %LIB_ARGS% >> %LOG_FILE%
8181
cmd /c lib.exe %LIB_ARGS%

0 commit comments

Comments
 (0)