| author | zecke <zecke> | 2005-09-27 21:04:59 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2005-09-27 21:04:59 (UTC) |
| commit | 061e4461d8916dfaa20d80a998341a222da9aa64 (patch) (side-by-side diff) | |
| tree | 5ac9af92bdf97c16fc7dd5797d434d82276e0fb3 | |
| 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-- | include.pro | 14 | ||||
| -rw-r--r-- | libopie2/opiecore/opiecore.pro | 3 | ||||
| -rw-r--r-- | library/qlibrary_unix.cpp | 2 | ||||
| -rw-r--r-- | library/qpeapplication.cpp | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/include.pro b/include.pro index f32786a..dd388f2 100644 --- a/include.pro +++ b/include.pro @@ -114,9 +114,9 @@ contains( CONFTEST, y ){ # (regarding whether you activate SQL) and the last one (-lopiecore2) - CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) - contains( CONFTEST, y ){ - LIBS += -lopiedb2 -lqpe - } else { - LIBS += -lqpe - } - LIBS += -lopiecore2 + #CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) + #contains( CONFTEST, y ){ + # LIBS += -lopiedb2 -lqpe + #} else { + # LIBS += -lqpe + #} + #LIBS += -lopiecore2 } diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro index cbb7e04..3406b8f 100644 --- a/libopie2/opiecore/opiecore.pro +++ b/libopie2/opiecore/opiecore.pro @@ -36,3 +36,4 @@ SOURCES = oapplication.cpp \ # Disable Linux-only subsystems for MAC build -!contains( CONFIG_TARGET_MACOSX, y ) { +CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) +!contains( CONFTEST, y ) { include ( linux/linux.pro ) diff --git a/library/qlibrary_unix.cpp b/library/qlibrary_unix.cpp index 2181153..fee73c2 100644 --- a/library/qlibrary_unix.cpp +++ b/library/qlibrary_unix.cpp @@ -155,3 +155,3 @@ bool QLibraryPrivate::freeLibrary() NSObjectFileImage img = desc->img; - DYLD_BOOL success = NSUnLinkModule(mod, NSUNLINKMODULE_OPTION_NONE); + bool success = NSUnLinkModule(mod, NSUNLINKMODULE_OPTION_NONE); if ( success ) { diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 19e99f2..dcc1001 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -2209,3 +2209,3 @@ void QPEApplication::hideOrQuit() -#if (__GNUC__ > 2 ) +#if (__GNUC__ > 2 ) && !defined(_OS_MACX_) extern "C" void __cxa_pure_virtual(); |