Skip to content

Commit 12da7c2

Browse files
committed
windows build
1 parent 6de90c3 commit 12da7c2

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

libxtracfg/c/build.bat

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ echo lib
1414
REM ls -l -R %JAVA_HOME%
1515

1616
REM static
17-
REM cl.exe /c /MT /W4 /I./ /I%JAVA_HOME%/include /I%JAVA_HOME%/include/%PLATFORM% /Folibxtracfg.obj ../wrapper/libxtracfg.c
18-
copy libxtracfgjni_static.lib libxtracfg.lib
19-
REM lib.exe /OUT:libxtracfg.lib /VERBOSE libxtracfg.obj libxtracfgjni_static.lib
17+
cl.exe /c /MD /W4 /I./ /I%JAVA_HOME%/include /I%JAVA_HOME%/include/%PLATFORM% /Folibxtracfg.obj ../wrapper/libxtracfg.c
18+
REM copy libxtracfgjni_static.lib libxtracfg.lib
19+
lib.exe /OUT:libxtracfg.lib /VERBOSE libxtracfg.obj libxtracfgjni_static.lib
2020

2121
certutil -hashfile libxtracfg.lib SHA1 > libxtracfg.sha1sum.tmp
2222
REM Extract just the hash from certutil output (it includes headers/footers)
@@ -28,16 +28,15 @@ echo test
2828
ls -l
2929

3030
REM static
31-
cl.exe /MD /I./ /Fetest.exe /I%JAVA_HOME%/include /I%JAVA_HOME%/include/%PLATFORM% ^
32-
../wrapper/libxtracfg.c ^
31+
cl.exe /MD /I./ /Fetest.exe ^
3332
../test/main.c ^
34-
libxtracfgjni_static.lib ^
33+
libxtracfg.lib ^
3534
libxtracfgjni_static_ext.lib ^
3635
/link ^
3736
/NODEFAULTLIB:LIBCMT ^
3837
/FILEALIGN:4096 ^
3938
/LIBPATH:./ ^
40-
/WHOLEARCHIVE:libxtracfgjni_static.lib
39+
/WHOLEARCHIVE:libxtracfg.lib
4140

4241
ls -l
4342

libxtracfg/js/xtracfg-native-binding/binding.gyp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
'conditions': [
2222
['OS=="win"', {
23-
'libraries': [ '<(local_prefix)/../c/build/libxtracfg.lib' ]
23+
'libraries': [ '<(local_prefix)/../c/build/libxtracfg.lib', '<(local_prefix)/../c/build/libxtracfgjni_static_ext.lib' ]
2424
}, { # OS != "win"
2525
'libraries': [ '<(local_prefix)/../c/build/libxtracfg.a' ]
2626
}],

0 commit comments

Comments
 (0)