mach targets added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e49079b2ab
commit
84e7f94cb0
@ -12,9 +12,16 @@
|
|||||||
|
|
||||||
/* use wxWindows' configure */
|
/* use wxWindows' configure */
|
||||||
#ifdef __MWERKS__
|
#ifdef __MWERKS__
|
||||||
#if (__MWERKS__ < 0x0900) || macintosh
|
#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
|
||||||
#define __WXMAC__
|
#define __WXMAC__
|
||||||
#define USE_MAC_MEMMGR
|
#define USE_MAC_MEMMGR
|
||||||
|
#ifdef __MACH__
|
||||||
|
#include <ansi_prefix.mach.h>
|
||||||
|
#include <msl_c_version.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#undef WCHAR_MAX
|
||||||
|
#include <machine/ansi.h>
|
||||||
|
#endif
|
||||||
// automatically includes MacHeaders
|
// automatically includes MacHeaders
|
||||||
#elif (__MWERKS__ >= 0x0900) && __INTEL__
|
#elif (__MWERKS__ >= 0x0900) && __INTEL__
|
||||||
#define __WXMSW__
|
#define __WXMSW__
|
||||||
|
1800
src/jpeg/jpegM8.xml
1800
src/jpeg/jpegM8.xml
File diff suppressed because it is too large
Load Diff
@ -45,7 +45,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
|
|||||||
#define twips2mm 0.0176388888889
|
#define twips2mm 0.0176388888889
|
||||||
#define mm2pt 2.83464566929
|
#define mm2pt 2.83464566929
|
||||||
#define pt2mm 0.352777777778
|
#define pt2mm 0.352777777778
|
||||||
#ifndef __DARWIN__
|
#if !defined( __DARWIN__ ) || defined(__MWERKS__)
|
||||||
const double M_PI = 3.14159265358979 ;
|
const double M_PI = 3.14159265358979 ;
|
||||||
#endif
|
#endif
|
||||||
const double RAD2DEG = 180.0 / M_PI;
|
const double RAD2DEG = 180.0 / M_PI;
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
#include <OpenTransportProviders.h>
|
#include <OpenTransportProviders.h>
|
||||||
#include <OpenTptInternet.h>
|
#include <OpenTptInternet.h>
|
||||||
#endif
|
#endif
|
||||||
#if TARGET_CARBON
|
#if TARGET_CARBON && !defined(OTAssert)
|
||||||
#define OTAssert( str , cond ) /* does not exists in Carbon */
|
#define OTAssert( str , cond ) /* does not exists in Carbon */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -11,8 +11,4 @@
|
|||||||
|
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
|
|
||||||
WXDLLEXPORT int main(int argc, char* argv[])
|
IMPLEMENT_WXWIN_MAIN
|
||||||
{
|
|
||||||
return wxEntry(argc, argv);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@ -761,7 +761,7 @@ wxString wxMacCFStringHolder::AsString()
|
|||||||
#if wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
CFStringGetCharacters( m_cfs , CFRangeMake( 0 , len ) , (UniChar*) buf ) ;
|
CFStringGetCharacters( m_cfs , CFRangeMake( 0 , len ) , (UniChar*) buf ) ;
|
||||||
#else
|
#else
|
||||||
CFStringGetCString( m_cfs , buf , len+1 , s_macDefaultEncodingIsPC ?
|
CFStringGetCString( m_cfs , buf , len+1 , wxApp::s_macDefaultEncodingIsPC ?
|
||||||
kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
|
kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
|
||||||
#endif
|
#endif
|
||||||
buf[len] = 0 ;
|
buf[len] = 0 ;
|
||||||
|
@ -45,7 +45,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
|
|||||||
#define twips2mm 0.0176388888889
|
#define twips2mm 0.0176388888889
|
||||||
#define mm2pt 2.83464566929
|
#define mm2pt 2.83464566929
|
||||||
#define pt2mm 0.352777777778
|
#define pt2mm 0.352777777778
|
||||||
#ifndef __DARWIN__
|
#if !defined( __DARWIN__ ) || defined(__MWERKS__)
|
||||||
const double M_PI = 3.14159265358979 ;
|
const double M_PI = 3.14159265358979 ;
|
||||||
#endif
|
#endif
|
||||||
const double RAD2DEG = 180.0 / M_PI;
|
const double RAD2DEG = 180.0 / M_PI;
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
#include <OpenTransportProviders.h>
|
#include <OpenTransportProviders.h>
|
||||||
#include <OpenTptInternet.h>
|
#include <OpenTptInternet.h>
|
||||||
#endif
|
#endif
|
||||||
#if TARGET_CARBON
|
#if TARGET_CARBON && !defined(OTAssert)
|
||||||
#define OTAssert( str , cond ) /* does not exists in Carbon */
|
#define OTAssert( str , cond ) /* does not exists in Carbon */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -11,8 +11,4 @@
|
|||||||
|
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
|
|
||||||
WXDLLEXPORT int main(int argc, char* argv[])
|
IMPLEMENT_WXWIN_MAIN
|
||||||
{
|
|
||||||
return wxEntry(argc, argv);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@ -761,7 +761,7 @@ wxString wxMacCFStringHolder::AsString()
|
|||||||
#if wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
CFStringGetCharacters( m_cfs , CFRangeMake( 0 , len ) , (UniChar*) buf ) ;
|
CFStringGetCharacters( m_cfs , CFRangeMake( 0 , len ) , (UniChar*) buf ) ;
|
||||||
#else
|
#else
|
||||||
CFStringGetCString( m_cfs , buf , len+1 , s_macDefaultEncodingIsPC ?
|
CFStringGetCString( m_cfs , buf , len+1 , wxApp::s_macDefaultEncodingIsPC ?
|
||||||
kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
|
kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
|
||||||
#endif
|
#endif
|
||||||
buf[len] = 0 ;
|
buf[len] = 0 ;
|
||||||
|
1418
src/png/pngM8.xml
1418
src/png/pngM8.xml
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
|||||||
#ifdef __MWERKS__
|
#if defined(__MWERKS__) && !defined(__MACH__)
|
||||||
typedef long off_t ;
|
typedef long off_t ;
|
||||||
#else
|
#else
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#ifdef __MWERKS__
|
#if defined(__MWERKS__) && !defined(__MACH__)
|
||||||
typedef long off_t ;
|
typedef long off_t ;
|
||||||
#else
|
#else
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@
|
|||||||
* macros that code uses. This lets the same code operate on two different
|
* macros that code uses. This lets the same code operate on two different
|
||||||
* representations for state sets.
|
* representations for state sets.
|
||||||
*/
|
*/
|
||||||
#ifdef __MWERKS__
|
#if defined(__MWERKS__) && !defined(__MACH__)
|
||||||
typedef long off_t ;
|
typedef long off_t ;
|
||||||
#else
|
#else
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#ifdef __MWERKS__
|
#if defined(__MWERKS__) && !defined(__MACH__)
|
||||||
typedef long off_t ;
|
typedef long off_t ;
|
||||||
#else
|
#else
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -41,8 +41,15 @@
|
|||||||
* the file first and TIFFOpen'ing it later.
|
* the file first and TIFFOpen'ing it later.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef __MACH__
|
||||||
|
#include <ansi_prefix.mach.h>
|
||||||
|
#include <msl_c_version.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#undef WCHAR_MAX
|
||||||
|
#include <machine/ansi.h>
|
||||||
|
#endif
|
||||||
#include "tiffiop.h"
|
#include "tiffiop.h"
|
||||||
#include <Errors.h>
|
#include <MacErrors.h>
|
||||||
#include <Files.h>
|
#include <Files.h>
|
||||||
#include <Memory.h>
|
#include <Memory.h>
|
||||||
|
|
||||||
|
1634
src/tiff/tiffM8.xml
1634
src/tiff/tiffM8.xml
File diff suppressed because it is too large
Load Diff
@ -52,9 +52,13 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__MWERKS__) || defined(THINK_C)
|
#if defined(__MWERKS__) || defined(THINK_C)
|
||||||
|
#ifdef __MACH__
|
||||||
|
#include <sys/types.h>
|
||||||
|
#else
|
||||||
#include <unix.h>
|
#include <unix.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
13004
src/wxWindowsM8.xml
13004
src/wxWindowsM8.xml
File diff suppressed because it is too large
Load Diff
1380
src/zlib/zlibM8.xml
1380
src/zlib/zlibM8.xml
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user