Switching to lcms2 + correction of a bug about the libtiff build that wasn't handling compression features + correction of a bug in the build process of Windows 64bit version.

Now all Windows users have to update Cmake to 2.8.4 at least.
This commit is contained in:
Hombre
2011-03-31 00:45:47 +02:00
parent 3a59803e2b
commit d94212e5a4
13 changed files with 35 additions and 44 deletions

View File

@@ -32,8 +32,8 @@ set (BASESOURCEFILES
popupcommon.cc popupbutton.cc popuptogglebutton.cc)
if (WIN32)
set (EXTRA_SRC windirmonitor.cc myicon.o)
set (EXTRA_LIB_RTGUI winmm)
set (EXTRA_SRC windirmonitor.cc myicon.rc)
set (EXTRA_LIB_RTGUI winmm)
include_directories ( ../rtengine ${CMAKE_CURRENT_BINARY_DIR} . ../rtexif ${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS}
${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ${GIOMM_INCLUDE_DIRS})
link_directories (. ../rtexif ${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS}