[CMAKE]

Add libtiff to build
Fixes gdiplus:image winetest regression in cmake branch

svn path=/branches/cmake-bringup/; revision=51413

diff --git a/dll/3rdparty/CMakeLists.txt b/dll/3rdparty/CMakeLists.txt
index 1a2babf..bf60656 100644 (file)
--- a/dll/3rdparty/CMakeLists.txt
+++ b/dll/3rdparty/CMakeLists.txt
@@ -4,7 +4,7 @@ add_subdirectory(dxtn)
 endif()
 add_subdirectory(libjpeg)
 add_subdirectory(libpng)
-#add_subdirectory(libtiff)#FIXME : unresolved symbol _pei386_runtime_relocator
+add_subdirectory(libtiff)
 add_subdirectory(libxslt)
 if(NOT MSVC)
 add_subdirectory(mesa32)

diff --git a/lib/3rdparty/mingw/CMakeLists.txt b/lib/3rdparty/mingw/CMakeLists.txt
index 0fc238d..cbbca9c 100644 (file)
--- a/lib/3rdparty/mingw/CMakeLists.txt
+++ b/lib/3rdparty/mingw/CMakeLists.txt
@@ -58,8 +58,8 @@ add_library(mingw_wmain crt0_w.c crtexe.c dllargv.c)
 set_property(TARGET mingw_wmain PROPERTY COMPILE_DEFINITIONS WPRFLAG UNICODE _UNICODE)
 add_dependencies(mingw_wmain psdk)
 
-add_definitions(-DCRTDLL -D_WINDOWS_)
 add_library(mingw_dllmain crtdll.c dllargv.c)
+set_property(TARGET mingw_dllmain PROPERTY COMPILE_DEFINITIONS CRTDLL _WINDOWS_)
 add_dependencies(mingw_dllmain psdk)
 
 if(NOT MSVC)
@@ -74,5 +74,5 @@ if(NOT MSVC)
 endif()
 
 add_library(getopt getopt.c)
-set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL1 __USE_CRTIMP)
+set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP)
 add_dependencies(getopt psdk)