author | zecke <zecke> | 2005-09-27 21:04:59 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-09-27 21:04:59 (UTC) |
commit | 061e4461d8916dfaa20d80a998341a222da9aa64 (patch) (unidiff) | |
tree | 5ac9af92bdf97c16fc7dd5797d434d82276e0fb3 /library/qpeapplication.cpp | |
parent | 04166623e424201b134fd090869b316fa7935ed0 (diff) | |
download | opie-061e4461d8916dfaa20d80a998341a222da9aa64.zip opie-061e4461d8916dfaa20d80a998341a222da9aa64.tar.gz opie-061e4461d8916dfaa20d80a998341a222da9aa64.tar.bz2 |
Mac OS X compile fixes:
-disable the "fuege alle libs auf verdacht hinzu" hack and hope we will
identify the root cause.
-do not redefine cxa_... on Mac. At least the the Apple Linker is not happy
with having that symbol defined twice.
-well DYLD_BOOL could not be casted to bool. changing it to bool works
-opiecore.pro use the same test as in include.pro to see if we build on linux
-rw-r--r-- | library/qpeapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 19e99f2..dcc1001 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -2202,17 +2202,17 @@ void QPEApplication::hideOrQuit() | |||
2202 | e << d->appName; | 2202 | e << d->appName; |
2203 | d->qpe_main_widget->hide(); | 2203 | d->qpe_main_widget->hide(); |
2204 | } | 2204 | } |
2205 | #endif | 2205 | #endif |
2206 | else | 2206 | else |
2207 | quit(); | 2207 | quit(); |
2208 | } | 2208 | } |
2209 | 2209 | ||
2210 | #if (__GNUC__ > 2 ) | 2210 | #if (__GNUC__ > 2 ) && !defined(_OS_MACX_) |
2211 | extern "C" void __cxa_pure_virtual(); | 2211 | extern "C" void __cxa_pure_virtual(); |
2212 | 2212 | ||
2213 | void __cxa_pure_virtual() | 2213 | void __cxa_pure_virtual() |
2214 | { | 2214 | { |
2215 | fprintf( stderr, "Pure virtual called\n"); | 2215 | fprintf( stderr, "Pure virtual called\n"); |
2216 | abort(); | 2216 | abort(); |
2217 | 2217 | ||
2218 | } | 2218 | } |