Skip to content

Commit 738dd2b

Browse files
mtrelletmtrellet
authored
Merge pull request #1 from Fluigent/unique_version
Provide a unique version
2 parents ae77537 + c4f1644 commit 738dd2b

37 files changed

Lines changed: 31 additions & 33 deletions

‎Aria_SDK.pdf‎

-11 Bytes
Binary file not shown.

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,7 @@ Here are the package contents:
3838
| C++ | **main.cpp** example script <br> **aria_sdk_example_cpp.sln** Visual Studio complete solution containing middleware and examples |
3939
| C# | **Program.cs** example script <br> **aria-sdk-example.sln** Visual Studio complete solution containing middleware and examples |
4040
| Python | **aria-sdk-example.py** example script |
41+
42+
## Support
43+
44+
For any question, please contact support@fluigent.com

‎cpp/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
This is a console application written in C++ 14, demonstrating the basic usage of the Fluigent Aria SDK.
44

55
## Instructions
6-
- Copy the shared folder (containing the SDK DLLs and headers) to the root folder of the example (the folder which contains this README file)
7-
- Open the aria_sdk_example_cpp.sln solution file with Visual Studio
8-
- Build and run the aria_sdk_example_cpp project
6+
- Make sure there is a `dll/` folder containing the SDK DLLs (`win/[x86|x64]/[*.dll|*.lib]`) and headers (`Headers/*.h`) in the root folder of the example
7+
- Open the `aria_sdk_example_cpp.sln` solution file with Visual Studio
8+
- Build and run the `aria_sdk_example_cpp` project

‎cpp/aria_sdk_example_cpp.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,16 @@
7676
<SDLCheck>true</SDLCheck>
7777
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7878
<ConformanceMode>true</ConformanceMode>
79-
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\shared\Headers\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
79+
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\dll\Headers\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8080
</ClCompile>
8181
<Link>
8282
<SubSystem>Console</SubSystem>
8383
<GenerateDebugInformation>true</GenerateDebugInformation>
84-
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);$(MSBuildProjectDirectory)\shared\win\x86\aria_sdk_clr.lib</AdditionalDependencies>
84+
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);$(MSBuildProjectDirectory)\dll\win\x86\aria_sdk_clr.lib</AdditionalDependencies>
8585
</Link>
8686
<PostBuildEvent>
87-
<Command>copy "$(ProjectDir)\shared\win\x86\aria_sdk.dll" "$(OutDir)aria_sdk.dll"
88-
copy "$(ProjectDir)\shared\win\x86\aria_sdk_clr.dll" "$(OutDir)aria_sdk_clr.dll"</Command>
87+
<Command>copy "$(ProjectDir)\dll\win\x86\aria_sdk.dll" "$(OutDir)aria_sdk.dll"
88+
copy "$(ProjectDir)\dll\win\x86\aria_sdk_clr.dll" "$(OutDir)aria_sdk_clr.dll"</Command>
8989
</PostBuildEvent>
9090
</ItemDefinitionGroup>
9191
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -116,16 +116,16 @@ copy $(ProjectDir)aria_sdk_clr.dll $(OutDir)aria_sdk_clr.dll</Command>
116116
<SDLCheck>true</SDLCheck>
117117
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118118
<ConformanceMode>true</ConformanceMode>
119-
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\shared\Headers\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119+
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\dll\Headers\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
120120
</ClCompile>
121121
<Link>
122122
<SubSystem>Console</SubSystem>
123123
<GenerateDebugInformation>true</GenerateDebugInformation>
124-
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);$(MSBuildProjectDirectory)\shared\win\x64\aria_sdk_clr.lib</AdditionalDependencies>
124+
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);$(MSBuildProjectDirectory)\dll\win\x64\aria_sdk_clr.lib</AdditionalDependencies>
125125
</Link>
126126
<PostBuildEvent>
127-
<Command>copy "$(ProjectDir)\shared\win\x64\aria_sdk.dll" "$(OutDir)aria_sdk.dll"
128-
copy "$(ProjectDir)\shared\win\x64\aria_sdk_clr.dll" "$(OutDir)aria_sdk_clr.dll"</Command>
127+
<Command>copy "$(ProjectDir)\dll\win\x64\aria_sdk.dll" "$(OutDir)aria_sdk.dll"
128+
copy "$(ProjectDir)\dll\win\x64\aria_sdk_clr.dll" "$(OutDir)aria_sdk_clr.dll"</Command>
129129
</PostBuildEvent>
130130
</ItemDefinitionGroup>
131131
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

cpp/Headers/AriaIO.h renamed to cpp/dll/Headers/AriaIO.h

File renamed without changes.

cpp/Headers/AriaSDK.h renamed to cpp/dll/Headers/AriaSDK.h

File renamed without changes.

cpp/Headers/Configuration.h renamed to cpp/dll/Headers/Configuration.h

File renamed without changes.

cpp/Headers/Enums.h renamed to cpp/dll/Headers/Enums.h

File renamed without changes.

cpp/Headers/Error.h renamed to cpp/dll/Headers/Error.h

File renamed without changes.

cpp/Headers/FlowControl.h renamed to cpp/dll/Headers/FlowControl.h

File renamed without changes.

0 commit comments

Comments
 (0)