Skip to content

Commit b64c579

Browse files
apply sharedLib to SqueezeNetObjectDetection Sample
1 parent 0f12f0c commit b64c579

File tree

6 files changed

+4
-116
lines changed

6 files changed

+4
-116
lines changed

Samples/SqueezeNetObjectDetection/Desktop/cpp/Filehelper.cpp

Lines changed: 0 additions & 25 deletions
This file was deleted.

Samples/SqueezeNetObjectDetection/Desktop/cpp/Filehelper.h

Lines changed: 0 additions & 7 deletions
This file was deleted.

Samples/SqueezeNetObjectDetection/Desktop/cpp/SqueezeNetObjectDetectionCPP.vcxproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,9 @@
123123
</ItemDefinitionGroup>
124124
<ItemGroup>
125125
<ClInclude Include="..\..\..\..\SharedContent\models\SqueezeNet.h" />
126-
<ClInclude Include="Filehelper.h" />
127126
<ClInclude Include="pch.h" />
128127
</ItemGroup>
129128
<ItemGroup>
130-
<ClCompile Include="dllload.cpp" />
131-
<ClCompile Include="Filehelper.cpp" />
132129
<ClCompile Include="main.cpp" />
133130
<ClCompile Include="pch.cpp">
134131
<PrecompiledHeader>Create</PrecompiledHeader>
@@ -189,7 +186,7 @@
189186
</ImportGroup>
190187
<ItemDefinitionGroup>
191188
<ClCompile>
192-
<AdditionalIncludeDirectories>$(SolutionDir)\packages\rapidjson.v110.1.1.0\build\native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
189+
<AdditionalIncludeDirectories>$(SolutionDir)\packages\rapidjson.v110.1.1.0\build\native\include\;..\..\..\SampleSharedLib\SampleSharedLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
193190
</ClCompile>
194191
<ResourceCompile>
195192
<AdditionalIncludeDirectories>$(SolutionDir)\packages\rapidjson.v110.1.1.0\build\native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -201,7 +198,7 @@
201198
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ole32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
202199
</Link>
203200
<Link>
204-
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ole32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
201+
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ole32.lib;kernel32.lib;user32.lib;..\..\..\SampleSharedLib\x64\Debug\SampleSharedLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
205202
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">ole32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
206203
</Link>
207204
<Link>

Samples/SqueezeNetObjectDetection/Desktop/cpp/SqueezeNetObjectDetectionCPP.vcxproj.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@
33
<ItemGroup>
44
<ClCompile Include="main.cpp" />
55
<ClCompile Include="pch.cpp" />
6-
<ClCompile Include="dllload.cpp" />
7-
<ClCompile Include="Filehelper.cpp" />
86
</ItemGroup>
97
<ItemGroup>
108
<ClInclude Include="pch.h" />
119
<ClInclude Include="..\..\..\..\SharedContent\models\SqueezeNet.h" />
12-
<ClInclude Include="Filehelper.h" />
1310
</ItemGroup>
1411
<ItemGroup>
1512
<None Include="packages.config" />

Samples/SqueezeNetObjectDetection/Desktop/cpp/dllload.cpp

Lines changed: 0 additions & 74 deletions
This file was deleted.

Samples/SqueezeNetObjectDetection/Desktop/cpp/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ using namespace std;
1515

1616
// globals
1717
vector<string> labels;
18-
string labelsFileName("labels.txt");
18+
wstring labelsFileName = L"labels.txt";
1919
LearningModelDeviceKind deviceKind = LearningModelDeviceKind::Default;
2020
string deviceName = "default";
2121
hstring imagePath;
@@ -120,7 +120,7 @@ bool ParseArgs(int argc, char* argv[])
120120
void LoadLabels()
121121
{
122122
// Parse labels from labels file. We know the file's entries are already sorted in order.
123-
std::string labelsFilePath = FileHelper::GetModulePath() + labelsFileName;
123+
std::wstring labelsFilePath = FileHelper::GetModulePath() + labelsFileName;
124124
ifstream labelFile(labelsFilePath, ifstream::in);
125125
if (labelFile.fail())
126126
{

0 commit comments

Comments
 (0)