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 /libopie2/opiecore | |
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-- | libopie2/opiecore/opiecore.pro | 3 |
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 | |||
@@ -13,47 +13,48 @@ HEADERS = oapplication.h \ | |||
13 | oprocctrl.h \ | 13 | oprocctrl.h \ |
14 | oresource.h \ | 14 | oresource.h \ |
15 | osharedpointer.h \ | 15 | osharedpointer.h \ |
16 | osmartpointer.h \ | 16 | osmartpointer.h \ |
17 | ostorageinfo.h \ | 17 | ostorageinfo.h \ |
18 | xmltree.h | 18 | xmltree.h |
19 | 19 | ||
20 | SOURCES = oapplication.cpp \ | 20 | SOURCES = oapplication.cpp \ |
21 | oconfig.cpp \ | 21 | oconfig.cpp \ |
22 | odebug.cpp \ | 22 | odebug.cpp \ |
23 | oglobal.cpp \ | 23 | oglobal.cpp \ |
24 | oglobalsettings.cpp \ | 24 | oglobalsettings.cpp \ |
25 | okeyconfigmanager.cpp \ | 25 | okeyconfigmanager.cpp \ |
26 | okeyfilter.cpp \ | 26 | okeyfilter.cpp \ |
27 | opluginloader.cpp \ | 27 | opluginloader.cpp \ |
28 | oprocess.cpp \ | 28 | oprocess.cpp \ |
29 | oprocctrl.cpp \ | 29 | oprocctrl.cpp \ |
30 | oresource.cpp \ | 30 | oresource.cpp \ |
31 | osmartpointer.cpp \ | 31 | osmartpointer.cpp \ |
32 | ostorageinfo.cpp \ | 32 | ostorageinfo.cpp \ |
33 | xmltree.cpp | 33 | xmltree.cpp |
34 | 34 | ||
35 | 35 | ||
36 | # Disable Linux-only subsystems for MAC build | 36 | # Disable Linux-only subsystems for MAC build |
37 | !contains( CONFIG_TARGET_MACOSX, y ) { | 37 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
38 | !contains( CONFTEST, y ) { | ||
38 | include ( linux/linux.pro ) | 39 | include ( linux/linux.pro ) |
39 | } else { | 40 | } else { |
40 | message( "disabling linux-only subsystems for MAC build" ) | 41 | message( "disabling linux-only subsystems for MAC build" ) |
41 | } | 42 | } |
42 | 43 | ||
43 | include( device/device.pro ) | 44 | include( device/device.pro ) |
44 | 45 | ||
45 | INTERFACES = | 46 | INTERFACES = |
46 | TARGET = opiecore2 | 47 | TARGET = opiecore2 |
47 | VERSION = 1.9.4 | 48 | VERSION = 1.9.4 |
48 | INCLUDEPATH += $(OPIEDIR)/include | 49 | INCLUDEPATH += $(OPIEDIR)/include |
49 | DEPENDPATH += $(OPIEDIR)/include | 50 | DEPENDPATH += $(OPIEDIR)/include |
50 | 51 | ||
51 | !contains( platform, x11 ) { | 52 | !contains( platform, x11 ) { |
52 | LIBS = -lqpe | 53 | LIBS = -lqpe |
53 | include( $(OPIEDIR)/include.pro ) | 54 | include( $(OPIEDIR)/include.pro ) |
54 | } | 55 | } |
55 | 56 | ||
56 | contains( platform, x11 ) { | 57 | contains( platform, x11 ) { |
57 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 58 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
58 | } | 59 | } |
59 | 60 | ||