Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv32701/src/classes
Modified Files:
Moptions.cpp PathFinder.cpp XFace.cpp
Log Message:
support for cygwin
Index: Moptions.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Moptions.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -b -u -2 -r1.55 -r1.56
--- Moptions.cpp 12 Apr 2003 01:50:43 -0000 1.55
+++ Moptions.cpp 23 Jun 2003 01:23:46 -0000 1.56
@@ -407,5 +407,5 @@
const MOption MP_NEWMAIL_PLAY_SOUND;
const MOption MP_NEWMAIL_SOUND_FILE;
-#ifdef OS_UNIX
+#if defined(OS_UNIX) || defined(__CYGWIN__)
const MOption MP_NEWMAIL_SOUND_PROGRAM;
#endif // OS_UNIX
@@ -803,5 +803,5 @@
DEFINE_OPTION(MP_NEWMAIL_PLAY_SOUND),
DEFINE_OPTION(MP_NEWMAIL_SOUND_FILE),
-#ifdef OS_UNIX
+#if defined(OS_UNIX) || defined(__CYGWIN__)
DEFINE_OPTION(MP_NEWMAIL_SOUND_PROGRAM),
#endif // OS_UNIX
Index: PathFinder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/PathFinder.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -u -2 -r1.17 -r1.18
--- PathFinder.cpp 22 Jan 2002 12:16:51 -0000 1.17
+++ PathFinder.cpp 23 Jun 2003 01:23:46 -0000 1.18
@@ -33,4 +33,8 @@
#include <wx/file.h>
+#if defined(__CYGWIN__)
+#include <io.h> // for int access()
+#endif
+
#if defined(OS_UNIX)
# define ANYFILE "/*"
Index: XFace.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/XFace.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -u -2 -r1.25 -r1.26
--- XFace.cpp 24 Mar 2003 02:57:33 -0000 1.25
+++ XFace.cpp 23 Jun 2003 01:23:46 -0000 1.26
@@ -171,4 +171,5 @@
XFace::GetXFaceImg(const String &filename, bool *hasimg, class wxWindow *parent)
{
+#ifndef __CYGWIN__ // FIXME undefined reference to wxIconManager::LoadImage() when
linking
bool success = false;
wxImage img;
@@ -212,6 +213,8 @@
}
return img;
+#else // CYGWIN
+ return NULL;
+#endif
}
-
/* static */
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
