| author | eilers <eilers> | 2004-07-29 10:50:29 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2004-07-29 10:50:29 (UTC) |
| commit | 9981eb853deaeac6ef5f87b94b60984450cb630a (patch) (side-by-side diff) | |
| tree | 8888c220156b831a70d88ff6b64d8f76386ef9d1 | |
| parent | 08d7594f45f24112f76192ddbcd8ed3f0a651186 (diff) | |
| download | opie-9981eb853deaeac6ef5f87b94b60984450cb630a.zip opie-9981eb853deaeac6ef5f87b94b60984450cb630a.tar.gz opie-9981eb853deaeac6ef5f87b94b60984450cb630a.tar.bz2 | |
Reimplement fix to compile and work on MacOS-X.
| -rw-r--r-- | qmake/include/qglobal.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/qmake/include/qglobal.h b/qmake/include/qglobal.h index b7e919d..ce209fe 100644 --- a/qmake/include/qglobal.h +++ b/qmake/include/qglobal.h @@ -118,96 +118,104 @@ # define Q_OS_FREEBSD # define Q_OS_BSD4 #elif defined(__NetBSD__) # define Q_OS_NETBSD # define Q_OS_BSD4 #elif defined(__OpenBSD__) # define Q_OS_OPENBSD # define Q_OS_BSD4 #elif defined(__bsdi__) # define Q_OS_BSDI # define Q_OS_BSD4 #elif defined(__sgi) # define Q_OS_IRIX #elif defined(__osf__) # define Q_OS_OSF #elif defined(_AIX) # define Q_OS_AIX #elif defined(__Lynx__) # define Q_OS_LYNX #elif defined(__GNU_HURD__) # define Q_OS_HURD #elif defined(__DGUX__) # define Q_OS_DGUX #elif defined(__QNXNTO__) # define Q_OS_QNX6 #elif defined(__QNX__) # define Q_OS_QNX #elif defined(_SEQUENT_) # define Q_OS_DYNIX #elif defined(_SCO_DS) /* SCO OpenServer 5 + GCC */ # define Q_OS_SCO #elif defined(__USLC__) /* all SCO platforms + UDK or OUDK */ # define Q_OS_UNIXWARE # define Q_OS_UNIXWARE7 #elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */ # define Q_OS_UNIXWARE # define Q_OS_UNIXWARE7 #elif defined(__MAKEDEPEND__) #else # error "Qt has not been ported to this OS - talk to qt-bugs@trolltech.com" #endif #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) # define Q_OS_WIN #endif #if defined(Q_OS_MAC9) || defined(Q_OS_MACX) # define Q_OS_MAC +/* We have to prevent qmake to generate makefiles or projectfiles for the Apple build system. + * This would work if we would use QT3. But we compile with QT2 which don't use qmake and does nothing + * about the MAC platform !! (se) + */ +#warning "evil hack here !! (se)" +#define Q_OS_LINUX +#undef Q_OS_MACX +#undef Q_OS_MAC #endif #if defined(Q_OS_MAC9) || defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN) # undef Q_OS_UNIX #elif !defined(Q_OS_UNIX) # define Q_OS_UNIX #endif /* The compiler, must be one of: (Q_CC_x) SYM - Symantec C++ for both PC and Macintosh MPW - MPW C++ MWERKS - Metrowerks CodeWarrior MSVC - Microsoft Visual C/C++, Intel C++ for Windows BOR - Borland/Turbo C++ WAT - Watcom C++ GNU - GNU C++ COMEAU - Comeau C++ EDG - Edison Design Group C++ OC - CenterLine C++ SUN - Sun WorkShop, Forte Developer, or Sun ONE Studio C++ MIPS - MIPSpro C++ DEC - DEC C++ HP - HPUX C++ HPACC - HPUX ANSI C++ USLC - SCO OUDK, UDK, and UnixWare 2.X C++ CDS - Reliant C++ KAI - KAI C++ INTEL - Intel C++ for Linux, Intel C++ for Windows HIGHC - MetaWare High C/C++ PGI - Portland Group C++ GHS - Green Hills Optimizing C++ Compilers Should be sorted most to least authoritative. */ /* Symantec C++ is now Digital Mars */ #if defined(__DMC__) || defined(__SC__) # define Q_CC_SYM /* "explicit" semantics implemented in 8.1e but keyword recognized since 7.5 */ # if defined(__SC__) && __SC__ < 0x750 # define Q_NO_EXPLICIT_KEYWORD # endif # define Q_NO_USING_KEYWORD # if !defined(_CPPUNWIND) # define Q_NO_EXCEPTIONS |