summaryrefslogtreecommitdiff
path: root/include.pro
authorzecke <zecke>2005-09-27 21:04:59 (UTC)
committer zecke <zecke>2005-09-27 21:04:59 (UTC)
commit061e4461d8916dfaa20d80a998341a222da9aa64 (patch) (unidiff)
tree5ac9af92bdf97c16fc7dd5797d434d82276e0fb3 /include.pro
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 'include.pro') (more/less context) (ignore whitespace changes)
-rw-r--r--include.pro14
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
@@ -112,13 +112,13 @@ contains( CONFTEST, y ){
112 # by the mac-linker automatically 112 # by the mac-linker automatically
113 # IF YOU COMPILE FOR THE FIRST TIME, COMMENT OUT ONE OF THE FOLLOWING 113 # IF YOU COMPILE FOR THE FIRST TIME, COMMENT OUT ONE OF THE FOLLOWING
114 # (regarding whether you activate SQL) and the last one (-lopiecore2) 114 # (regarding whether you activate SQL) and the last one (-lopiecore2)
115 CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) 115 #CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
116 contains( CONFTEST, y ){ 116 #contains( CONFTEST, y ){
117 LIBS += -lopiedb2 -lqpe 117 # LIBS += -lopiedb2 -lqpe
118 } else { 118 #} else {
119 LIBS += -lqpe 119 # LIBS += -lqpe
120 } 120 #}
121 LIBS += -lopiecore2 121 #LIBS += -lopiecore2
122} 122}
123else { 123else {
124 124