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 @@ true 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) - 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) + 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) $(SolutionDir)bin $(ProjectName)d false 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) - 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) + 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) $(SolutionDir)bin 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 @@ true 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) - 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) + 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) $(SolutionDir)bin $(ProjectName)d false 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) - 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) + 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) $(SolutionDir)bin