From a592f55df661046bf26f9143aac905783cc7a8bd Mon Sep 17 00:00:00 2001
From: lltcggie <lltcggie@gmail.com>
Date: Sat, 26 Dec 2015 21:21:41 +0900
Subject: [PATCH] =?UTF-8?q?OpenCV=E3=81=A7dll=E3=81=AE=E6=96=B9=E3=82=92?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/waifu2x.cpp                          | 32 +++++++++------------
 waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj |  4 +--
 waifu2x-caffe/waifu2x-caffe.vcxproj         |  4 +--
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/common/waifu2x.cpp b/common/waifu2x.cpp
index 0177497..641e322 100644
--- a/common/waifu2x.cpp
+++ b/common/waifu2x.cpp
@@ -57,18 +57,16 @@
 #pragma comment(lib, "cublas.lib")
 #pragma comment(lib, "cudnn.lib")
 
-#pragma comment(lib, "opencv_calib3d" CV_VERSION_STR CV_EXT_STR)
 #pragma comment(lib, "opencv_core" CV_VERSION_STR CV_EXT_STR)
-#pragma comment(lib, "opencv_highgui" CV_VERSION_STR CV_EXT_STR)
 #pragma comment(lib, "opencv_imgcodecs" CV_VERSION_STR CV_EXT_STR)
 #pragma comment(lib, "opencv_imgproc" CV_VERSION_STR CV_EXT_STR)
-#pragma comment(lib, "IlmImf" CV_EXT_STR)
-#pragma comment(lib, "libjasper" CV_EXT_STR)
-#pragma comment(lib, "libjpeg" CV_EXT_STR)
-#pragma comment(lib, "libpng" CV_EXT_STR)
-#pragma comment(lib, "libtiff" CV_EXT_STR)
-#pragma comment(lib, "libwebp" CV_EXT_STR)
-#pragma comment(lib, "ippicvmt.lib")
+//#pragma comment(lib, "IlmImf" CV_EXT_STR)
+//#pragma comment(lib, "libjasper" CV_EXT_STR)
+//#pragma comment(lib, "libjpeg" CV_EXT_STR)
+//#pragma comment(lib, "libpng" CV_EXT_STR)
+//#pragma comment(lib, "libtiff" CV_EXT_STR)
+//#pragma comment(lib, "libwebp" CV_EXT_STR)
+//#pragma comment(lib, "ippicvmt.lib")
 
 #pragma comment(lib, "libboost_iostreams-vc120-mt-gd-1_59.lib")
 #else
@@ -89,18 +87,16 @@
 #pragma comment(lib, "cublas.lib")
 #pragma comment(lib, "cudnn.lib")
 
-#pragma comment(lib, "opencv_calib3d" CV_VERSION_STR CV_EXT_STR)
 #pragma comment(lib, "opencv_core" CV_VERSION_STR CV_EXT_STR)
-#pragma comment(lib, "opencv_highgui" CV_VERSION_STR CV_EXT_STR)
 #pragma comment(lib, "opencv_imgcodecs" CV_VERSION_STR CV_EXT_STR)
 #pragma comment(lib, "opencv_imgproc" CV_VERSION_STR CV_EXT_STR)
-#pragma comment(lib, "IlmImf" CV_EXT_STR)
-#pragma comment(lib, "libjasper" CV_EXT_STR)
-#pragma comment(lib, "libjpeg" CV_EXT_STR)
-#pragma comment(lib, "libpng" CV_EXT_STR)
-#pragma comment(lib, "libtiff" CV_EXT_STR)
-#pragma comment(lib, "libwebp" CV_EXT_STR)
-#pragma comment(lib, "ippicvmt.lib")
+//#pragma comment(lib, "IlmImf" CV_EXT_STR)
+//#pragma comment(lib, "libjasper" CV_EXT_STR)
+//#pragma comment(lib, "libjpeg" CV_EXT_STR)
+//#pragma comment(lib, "libpng" CV_EXT_STR)
+//#pragma comment(lib, "libtiff" CV_EXT_STR)
+//#pragma comment(lib, "libwebp" CV_EXT_STR)
+//#pragma comment(lib, "ippicvmt.lib")
 
 #pragma comment(lib, "libboost_iostreams-vc120-mt-1_59.lib")
 #endif
diff --git a/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj b/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj
index 822a0f0..e5a617f 100644
--- a/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj
+++ b/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj
@@ -42,14 +42,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv301\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv301\build\x64\vc12\staticlib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv301\build\x64\vc12\lib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)bin</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv301\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv301\build\x64\vc12\staticlib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv301\build\x64\vc12\lib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)bin</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
diff --git a/waifu2x-caffe/waifu2x-caffe.vcxproj b/waifu2x-caffe/waifu2x-caffe.vcxproj
index 4752846..d965492 100644
--- a/waifu2x-caffe/waifu2x-caffe.vcxproj
+++ b/waifu2x-caffe/waifu2x-caffe.vcxproj
@@ -42,14 +42,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv301\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv301\build\x64\vc12\staticlib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv301\build\x64\vc12\lib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)bin</OutDir>
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv301\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv301\build\x64\vc12\staticlib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv301\build\x64\vc12\lib;D:\program\boost_1_59_0\stage\x64\lib;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)bin</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">