diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 721e0ca2a5..ac0a13ff8f 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -240,14 +240,11 @@ endif (APPLE) if (WIN32) target_link_libraries( ${TARGET_NAME} - - # something is wrong with the find faceshift cmake, so it's not finding the windows lib, hard coding it for now - #${FACESHIFT_LIBRARIES} - ${CMAKE_CURRENT_SOURCE_DIR}/external/faceshift/lib/WIN32/faceshift.lib + ${OPENCV_LIBRARIES} + ${FACESHIFT_LIBRARIES} # this was from the first verion of the attempt to port to windows, it may or may not be correct, temporarily disabled #${CMAKE_CURRENT_SOURCE_DIR}/external/glut/Release/glew32.lib - ${GLUT_ROOT_PATH}/lib/freeglut.lib # note: the pthreads stuff was in the /external/glut before, that's not right, I moved it to it's own location diff --git a/interface/external/OpenCV/lib/Win32/opencv_calib3d.lib b/interface/external/OpenCV/lib/Win32/opencv_calib3d.lib new file mode 100644 index 0000000000..537453e225 Binary files /dev/null and b/interface/external/OpenCV/lib/Win32/opencv_calib3d.lib differ diff --git a/interface/external/OpenCV/lib/Win32/opencv_contrib.lib b/interface/external/OpenCV/lib/Win32/opencv_contrib.lib new file mode 100644 index 0000000000..c60c0e3447 Binary files /dev/null and b/interface/external/OpenCV/lib/Win32/opencv_contrib.lib differ diff --git a/interface/external/OpenCV/lib/Win32/opencv_core.lib b/interface/external/OpenCV/lib/Win32/opencv_core.lib new file mode 100644 index 0000000000..053214b25a Binary files /dev/null and b/interface/external/OpenCV/lib/Win32/opencv_core.lib differ diff --git a/interface/external/OpenCV/lib/Win32/opencv_features2d.lib b/interface/external/OpenCV/lib/Win32/opencv_features2d.lib new file mode 100644 index 0000000000..150f0b7861 Binary files /dev/null and b/interface/external/OpenCV/lib/Win32/opencv_features2d.lib differ diff --git a/interface/external/OpenCV/lib/Win32/opencv_flann.lib b/interface/external/OpenCV/lib/Win32/opencv_flann.lib new file mode 100644 index 0000000000..7fba2916d8 Binary files /dev/null and b/interface/external/OpenCV/lib/Win32/opencv_flann.lib differ diff --git a/interface/external/OpenCV/lib/Win32/opencv_gpu.lib b/interface/external/OpenCV/lib/Win32/opencv_gpu.lib new file mode 100644 index 0000000000..90889df3f4 Binary files /dev/null and b/interface/external/OpenCV/lib/Win32/opencv_gpu.lib differ diff --git a/interface/external/OpenCV/lib/Win32/opencv_haartraining_engine.lib b/interface/external/OpenCV/lib/Win32/opencv_haartraining_engine.lib new file mode 100644 index 0000000000..d5827c35c4 Binary files /dev/null and b/interface/external/OpenCV/lib/Win32/opencv_haartraining_engine.lib differ diff --git a/interface/external/OpenCV/lib/Win32/opencv_highgui.lib b/interface/external/OpenCV/lib/Win32/opencv_highgui.lib new file mode 100644 index 0000000000..598862950a Binary files /dev/null and b/interface/external/OpenCV/lib/Win32/opencv_highgui.lib differ diff --git a/interface/external/OpenCV/lib/Win32/opencv_imgproc.lib b/interface/external/OpenCV/lib/Win32/opencv_imgproc.lib new file mode 100644 index 0000000000..20827d02f3 Binary files /dev/null and b/interface/external/OpenCV/lib/Win32/opencv_imgproc.lib differ diff --git a/interface/external/OpenCV/lib/Win32/opencv_legacy.lib b/interface/external/OpenCV/lib/Win32/opencv_legacy.lib new file mode 100644 index 0000000000..50359b1e8d Binary files /dev/null and b/interface/external/OpenCV/lib/Win32/opencv_legacy.lib differ