Skip to content

Commit

Permalink
Add x86 support
Browse files Browse the repository at this point in the history
  • Loading branch information
keijiro committed Aug 6, 2018
1 parent 4108659 commit 806d832
Show file tree
Hide file tree
Showing 10 changed files with 272 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ Desktop.ini

# Visual Studio
/Plugin/Windows/.vs
/Plugin/Windows/Debug
/Plugin/Windows/x64
/Plugin/Windows/Win32
66 changes: 64 additions & 2 deletions Assets/Klak/NDI/Plugin/x64/Processing.NDI.Lib.x64.dll.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Klak/NDI/Plugin/x86.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Klak/NDI/Plugin/x86/KlakNDI.dll
Binary file not shown.
86 changes: 86 additions & 0 deletions Assets/Klak/NDI/Plugin/x86/KlakNDI.dll.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
86 changes: 86 additions & 0 deletions Assets/Klak/NDI/Plugin/x86/Processing.NDI.Lib.x86.dll.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Plugin/Windows/Callback.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using namespace KlakNDI;
namespace
{
// Callback for texture update events
void TextureUpdateCallback(int eventID, void* data)
void UNITY_INTERFACE_API TextureUpdateCallback(int eventID, void* data)
{
auto event = static_cast<UnityRenderingExtEventType>(eventID);

Expand Down
12 changes: 12 additions & 0 deletions Plugin/Windows/KlakNDI.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KlakNDI", "KlakNDI.vcxproj"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5584C8EF-C8F0-4CBF-AB4E-C778CFE263E6}.Debug|Win32.ActiveCfg = Debug|Win32
{5584C8EF-C8F0-4CBF-AB4E-C778CFE263E6}.Debug|Win32.Build.0 = Debug|Win32
{5584C8EF-C8F0-4CBF-AB4E-C778CFE263E6}.Debug|x64.ActiveCfg = Debug|x64
{5584C8EF-C8F0-4CBF-AB4E-C778CFE263E6}.Debug|x64.Build.0 = Debug|x64
{5584C8EF-C8F0-4CBF-AB4E-C778CFE263E6}.Debug|x86.ActiveCfg = Debug|Win32
{5584C8EF-C8F0-4CBF-AB4E-C778CFE263E6}.Debug|x86.Build.0 = Debug|Win32
{5584C8EF-C8F0-4CBF-AB4E-C778CFE263E6}.Release|Win32.ActiveCfg = Release|Win32
{5584C8EF-C8F0-4CBF-AB4E-C778CFE263E6}.Release|Win32.Build.0 = Release|Win32
{5584C8EF-C8F0-4CBF-AB4E-C778CFE263E6}.Release|x64.ActiveCfg = Release|x64
{5584C8EF-C8F0-4CBF-AB4E-C778CFE263E6}.Release|x64.Build.0 = Release|x64
{5584C8EF-C8F0-4CBF-AB4E-C778CFE263E6}.Release|x86.ActiveCfg = Release|Win32
{5584C8EF-C8F0-4CBF-AB4E-C778CFE263E6}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
17 changes: 14 additions & 3 deletions Plugin/Windows/KlakNDI.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(NDI_SDK_DIR)\Include;$(IncludePath)</IncludePath>
<LibraryPath>$(NDI_SDK_DIR)\Lib\x86;$(LibraryPath)</LibraryPath>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
Expand All @@ -80,6 +84,10 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(NDI_SDK_DIR)\Include;$(IncludePath)</IncludePath>
<LibraryPath>$(NDI_SDK_DIR)\Lib\x86;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
Expand All @@ -88,7 +96,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
Expand All @@ -98,6 +106,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>Processing.NDI.Lib.x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -117,20 +126,22 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;KLAKNDI_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>Processing.NDI.Lib.x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand Down Expand Up @@ -174,4 +185,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

0 comments on commit 806d832

Please sign in to comment.