summaryrefslogtreecommitdiff
path: root/libopie2
authorzecke <zecke>2005-09-27 21:04:59 (UTC)
committer zecke <zecke>2005-09-27 21:04:59 (UTC)
commit061e4461d8916dfaa20d80a998341a222da9aa64 (patch) (side-by-side diff)
tree5ac9af92bdf97c16fc7dd5797d434d82276e0fb3 /libopie2
parent04166623e424201b134fd090869b316fa7935ed0 (diff)
downloadopie-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
Diffstat (limited to 'libopie2') (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiecore/opiecore.pro3
1 files changed, 2 insertions, 1 deletions
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
@@ -31,13 +31,14 @@ SOURCES = oapplication.cpp \
osmartpointer.cpp \
ostorageinfo.cpp \
xmltree.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 )
} else {
message( "disabling linux-only subsystems for MAC build" )
}
include( device/device.pro )