-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 | |||
@@ -103,31 +103,31 @@ QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease mess | |||
103 | 103 | ||
104 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | 104 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
105 | contains( CONFTEST, y ){ | 105 | contains( CONFTEST, y ){ |
106 | QMAKE_LFLAGS += -Wl | 106 | QMAKE_LFLAGS += -Wl |
107 | LIBS -= -ldl | 107 | LIBS -= -ldl |
108 | LIBS -= -lcrypt | 108 | LIBS -= -lcrypt |
109 | LIBS -= -lm | 109 | LIBS -= -lm |
110 | 110 | ||
111 | # Manual including indirect referenced libraries which are not loaded | 111 | # Manual including indirect referenced libraries which are not loaded |
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 | } |
123 | else { | 123 | else { |
124 | 124 | ||
125 | QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib | 125 | QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib |
126 | # I am not sure whether it is a good idea to change the way plugins is build | 126 | # I am not sure whether it is a good idea to change the way plugins is build |
127 | # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X | 127 | # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X |
128 | CONFIG -= plugin | 128 | CONFIG -= plugin |
129 | } | 129 | } |
130 | LIBS += -L$(OPIEDIR)/lib | 130 | LIBS += -L$(OPIEDIR)/lib |
131 | 131 | ||
132 | MOC_DIR=.moc/$(PLATFORM) | 132 | MOC_DIR=.moc/$(PLATFORM) |
133 | OBJECTS_DIR=.obj/$(PLATFORM) | 133 | OBJECTS_DIR=.obj/$(PLATFORM) |