diff -r 19594673dfe9 CMakeModules/FindGLEW.cmake --- a/CMakeModules/FindGLEW.cmake Sun Sep 27 12:50:55 2015 +0200 +++ b/CMakeModules/FindGLEW.cmake Sun Sep 27 14:28:20 2015 +0200 @@ -5,16 +5,17 @@ IF(WIN32) FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h PATHS ${SOURCE_BASE_DIR}/glew/include) - # for dynamic build, it's glew32.lib and the dll must be copied into hugin's bin folder + # for dynamic build, it's glew32.lib for VC++ (or libglew32.dll.a for MinGW gcc) + # and the dll must be copied into hugin's bin folder IF(${HUGIN_SHARED}) FIND_LIBRARY(GLEW_LIBRARIES - NAMES glew32.lib + NAMES glew32.lib libglew32.dll.a PATHS ${SOURCE_BASE_DIR}/glew/lib ) ELSE(${HUGIN_SHARED}) FIND_LIBRARY(GLEW_LIBRARIES - NAMES glew32s.lib + NAMES glew32s.lib libglew32.a PATHS ${SOURCE_BASE_DIR}/glew/lib ) diff -r 19594673dfe9 CMakeModules/FindTIFF.cmake --- a/CMakeModules/FindTIFF.cmake Sun Sep 27 12:50:55 2015 +0200 +++ b/CMakeModules/FindTIFF.cmake Sun Sep 27 14:28:20 2015 +0200 @@ -35,7 +35,7 @@ # on windows the libtiff library contains a static lib libtiff # and the import library libtiff_i for dynamic build find_library(TIFF_LIBRARIES - NAMES libtiff_i + NAMES libtiff_i libtiff PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/tiff-4.0.4/libtiff ${SOURCE_BASE_DIR}/tiff-4.0.3/libtiff