Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 29787)
+++ /trunk/Config.kmk	(revision 29788)
@@ -4293,12 +4293,20 @@
  VBOX_JAR   = $(VBOX_JAVA_HOME)/Commands/jar
  VBOX_JAVA_INC = $(VBOX_JAVA_HOME)/Headers
+
 else
- ifeq ($(KBUILD_TARGET), linux)
-  VBOX_JAVA_HOME ?= /usr/lib/jvm/java-6-sun
- endif
- ifeq ($(KBUILD_TARGET), solaris)
+
+ifeq ($(KBUILD_TARGET), linux)
+ VBOX_JAVA_HOME ?= /usr/lib/jvm/java-6-sun
+endif
+
+ifeq ($(KBUILD_TARGET), solaris)
  # VBOX_JAVA_HOME ?= /usr/jdk/jdk1.6.0
    VBOX_JAVA_HOME ?= /usr/java
- endif
+endif
+
+ifeq ($(KBUILD_TARGET), win)
+ VBOX_JAVA_HOME ?= c:/jdk
+endif
+
  VBOX_JAVAC = $(VBOX_JAVA_HOME)/bin/javac
  VBOX_JAVAH = $(VBOX_JAVA_HOME)/bin/javah
Index: /trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/Makefile.kmk	(revision 29787)
+++ /trunk/src/VBox/Main/Makefile.kmk	(revision 29788)
@@ -869,5 +869,5 @@
               --stringparam G_vboxGlueStyle mscom              \
               -o $(VBOX_JMSCOM_GEN)/java/merged.file $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl $<
-	$(QUIET)$(VBOX_FILESPLIT) $(VBOX_JMSCOM_GEN)/java/merged.file $(VBOX_JMSCOM_GEN)/java/
+	$(QUIET)$(VBOX_FILESPLIT) $(VBOX_JMSCOM_GEN)/java/merged.file $(VBOX_JMSCOM_GEN)/java	
 	$(QUIET)echo $(VBOX_JMSCOM_GEN)/java/*.java > $@
 
Index: /trunk/src/VBox/Main/glue/tests/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/glue/tests/Makefile.kmk	(revision 29787)
+++ /trunk/src/VBox/Main/glue/tests/Makefile.kmk	(revision 29788)
@@ -10,9 +10,8 @@
 # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 #
-
 ifeq ($(KBUILD_HOST),darwin)
  VBOX_BIN=/Applications/VirtualBox.app/Contents/MacOS
  VBOX_SDK=$(VBOX_BIN)/sdk
-# JAVA_OPT= -d32
+# JAVA_ARGS += -d32
 endif
 
@@ -25,11 +24,20 @@
  VBOX_SDK=e:/ws/out/win.amd64/debug/bin/sdk
  VBOX_BIN=e:/ws/out/win.amd64/debug/bin
+ JACOB_DIR=e:/ws/src/libs/jacob-1.15-M3/
+ JACOB_JAR=$(JACOB_DIR)/jacob.jar
+ CLASSPATH += $(JACOB_JAR)$(SEP)
+ JAVA_ARGS += -Djava.library.path=$(JACOB_DIR) 
 endif
 
 ifeq ($(KBUILD_HOST),win)
  VBOX_JAR=$(VBOX_SDK)/bindings/mscom/java/vboxjmscom.jar
+ SEP=\;
 else
  VBOX_JAR=$(VBOX_SDK)/bindings/xpcom/java/vboxjxpcom.jar
+ SEP=:
 endif
+
+JAVA_ARGS += -Dvbox.home=$(VBOX_BIN) 
+CLASSPATH  := $(CLASSPATH)$(VBOX_JAR)$(SEP).
 
 all: testvb
@@ -37,4 +45,4 @@
 testvb:
 	javac -cp $(VBOX_JAR) TestVBox.java
-	java $(JAVA_OPT) -cp  $(VBOX_JAR):. -Dvbox.home=$(VBOX_BIN) TestVBox
+	java $(JAVA_ARGS) -cp $(CLASSPATH)  TestVBox