From 061e4461d8916dfaa20d80a998341a222da9aa64 Mon Sep 17 00:00:00 2001 From: zecke Date: Tue, 27 Sep 2005 21:04:59 +0000 Subject: 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 --- (limited to 'libopie2') 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 @@ -34,7 +34,8 @@ 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 ) } else { message( "disabling linux-only subsystems for MAC build" ) -- cgit v0.9.0.2