diff --git a/cpp/wiiscan/Debug/USBm.dll b/cpp/wiiscan/Debug/USBm.dll
deleted file mode 100644
index 1460ff3..0000000
Binary files a/cpp/wiiscan/Debug/USBm.dll and /dev/null differ
diff --git a/cpp/wiiscan/Debug/WiimoteLib.dll b/cpp/wiiscan/Debug/WiimoteLib.dll
deleted file mode 100644
index da8e126..0000000
Binary files a/cpp/wiiscan/Debug/WiimoteLib.dll and /dev/null differ
diff --git a/cpp/wiiscan/Debug/bdi.out b/cpp/wiiscan/Debug/bdi.out
deleted file mode 100644
index 3e47aaa..0000000
Binary files a/cpp/wiiscan/Debug/bdi.out and /dev/null differ
diff --git a/cpp/wiiscan/Debug/wiimotelibpoll.exe b/cpp/wiiscan/Debug/wiimotelibpoll.exe
deleted file mode 100644
index 72937a2..0000000
Binary files a/cpp/wiiscan/Debug/wiimotelibpoll.exe and /dev/null differ
diff --git a/cpp/wiiscan/Debug/wiiscan.exe b/cpp/wiiscan/Debug/wiiscan.exe
deleted file mode 100644
index d15393c..0000000
Binary files a/cpp/wiiscan/Debug/wiiscan.exe and /dev/null differ
diff --git a/cpp/wiiscan/Debug/wiiuse.dll b/cpp/wiiscan/Debug/wiiuse.dll
deleted file mode 100644
index a7e228c..0000000
Binary files a/cpp/wiiscan/Debug/wiiuse.dll and /dev/null differ
diff --git a/cpp/wiiscan/DelcomDLL.h b/cpp/wiiscan/include/DelcomDLL.h
similarity index 100%
rename from cpp/wiiscan/DelcomDLL.h
rename to cpp/wiiscan/include/DelcomDLL.h
diff --git a/cpp/wiiscan/wiiuse.h b/cpp/wiiscan/include/wiiuse.h
similarity index 100%
rename from cpp/wiiscan/wiiuse.h
rename to cpp/wiiscan/include/wiiuse.h
diff --git a/cpp/wiiscan/lib/advapi32.lib b/cpp/wiiscan/lib/advapi32.lib
new file mode 100644
index 0000000..2812216
Binary files /dev/null and b/cpp/wiiscan/lib/advapi32.lib differ
diff --git a/cpp/wiiscan/lib/comdlg32.lib b/cpp/wiiscan/lib/comdlg32.lib
new file mode 100644
index 0000000..181fca1
Binary files /dev/null and b/cpp/wiiscan/lib/comdlg32.lib differ
diff --git a/cpp/wiiscan/lib/gdi32.lib b/cpp/wiiscan/lib/gdi32.lib
new file mode 100644
index 0000000..63172a5
Binary files /dev/null and b/cpp/wiiscan/lib/gdi32.lib differ
diff --git a/cpp/wiiscan/lib/kernel32.lib b/cpp/wiiscan/lib/kernel32.lib
new file mode 100644
index 0000000..77b0e53
Binary files /dev/null and b/cpp/wiiscan/lib/kernel32.lib differ
diff --git a/cpp/wiiscan/lib/libcpmt.lib b/cpp/wiiscan/lib/libcpmt.lib
new file mode 100644
index 0000000..85e91bb
Binary files /dev/null and b/cpp/wiiscan/lib/libcpmt.lib differ
diff --git a/cpp/wiiscan/lib/odbc32.lib b/cpp/wiiscan/lib/odbc32.lib
new file mode 100644
index 0000000..1add151
Binary files /dev/null and b/cpp/wiiscan/lib/odbc32.lib differ
diff --git a/cpp/wiiscan/lib/odbccp32.lib b/cpp/wiiscan/lib/odbccp32.lib
new file mode 100644
index 0000000..0f2ef09
Binary files /dev/null and b/cpp/wiiscan/lib/odbccp32.lib differ
diff --git a/cpp/wiiscan/lib/ole32.lib b/cpp/wiiscan/lib/ole32.lib
new file mode 100644
index 0000000..17d6af8
Binary files /dev/null and b/cpp/wiiscan/lib/ole32.lib differ
diff --git a/cpp/wiiscan/lib/oleaut32.lib b/cpp/wiiscan/lib/oleaut32.lib
new file mode 100644
index 0000000..1955d00
Binary files /dev/null and b/cpp/wiiscan/lib/oleaut32.lib differ
diff --git a/cpp/wiiscan/lib/shell32.lib b/cpp/wiiscan/lib/shell32.lib
new file mode 100644
index 0000000..b723320
Binary files /dev/null and b/cpp/wiiscan/lib/shell32.lib differ
diff --git a/cpp/wiiscan/lib/user32.lib b/cpp/wiiscan/lib/user32.lib
new file mode 100644
index 0000000..eda26c0
Binary files /dev/null and b/cpp/wiiscan/lib/user32.lib differ
diff --git a/cpp/wiiscan/lib/uuid.lib b/cpp/wiiscan/lib/uuid.lib
new file mode 100644
index 0000000..f6e4ae2
Binary files /dev/null and b/cpp/wiiscan/lib/uuid.lib differ
diff --git a/cpp/wiiscan/lib/winspool.lib b/cpp/wiiscan/lib/winspool.lib
new file mode 100644
index 0000000..61cb936
Binary files /dev/null and b/cpp/wiiscan/lib/winspool.lib differ
diff --git a/cpp/wiiscan/wiiscan.sln b/cpp/wiiscan/msvc/wiiscan.sln
similarity index 80%
rename from cpp/wiiscan/wiiscan.sln
rename to cpp/wiiscan/msvc/wiiscan.sln
index bb26b13..a35473f 100644
--- a/cpp/wiiscan/wiiscan.sln
+++ b/cpp/wiiscan/msvc/wiiscan.sln
@@ -1,7 +1,7 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wiiscan", "wiiscan.vcproj", "{6E522A84-9956-44F9-B30A-CF44F3CED276}"
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wiiscan", "wiiscan.vcxproj", "{6E522A84-9956-44F9-B30A-CF44F3CED276}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/cpp/wiiscan/msvc/wiiscan.vcproj b/cpp/wiiscan/msvc/wiiscan.vcproj
deleted file mode 100644
index aba1116..0000000
--- a/cpp/wiiscan/msvc/wiiscan.vcproj
+++ /dev/null
@@ -1,243 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cpp/wiiscan/msvc/wiiscan.vcxproj b/cpp/wiiscan/msvc/wiiscan.vcxproj
new file mode 100644
index 0000000..3eb33d2
--- /dev/null
+++ b/cpp/wiiscan/msvc/wiiscan.vcxproj
@@ -0,0 +1,120 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {6E522A84-9956-44F9-B30A-CF44F3CED276}
+ wiiscan
+ Win32Proj
+
+
+
+ Application
+ MultiByte
+ true
+
+
+ Application
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(SolutionDir)$(Configuration)\
+ $(Configuration)\
+ true
+ false
+ $(SolutionDir)$(Configuration)\
+ $(Configuration)\
+ false
+ false
+ ..\include;$(IncludePath)
+ ..\lib;$(LibraryPath)
+ ..\include;$(IncludePath)
+ ..\lib;$(LibraryPath)
+
+
+
+ Disabled
+ %(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ Level3
+ ProgramDatabase
+ false
+
+
+ true
+ Console
+ MachineX86
+
+
+
+
+
+
+ MaxSpeed
+ AnySuitable
+ false
+ Speed
+ true
+ %(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ MultiThreaded
+ true
+
+
+ Level3
+
+
+ false
+
+
+ true
+ Console
+ true
+ true
+ MachineX86
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cpp/wiiscan/msvc/wiiscan.vcxproj.user b/cpp/wiiscan/msvc/wiiscan.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/cpp/wiiscan/msvc/wiiscan.vcxproj.user
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/cpp/wiiscan/wiiscan.h b/cpp/wiiscan/wiiscan.h
index c082934..4b65804 100644
--- a/cpp/wiiscan/wiiscan.h
+++ b/cpp/wiiscan/wiiscan.h
@@ -31,10 +31,11 @@
#include
#include
-#pragma comment ( lib, "Lib/wiiuse.lib")
-#pragma comment ( lib, "Lib/delcomdll.lib")
+#pragma comment ( lib, "odbccp32.lib")
+#pragma comment ( lib, "wiiuse.lib")
+#pragma comment ( lib, "delcomdll.lib")
#pragma comment ( lib, "Irprops.lib")
-#pragma comment ( lib, "Ws2_32.lib")
+#pragma comment ( lib, "libcpmt.lib")
namespace Wiiscan {
diff --git a/cpp/wiiscan/Debug/DelcomDLL.dll b/java/native/DelcomDLL.dll
similarity index 100%
rename from cpp/wiiscan/Debug/DelcomDLL.dll
rename to java/native/DelcomDLL.dll
diff --git a/java/native/wiiscan.exe b/java/native/wiiscan.exe
new file mode 100644
index 0000000..9e9e443
Binary files /dev/null and b/java/native/wiiscan.exe differ
diff --git a/cpp/wiiscan/Debug/wiiscan.ini b/java/native/wiiscan.ini
similarity index 92%
rename from cpp/wiiscan/Debug/wiiscan.ini
rename to java/native/wiiscan.ini
index 8833211..d8d9a2c 100644
--- a/cpp/wiiscan/Debug/wiiscan.ini
+++ b/java/native/wiiscan.ini
@@ -19,7 +19,7 @@
%whiteboard_software="d:/WiimoteWhiteboard/WiimoteWhiteboard_v0.3.exe"
% same stuff, but binary build from sources and redistributed in this package
- whiteboard_software="WiimoteWhiteboard.exe"
+ %whiteboard_software="WiimoteWhiteboard.exe"
% Boon Jin's wb software version 0.6, does not work yet, missing library integration
%whiteboard_software="d:/wsb/WiimoteSmoothboard.exe"
@@ -42,14 +42,13 @@
%option_btsleep=2000
% start wb at successfull connect, 0 or 1
- option_startwhiteboard=1
+ option_startwhiteboard=0
% output verbose flag, 0 or 1
- option_debug=1
+ option_debug=0
% logging output file, put nothing if no logging is wanted
- option_logfile=wiiscan_log.txt
- %option_logfile=
+ option_logfile=
% wiimote connection library, use none, wiiuse, or wiimotelib
option_wiilib=wiimotelib
diff --git a/java/native/wiiuse.dll b/java/native/wiiuse.dll
new file mode 100644
index 0000000..260aeb0
Binary files /dev/null and b/java/native/wiiuse.dll differ