| 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 /include.pro | |
| 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 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include.pro b/include.pro index f32786a..dd388f2 100644 --- a/include.pro +++ b/include.pro @@ -111,15 +111,15 @@ contains( CONFTEST, y ){ # Manual including indirect referenced libraries which are not loaded # by the mac-linker automatically # IF YOU COMPILE FOR THE FIRST TIME, COMMENT OUT ONE OF THE FOLLOWING # (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 } else { QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib |