Synchronize with trunk's revision r57629.

[reactos.git] / dll / 3rdparty / libtiff / CMakeLists.txt

diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt
index fa07046..e2ba360 100644 (file)
--- a/dll/3rdparty/libtiff/CMakeLists.txt
+++ b/dll/3rdparty/libtiff/CMakeLists.txt
@@ -6,10 +6,9 @@ add_definitions(
     -DDLL_EXPORT
     -DUSE_WIN32_FILEIO)
 
-add_definitions(-D_DLL -D__USE_CRTIMP)
-
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib)
 
 add_library(libtiff SHARED
     mkg3states.c
@@ -51,10 +50,12 @@ add_library(libtiff SHARED
     tif_write.c
     tif_zip.c)
 
-set_entrypoint(libtiff 0)
-
-target_link_libraries(libtiff mingw_common zlib)
-
-add_importlibs(libtiff msvcrt getopt user32 kernel32)
+set_module_type(libtiff win32dll)
+target_link_libraries(libtiff zlib getopt)
+add_importlibs(libtiff user32 msvcrt kernel32 ntdll)
+add_dependencies(libtiff psdk)
+add_cd_file(TARGET libtiff DESTINATION reactos/system32 FOR all)
 
-add_dependencies(libtiff psdk buildno_header)
+if(NOT MSVC)
+    allow_warnings(libtiff)
+endif()