Index: unk/src/VBox/Main/glue/tests/Makefile
===================================================================
--- /trunk/src/VBox/Main/glue/tests/Makefile	(revision 29781)
+++ 	(revision )
@@ -1,32 +1,0 @@
-#
-# Copyright (C) 2010 Oracle Corporation
-#
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License (GPL) as published by the Free Software
-# Foundation, in version 2 as it comes in the "COPYING" file of the
-# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-OS=$(shell uname -s)
-ARCH=$(shell uname -p)
-
-ifeq ($(OS), Darwin)
- VBOX_BIN=/Applications/VirtualBox.app/Contents/MacOS
- VBOX_SDK=$(VBOX_BIN)/sdk
- JAVA_OPT= -d32
-endif
-
-ifeq ($(OS), Linux)
- VBOX_SDK=/home/nike/work/ws/out/linux.amd64/debug/bin/sdk
- VBOX_BIN=/home/nike/work/ws/out/linux.amd64/debug/bin
-endif
-
-VBOX_JAR=$(VBOX_SDK)/bindings/xpcom/java/vboxjxpcom.jar
-
-all: testvb
-
-testvb:
-	javac -cp $(VBOX_JAR) TestVBox.java
-	java $(JAVA_OPT) -cp  $(VBOX_JAR):. -Dvbox.home=$(VBOX_BIN) TestVBox
Index: /trunk/src/VBox/Main/glue/tests/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/glue/tests/Makefile.kmk	(revision 29782)
+++ /trunk/src/VBox/Main/glue/tests/Makefile.kmk	(revision 29782)
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2010 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+
+KBUILD_TARGET=linux
+
+ifeq ($(KBUILD_TARGET),darwin)
+ VBOX_BIN=/Applications/VirtualBox.app/Contents/MacOS
+ VBOX_SDK=$(VBOX_BIN)/sdk
+# JAVA_OPT= -d32
+endif
+
+ifeq ($(KBUILD_TARGET),linux)
+ VBOX_SDK=/home/nike/work/ws/out/linux.amd64/debug/bin/sdk
+ VBOX_BIN=/home/nike/work/ws/out/linux.amd64/debug/bin
+endif
+
+ifeq ($(KBUILD_TARGET),win)
+ VBOX_SDK=e:/ws/out/win.amd64/debug/bin/sdk
+ VBOX_BIN=e:/ws/out/win.amd64/debug/bin
+endif
+
+ifeq ($(KBUILD_TARGET),win)
+ VBOX_JAR=$(VBOX_SDK)/bindings/mscom/java/vboxjmscom.jar
+else
+ VBOX_JAR=$(VBOX_SDK)/bindings/xpcom/java/vboxjxpcom.jar
+endif
+
+all: testvb
+
+testvb:
+	javac -cp $(VBOX_JAR) TestVBox.java
+	java $(JAVA_OPT) -cp  $(VBOX_JAR):. -Dvbox.home=$(VBOX_BIN) TestVBox
+