CMakeLists: - no need for dirent on mingw

            - disable dll message
minwin.h:  remove mingw warning

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15053 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/Win32/aspell/CMakeLists.txt b/development/Win32/aspell/CMakeLists.txt
index 1a74987feab833e3f6e0dfdd1fcff529b418b81a..3ad0a52c3b45bb7fc529bf3175bf0be0c82fca8f 100644 (file)
--- a/development/Win32/aspell/CMakeLists.txt
+++ b/development/Win32/aspell/CMakeLists.txt
@@ -11,9 +11,9 @@ if(${LINK} MATCHES "shared" OR ASPELL_LINK)
        set(ASPELL_SHARED_LIB 1)
        set(ASPELL_LINK SHARED CACHE TYPE STRING)
 else(${LINK} MATCHES "shared" OR ASPELL_LINK)
-       MESSAGE(STATUS)
-       MESSAGE(STATUS "Use -DLINK=shared to build the libraries as shared")
-       MESSAGE(STATUS)
+       #MESSAGE(STATUS)
+       #MESSAGE(STATUS "Use -DLINK=shared to build the libraries as shared")
+       #MESSAGE(STATUS)
        set(ASPELL_LINK STATIC)
 endif(${LINK} MATCHES "shared" OR ASPELL_LINK)
 
@@ -100,8 +100,10 @@ if(NOT CVS_HEAD)
          ../lib/filter-c.cpp
          ../lib/document_checker-c.cpp
          # msvc win32 support
-         ../win32/dirent.c
        )
+       if(MSVC)
+               set(libaspell_sources ${libaspell_sources} ../win32/dirent.c)
+       endif(MSVC)
 else(NOT CVS_HEAD)
        set(libaspell_sources ${libaspell_sources}
          ../common/convert_filter.cpp

diff --git a/development/Win32/aspell/minwin.h b/development/Win32/aspell/minwin.h
index f9ed7a5bbd863b60ae11466f5cdbb23aca59b8e2..c051d9e3ffdf95d4b746c7f3757d58291487370e 100755 (executable)
--- a/development/Win32/aspell/minwin.h
+++ b/development/Win32/aspell/minwin.h
@@ -28,7 +28,9 @@
 #define NOMB              
 #define NOMEMMGR          
 #define NOMETAFILE        
+#ifndef NOMINMAX
 #define NOMINMAX          
+#endif
 #define NOMSG             
 #define NOOPENFILE        
 #define NOSCROLL