author | eilers <eilers> | 2004-07-29 10:52:48 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-07-29 10:52:48 (UTC) |
commit | 9acd0749bf34844ed023e6145b78d7c5958ccaef (patch) (unidiff) | |
tree | 3f439acf58bdce96c39a90ce42eb348853d3e21d /development | |
parent | 9981eb853deaeac6ef5f87b94b60984450cb630a (diff) | |
download | opie-9acd0749bf34844ed023e6145b78d7c5958ccaef.zip opie-9acd0749bf34844ed023e6145b78d7c5958ccaef.tar.gz opie-9acd0749bf34844ed023e6145b78d7c5958ccaef.tar.bz2 |
Minor update. Added config and environment settings to compile on
curren Opie release..
-rw-r--r-- | development/macosx/config_macosx | 59 | ||||
-rw-r--r-- | development/macosx/set_vars.sh | 10 |
2 files changed, 54 insertions, 15 deletions
diff --git a/development/macosx/config_macosx b/development/macosx/config_macosx index 53a1c9b..39bf3fc 100644 --- a/development/macosx/config_macosx +++ b/development/macosx/config_macosx | |||
@@ -10,2 +10,3 @@ CONFIG_TARGET_MACOSX=y | |||
10 | # CONFIG_TARGET_SHARP is not set | 10 | # CONFIG_TARGET_SHARP is not set |
11 | # CONFIG_TARGET_C700 is not set | ||
11 | # CONFIG_TARGET_IPAQ is not set | 12 | # CONFIG_TARGET_IPAQ is not set |
@@ -15,2 +16,4 @@ CONFIG_TARGET_MACOSX=y | |||
15 | # CONFIG_OPTIMIZE is not set | 16 | # CONFIG_OPTIMIZE is not set |
17 | # CONFIG_THREADED is not set | ||
18 | # CONFIG_STATIC is not set | ||
16 | CONFIG_DEBUG=y | 19 | CONFIG_DEBUG=y |
@@ -25,2 +28,3 @@ CONFIG_EXPERIMENTAL=y | |||
25 | # CONFIG_OPIE_NO_OVERRIDE_QT is not set | 28 | # CONFIG_OPIE_NO_OVERRIDE_QT is not set |
29 | # CONFIG_OPIE_NO_ERASERECT_FIX is not set | ||
26 | # CONFIG_OPIE_NO_BUILTIN_SHUTDOWN is not set | 30 | # CONFIG_OPIE_NO_BUILTIN_SHUTDOWN is not set |
@@ -29,6 +33,19 @@ CONFIG_OPIE_SOUND_FRAGMENT_SHIFT="16" | |||
29 | # CONFIG_USE_REALTIME_AUDIO_THREAD is not set | 33 | # CONFIG_USE_REALTIME_AUDIO_THREAD is not set |
30 | # CONFIG_OPIE_HIGH_RES_SMALL_PHY is not set | 34 | CONFIG_USE_FILE_NOTIFICATION=y |
31 | # CONFIG_OPIE_NEW_ALLOC is not set | 35 | # CONFIG_OPIE_NEW_ALLOC is not set |
36 | # CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE is not set | ||
32 | # CONFIG_OPIE_NO_SOUND_PCM_READ_BITS is not set | 37 | # CONFIG_OPIE_NO_SOUND_PCM_READ_BITS is not set |
33 | CONFIG_OPIE_WE_VERSION="15" | 38 | |
39 | # | ||
40 | # Dependencies | ||
41 | # | ||
42 | # CONFIG_LIBETPAN_DEP is not set | ||
43 | # CONFIG_LIBPCAP_DEP is not set | ||
44 | CONFIG_LIBSQLITE_DEP=y | ||
45 | CONFIG_LIBSQLITE_LIB_DIR="/usr/local/lib" | ||
46 | CONFIG_LIBSQLITE_INC_DIR="" | ||
47 | # CONFIG_LIBXINE_DEP is not set | ||
48 | # CONFIG_LIBIPK_DEP is not set | ||
49 | # CONFIG_LIBSDL_DEP is not set | ||
50 | # CONFIG_LIBSWORD_DEP is not set | ||
34 | 51 | ||
@@ -46,3 +63,6 @@ CONFIG_LIBOPIE2CORE=y | |||
46 | CONFIG_LIBOPIE2DB=y | 63 | CONFIG_LIBOPIE2DB=y |
47 | # CONFIG_LIBOPIE2NET is not set | 64 | |
65 | # | ||
66 | # libopie2net needs a libqpe and libopie2core | ||
67 | # | ||
48 | CONFIG_LIBOPIE2PIM=y | 68 | CONFIG_LIBOPIE2PIM=y |
@@ -51,2 +71,3 @@ CONFIG_LIBOPIE2UI=y | |||
51 | # CONFIG_LIBOPIE2MM is not set | 71 | # CONFIG_LIBOPIE2MM is not set |
72 | # CONFIG_LIBOPIE2SECURITY is not set | ||
52 | 73 | ||
@@ -60,2 +81,3 @@ CONFIG_LIBOPIE2UI=y | |||
60 | CONFIG_LIBQTAUX=y | 81 | CONFIG_LIBQTAUX=y |
82 | CONFIG_LIBQRSYNC=y | ||
61 | # CONFIG_OPIE-LOGIN is not set | 83 | # CONFIG_OPIE-LOGIN is not set |
@@ -63,5 +85,2 @@ CONFIG_LIBQTAUX=y | |||
63 | CONFIG_QUICKLAUNCHER=y | 85 | CONFIG_QUICKLAUNCHER=y |
64 | CONFIG_LAUNCHER=y | ||
65 | CONFIG_PRELOAD=y | ||
66 | CONFIG_LAUNCHER_CORE=y | ||
67 | # CONFIG_SYMLINKER is not set | 86 | # CONFIG_SYMLINKER is not set |
@@ -75,2 +94,3 @@ CONFIG_LAUNCHER_CORE=y | |||
75 | # | 94 | # |
95 | CONFIG_ABOUTAPPLET=y | ||
76 | CONFIG_BATTERYAPPLET=y | 96 | CONFIG_BATTERYAPPLET=y |
@@ -82,3 +102,2 @@ CONFIG_HOMEAPPLET=y | |||
82 | # CONFIG_LOGOUTAPPLET is not set | 102 | # CONFIG_LOGOUTAPPLET is not set |
83 | # CONFIG_OBEXAPPLET is not set | ||
84 | # CONFIG_OBEX is not set | 103 | # CONFIG_OBEX is not set |
@@ -119,3 +138,3 @@ CONFIG_OXYGEN=y | |||
119 | CONFIG_TABLEVIEWER=y | 138 | CONFIG_TABLEVIEWER=y |
120 | # CONFIG_LIBKATE is not set | 139 | # CONFIG_TINYKATE is not set |
121 | # CONFIG_ZSAFE is not set | 140 | # CONFIG_ZSAFE is not set |
@@ -133,3 +152,10 @@ CONFIG_TABLEVIEWER=y | |||
133 | # CONFIG_FTPLIB is not set | 152 | # CONFIG_FTPLIB is not set |
134 | # CONFIG_LIBMAILWRAPPER is not set | 153 | |
154 | # | ||
155 | # opie-mail3 needs a libqpe, libopie2core, libopie2pim and the libmailwrapper | ||
156 | # | ||
157 | |||
158 | # | ||
159 | # mailapplet needs a libqpe, libopie2core and the libmailwrapper | ||
160 | # | ||
135 | # CONFIG_OPIEIRC is not set | 161 | # CONFIG_OPIEIRC is not set |
@@ -160,3 +186,2 @@ CONFIG_TABLEVIEWER=y | |||
160 | # CONFIG_SFCAVE is not set | 186 | # CONFIG_SFCAVE is not set |
161 | # CONFIG_SFCAVE-SDL is not set | ||
162 | # CONFIG_SNAKE is not set | 187 | # CONFIG_SNAKE is not set |
@@ -174,3 +199,2 @@ CONFIG_DRAWPAD=y | |||
174 | # CONFIG_CAMERA is not set | 199 | # CONFIG_CAMERA is not set |
175 | # CONFIG_OPIEPLAYER2 is not set | ||
176 | # CONFIG_OPIEREC is not set | 200 | # CONFIG_OPIEREC is not set |
@@ -211,3 +235,3 @@ CONFIG_TODO=y | |||
211 | # | 235 | # |
212 | # Today Plugins | 236 | # Today Plugins --- |
213 | # | 237 | # |
@@ -231,3 +255,2 @@ CONFIG_LAUNCHER-SETTINGS=y | |||
231 | # CONFIG_LIGHT-AND-POWER is not set | 255 | # CONFIG_LIGHT-AND-POWER is not set |
232 | CONFIG_SECURITY=y | ||
233 | CONFIG_APPEARANCE2=y | 256 | CONFIG_APPEARANCE2=y |
@@ -239,2 +262,3 @@ CONFIG_LANGUAGE=y | |||
239 | # CONFIG_NETSYSTEMTIME is not set | 262 | # CONFIG_NETSYSTEMTIME is not set |
263 | # CONFIG_INTERFACES is not set | ||
240 | # CONFIG_SOUND is not set | 264 | # CONFIG_SOUND is not set |
@@ -250,2 +274,6 @@ CONFIG_TABMANAGER=y | |||
250 | # | 274 | # |
275 | # Decorations --- | ||
276 | # | ||
277 | |||
278 | # | ||
251 | # Decorations | 279 | # Decorations |
@@ -257,2 +285,6 @@ CONFIG_DECO_POLISHED=y | |||
257 | # | 285 | # |
286 | # Styles --- | ||
287 | # | ||
288 | |||
289 | # | ||
258 | # Styles | 290 | # Styles |
@@ -273,2 +305,3 @@ CONFIG_EUROCONV=y | |||
273 | CONFIG_OPIE-SH=y | 305 | CONFIG_OPIE-SH=y |
306 | CONFIG_PIMCONVERTER=y | ||
274 | # CONFIG_REMOTE is not set | 307 | # CONFIG_REMOTE is not set |
diff --git a/development/macosx/set_vars.sh b/development/macosx/set_vars.sh index 2138d63..9693820 100644 --- a/development/macosx/set_vars.sh +++ b/development/macosx/set_vars.sh | |||
@@ -4,3 +4,5 @@ unset LD_PREBIND_ALLOW_OVERLAP | |||
4 | unset LD_SEG_ADDR_TABLE | 4 | unset LD_SEG_ADDR_TABLE |
5 | 5 | unset QMAKESPEC | |
6 | # Needed to activate Prebinding capababilites (since 10.2 and newer) | ||
7 | MACOSX_DEPLOYMENT_TARGET=10.2 | ||
6 | #Set Vars for QT 2.3.2 | 8 | #Set Vars for QT 2.3.2 |
@@ -20,2 +22,6 @@ DYLD_LIBRARY_PATH="$OPIEDIR/lib":$DYLD_LIBRARY_PATH | |||
20 | 22 | ||
23 | #Set special compiler | ||
24 | # PATH=$OPIEDIR/../tools/bin:$PATH | ||
25 | # DYLD_LIBRARY_PATH=$OPIEDIR/../tools/bin:$DYLD_LIBRARY_PATH | ||
26 | |||
21 | #Show special environment | 27 | #Show special environment |
@@ -24,3 +30,3 @@ PS1='\u:(QT):\w\$ ' | |||
24 | 30 | ||
25 | export QTDIR QPEDIR OPIEDIR PATH DYLD_LIBRARY_PATH PS1 | 31 | export QTDIR QPEDIR OPIEDIR PATH DYLD_LIBRARY_PATH PS1 MACOSX_DEPLAYMENT_TARGET |
26 | 32 | ||