From: <ave...@us...> - 2007-12-05 17:24:47
|
Revision: 4868 http://gemrb.svn.sourceforge.net/gemrb/?rev=4868&view=rev Author: avenger_teambg Date: 2007-12-05 09:24:44 -0800 (Wed, 05 Dec 2007) Log Message: ----------- mingw32 compatibility (disable WIN32 when detecting it) Modified Paths: -------------- gemrb/trunk/gemrb/includes/win32def.h Modified: gemrb/trunk/gemrb/includes/win32def.h =================================================================== --- gemrb/trunk/gemrb/includes/win32def.h 2007-12-05 17:22:56 UTC (rev 4867) +++ gemrb/trunk/gemrb/includes/win32def.h 2007-12-05 17:24:44 UTC (rev 4868) @@ -29,6 +29,11 @@ #ifndef WIN32DEF_H #define WIN32DEF_H +//mingw should compile more like unix +#ifdef __MINGW32 +#undef WIN32 +#endif + #ifdef WIN32 #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -44,11 +49,7 @@ #define ADV_TEXT #include <conio.h> -#ifndef INTERFACE #define textcolor(i) SetConsoleTextAttribute(hConsole, i) -#else -#define textcolor(i) SetConsoleTextAttribute(hConsole, i) -#endif #define printf cprintf #else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2007-12-06 19:27:35
|
Revision: 4869 http://gemrb.svn.sourceforge.net/gemrb/?rev=4869&view=rev Author: avenger_teambg Date: 2007-12-06 11:27:31 -0800 (Thu, 06 Dec 2007) Log Message: ----------- another go for mingw compatibility Modified Paths: -------------- gemrb/trunk/gemrb/includes/win32def.h Modified: gemrb/trunk/gemrb/includes/win32def.h =================================================================== --- gemrb/trunk/gemrb/includes/win32def.h 2007-12-05 17:24:44 UTC (rev 4868) +++ gemrb/trunk/gemrb/includes/win32def.h 2007-12-06 19:27:31 UTC (rev 4869) @@ -29,11 +29,6 @@ #ifndef WIN32DEF_H #define WIN32DEF_H -//mingw should compile more like unix -#ifdef __MINGW32 -#undef WIN32 -#endif - #ifdef WIN32 #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -50,9 +45,14 @@ #define ADV_TEXT #include <conio.h> #define textcolor(i) SetConsoleTextAttribute(hConsole, i) -#define printf cprintf +#ifndef __MINGW32 +#define printf cprintf //broken in mingw !! #else +#define HAVE_SNPRINTF +#endif + +#else #include <config.h> #include <stdio.h> #include <stdlib.h> @@ -91,7 +91,7 @@ abort(); \ } #else -#define MYASSERT(f) +#define MYASSERT(f) #endif #ifdef ADV_TEXT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-01-28 17:01:30
|
Revision: 5018 http://gemrb.svn.sourceforge.net/gemrb/?rev=5018&view=rev Author: avenger_teambg Date: 2008-01-28 09:01:31 -0800 (Mon, 28 Jan 2008) Log Message: ----------- mingw symbol fixed (patch #1844457 by Zefklop) Modified Paths: -------------- gemrb/trunk/gemrb/includes/win32def.h Modified: gemrb/trunk/gemrb/includes/win32def.h =================================================================== --- gemrb/trunk/gemrb/includes/win32def.h 2008-01-28 16:32:34 UTC (rev 5017) +++ gemrb/trunk/gemrb/includes/win32def.h 2008-01-28 17:01:31 UTC (rev 5018) @@ -46,7 +46,7 @@ #include <conio.h> #define textcolor(i) SetConsoleTextAttribute(hConsole, i) -#ifndef __MINGW32 +#ifndef __MINGW32__ #define printf cprintf //broken in mingw !! #else #define HAVE_SNPRINTF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |