rik/mimis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compileren wiiscan met vc++ werkt niet (probleem met externals?). Nu de gerealesde exe toegevoegd aan java/native, inclusief benodigde dll's en aangepast config file.

Browse Source
This commit is contained in:
Rik Veenboer
2011-06-07 09:51:10 +00:00
parent 48bb9f4dae
commit b0d6aa79b2
30 changed files with 135 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
cpp/wiiscan/Debug/USBm.dll
View File

Binary file not shown.

BIN
cpp/wiiscan/Debug/WiimoteLib.dll
View File

Binary file not shown.

BIN
cpp/wiiscan/Debug/bdi.out
View File

Binary file not shown.

BIN
cpp/wiiscan/Debug/wiimotelibpoll.exe
View File

Binary file not shown.

BIN
cpp/wiiscan/Debug/wiiscan.exe
View File

Binary file not shown.

BIN
cpp/wiiscan/Debug/wiiuse.dll
View File

Binary file not shown.

0
cpp/wiiscan/DelcomDLL.h → cpp/wiiscan/include/DelcomDLL.h
View File

0
cpp/wiiscan/wiiuse.h → cpp/wiiscan/include/wiiuse.h
View File

BIN
cpp/wiiscan/lib/advapi32.lib Normal file
View File

Binary file not shown.

BIN
cpp/wiiscan/lib/comdlg32.lib Normal file
View File

Binary file not shown.

BIN
cpp/wiiscan/lib/gdi32.lib Normal file
View File

Binary file not shown.

BIN
cpp/wiiscan/lib/kernel32.lib Normal file
View File

Binary file not shown.

BIN
cpp/wiiscan/lib/libcpmt.lib Normal file
View File

Binary file not shown.

BIN
cpp/wiiscan/lib/odbc32.lib Normal file
View File

Binary file not shown.

BIN
cpp/wiiscan/lib/odbccp32.lib Normal file
View File

Binary file not shown.

BIN
cpp/wiiscan/lib/ole32.lib Normal file
View File

Binary file not shown.

BIN
cpp/wiiscan/lib/oleaut32.lib Normal file
View File

Binary file not shown.

BIN
cpp/wiiscan/lib/shell32.lib Normal file
View File

Binary file not shown.

BIN
cpp/wiiscan/lib/user32.lib Normal file
View File

Binary file not shown.

BIN
cpp/wiiscan/lib/uuid.lib Normal file
View File

Binary file not shown.

BIN
cpp/wiiscan/lib/winspool.lib Normal file
View File

Binary file not shown.

8
cpp/wiiscan/wiiscan.sln → cpp/wiiscan/msvc/wiiscan.sln
View File

@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 10.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2008 # Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wiiscan", "wiiscan.vcproj", "{6E522A84-9956-44F9-B30A-CF44F3CED276}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wiiscan", "wiiscan.vcxproj", "{6E522A84-9956-44F9-B30A-CF44F3CED276}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

243
cpp/wiiscan/msvc/wiiscan.vcproj
View File

@@ -1,243 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="wiiscan"
ProjectGUID="{6E522A84-9956-44F9-B30A-CF44F3CED276}"
RootNamespace="wiiscan"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="2"
GenerateManifest="false"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="false"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateManifest="false"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Headers"
Filter="*.h"
>
<File
RelativePath="..\args.h"
>
</File>
<File
RelativePath="..\configfile.h"
>
</File>
<File
RelativePath="..\DelcomDLL.h"
>
</File>
<File
RelativePath="..\exception.h"
>
</File>
<File
RelativePath="..\file.h"
>
</File>
<File
RelativePath="..\funs.h"
>
</File>
<File
RelativePath="..\stringfun.h"
>
</File>
<File
RelativePath="..\toolsfun.h"
>
</File>
<File
RelativePath="..\usbm.h"
>
</File>
<File
RelativePath="..\wiiscan.h"
>
</File>
<File
RelativePath="..\wiiuse.h"
>
</File>
</Filter>
<File
RelativePath=".\CHANGELOG"
>
</File>
<File
RelativePath=".\LICENSE"
>
</File>
<File
RelativePath=".\README"
>
</File>
<File
RelativePath="..\wiiscan.cpp"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

120
cpp/wiiscan/msvc/wiiscan.vcxproj Normal file
View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{6E522A84-9956-44F9-B30A-CF44F3CED276}</ProjectGuid>
<RootNamespace>wiiscan</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include;$(IncludePath)</IncludePath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib;$(LibraryPath)</LibraryPath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include;$(IncludePath)</IncludePath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<BufferSecurityCheck>false</BufferSecurityCheck>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>
</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>
</DebugInformationFormat>
<BufferSecurityCheck>false</BufferSecurityCheck>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>
</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\args.h" />
<ClInclude Include="..\configfile.h" />
<ClInclude Include="..\exception.h" />
<ClInclude Include="..\file.h" />
<ClInclude Include="..\funs.h" />
<ClInclude Include="..\stringfun.h" />
<ClInclude Include="..\toolsfun.h" />
<ClInclude Include="..\usbm.h" />
<ClInclude Include="..\wiiscan.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\wiiscan.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

3
cpp/wiiscan/msvc/wiiscan.vcxproj.user Normal file
View File

@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

7
cpp/wiiscan/wiiscan.h
View File

@@ -31,10 +31,11 @@
#include <bthdef.h> #include <bthdef.h>
#include <BluetoothAPIs.h> #include <BluetoothAPIs.h>
#pragma comment ( lib, "Lib/wiiuse.lib") #pragma comment ( lib, "odbccp32.lib")
#pragma comment ( lib, "Lib/delcomdll.lib") #pragma comment ( lib, "wiiuse.lib")
#pragma comment ( lib, "delcomdll.lib")
#pragma comment ( lib, "Irprops.lib") #pragma comment ( lib, "Irprops.lib")
#pragma comment ( lib, "Ws2_32.lib") #pragma comment ( lib, "libcpmt.lib")
namespace Wiiscan { namespace Wiiscan {

0
cpp/wiiscan/Debug/DelcomDLL.dll → java/native/DelcomDLL.dll
View File

BIN
java/native/wiiscan.exe Normal file
View File

Binary file not shown.

9
cpp/wiiscan/Debug/wiiscan.ini → java/native/wiiscan.ini
View File

@@ -19,7 +19,7 @@
%whiteboard_software="d:/WiimoteWhiteboard/WiimoteWhiteboard_v0.3.exe" %whiteboard_software="d:/WiimoteWhiteboard/WiimoteWhiteboard_v0.3.exe"
% same stuff, but binary build from sources and redistributed in this package % 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 % Boon Jin's wb software version 0.6, does not work yet, missing library integration
%whiteboard_software="d:/wsb/WiimoteSmoothboard.exe" %whiteboard_software="d:/wsb/WiimoteSmoothboard.exe"
@@ -42,14 +42,13 @@
%option_btsleep=2000 %option_btsleep=2000
% start wb at successfull connect, 0 or 1 % start wb at successfull connect, 0 or 1
option_startwhiteboard=1 option_startwhiteboard=0
% output verbose flag, 0 or 1 % output verbose flag, 0 or 1
option_debug=1 option_debug=0
% logging output file, put nothing if no logging is wanted % 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 % wiimote connection library, use none, wiiuse, or wiimotelib
option_wiilib=wiimotelib option_wiilib=wiimotelib

BIN
java/native/wiiuse.dll Normal file
View File

Binary file not shown.