Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes needed for compilation with Project Builder

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2002-02-24 17:58:30 +00:00
parent f809133f9e
commit 67087ab455
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/defs.h
View File

@@ -140,6 +140,9 @@
#if (__MWERKS__ >= 0x1000) && __option(bool) #if (__MWERKS__ >= 0x1000) && __option(bool)
#define HAVE_BOOL #define HAVE_BOOL
#endif #endif
#elif defined(__APPLE__) && defined(__APPLE_CC__)
// Apple bundled gcc supports bool
#define HAVE_BOOL
#elif defined(__VISUALC__) && (__VISUALC__ == 1020) #elif defined(__VISUALC__) && (__VISUALC__ == 1020)
// in VC++ 4.2 the bool keyword is reserved (hence can't be typedefed) // in VC++ 4.2 the bool keyword is reserved (hence can't be typedefed)
// but not implemented, so we must #define it // but not implemented, so we must #define it

23
include/wx/platform.h
View File

@@ -146,14 +146,31 @@
defined(THINK_C) || \ defined(THINK_C) || \
(defined(__MWERKS__) && !defined(__INTEL__)) (defined(__MWERKS__) && !defined(__INTEL__))
/* MacOS */ /* MacOS */
#elif defined(__WXMAC__) && defined(__DARWIN__) #elif defined(__WXMAC__) && defined(__APPLE__)
/* Mac OS X */ /* Mac OS X */
#define __UNIX_LIKE__ #define __UNIX_LIKE__
/*
These defines are needed when compiling using Project Builder
with a non generated setup0.h
*/
#ifndef __UNIX__
#define __UNIX__ 1
#endif
#ifndef __BSD__
#define __BSD__ 1
#endif
#ifndef __DARWIN__
#define __DARWIN__ 1
#endif
#ifndef __POWERPC__
#define __POWERPC__ 1
#endif
/* /*
Some code has been added to workaround defects(?) in the Some code has been added to workaround defects(?) in the
bundled gcc compiler. These corrections are identified by: bundled gcc compiler. These corrections are identified by
__DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif) __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
*/ */
#elif defined(__OS2__) #elif defined(__OS2__)
#if defined(__IBMCPP__) #if defined(__IBMCPP__)