From: Peter Kümmel <syntheticpp@gmx.net>
Date: Mon, 18 Sep 2006 20:38:39 +0000 (+0000)
Subject: CMakeLists: - no need for dirent on mingw
X-Git-Tag: 1.6.10~12543
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f3d2fa581aa8213f2ae7a99d4d766d6f650144b6;p=features.git

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 1a74987fea..3ad0a52c3b 100644
--- 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 f9ed7a5bbd..c051d9e3ff 100755
--- 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