From 4a42031c0dba948c02f923444bf37b794d4ccf4e Mon Sep 17 00:00:00 2001
From: Tino Hager <tino.hager@nager.at>
Date: Sun, 24 Jun 2018 18:28:12 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/AlexeyAB/darknet
---
build/darknet/yolo_cpp_dll.vcxproj | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/build/darknet/yolo_cpp_dll.vcxproj b/build/darknet/yolo_cpp_dll.vcxproj
index b68c5b4..4361f18 100644
--- a/build/darknet/yolo_cpp_dll.vcxproj
+++ b/build/darknet/yolo_cpp_dll.vcxproj
@@ -133,7 +133,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
- <AdditionalIncludeDirectories>..\..\3rdparty\include;%(AdditionalIncludeDirectories);$(CudaToolkitIncludeDir);$(cudnn)\include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>C:\opencv_3.0\opencv\build\include;..\..\3rdparty\include;%(AdditionalIncludeDirectories);$(CudaToolkitIncludeDir);$(cudnn)\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CUDNN;GPU;YOLODLL_EXPORTS;_TIMESPEC_DEFINED;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CLanguageStandard>c11</CLanguageStandard>
<CppLanguageStandard>c++1y</CppLanguageStandard>
@@ -147,7 +147,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalLibraryDirectories>$(CUDA_PATH)lib\$(PlatformName);$(cudnn)\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>C:\opencv_3.0\opencv\build\x64\vc14\lib;$(CUDA_PATH)lib\$(PlatformName);$(cudnn)\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>..\..\3rdparty\lib\x64\pthreadVC2.lib;cublas.lib;curand.lib;cudart.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetName)$(TargetExt)</OutputFile>
</Link>
@@ -229,10 +229,12 @@
<ClCompile Include="..\..\src\swag.c" />
<ClCompile Include="..\..\src\tag.c" />
<ClCompile Include="..\..\src\tree.c" />
+ <ClCompile Include="..\..\src\upsample_layer.c" />
<ClCompile Include="..\..\src\utils.c" />
<ClCompile Include="..\..\src\voxel.c" />
<ClCompile Include="..\..\src\writing.c" />
<ClCompile Include="..\..\src\yolo.c" />
+ <ClCompile Include="..\..\src\yolo_layer.c" />
<ClCompile Include="..\..\src\yolo_v2_class.cpp" />
<ClCompile Include="..\..\src\yolo_v2_class.hpp" />
</ItemGroup>
@@ -283,7 +285,9 @@
<ClInclude Include="..\..\src\stb_image_write.h" />
<ClInclude Include="..\..\src\tree.h" />
<ClInclude Include="..\..\src\unistd.h" />
+ <ClInclude Include="..\..\src\upsample_layer.h" />
<ClInclude Include="..\..\src\utils.h" />
+ <ClInclude Include="..\..\src\yolo_layer.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
--
Gitblit v1.10.0