Author: rharabien Date: Thu Apr 21 15:05:05 2011 New Revision: 51413
URL: http://svn.reactos.org/svn/reactos?rev=51413&view=rev Log: [CMAKE] Add libtiff to build Fixes gdiplus:image winetest regression in cmake branch
Modified: branches/cmake-bringup/dll/3rdparty/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt
Modified: branches/cmake-bringup/dll/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/CMake... ============================================================================== --- branches/cmake-bringup/dll/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/CMakeLists.txt [iso-8859-1] Thu Apr 21 15:05:05 2011 @@ -4,7 +4,7 @@ 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)
Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/mingw... ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Thu Apr 21 15:05:05 2011 @@ -58,8 +58,8 @@ 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 @@ 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)