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 | |||
@@ -8,11 +8,14 @@ | |||
8 | # CONFIG_TARGET_X86 is not set | 8 | # CONFIG_TARGET_X86 is not set |
9 | CONFIG_TARGET_MACOSX=y | 9 | 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 |
12 | # CONFIG_TARGET_RAMSES is not set | 13 | # CONFIG_TARGET_RAMSES is not set |
13 | # CONFIG_TARGET_SIMPAD is not set | 14 | # CONFIG_TARGET_SIMPAD is not set |
14 | # CONFIG_TARGET_YOPY is not set | 15 | # CONFIG_TARGET_YOPY is not set |
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 |
17 | CONFIG_QUICK_LAUNCH=y | 20 | CONFIG_QUICK_LAUNCH=y |
18 | CONFIG_QUICKLAUNCH_PATH="/Users/stefan/Developer/opie/bin/quicklauncher" | 21 | CONFIG_QUICKLAUNCH_PATH="/Users/stefan/Developer/opie/bin/quicklauncher" |
@@ -23,14 +26,28 @@ CONFIG_EXPERIMENTAL=y | |||
23 | # Configuration | 26 | # Configuration |
24 | # | 27 | # |
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 |
27 | # CONFIG_OPIE_NO_BUILTIN_CALIBRATE is not set | 31 | # CONFIG_OPIE_NO_BUILTIN_CALIBRATE is not set |
28 | CONFIG_OPIE_SOUND_FRAGMENT_SHIFT="16" | 32 | 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 | ||
35 | # | 52 | # |
36 | # Base | 53 | # Base |
@@ -44,11 +61,15 @@ CONFIG_LIBOPIE=y | |||
44 | # | 61 | # |
45 | CONFIG_LIBOPIE2CORE=y | 62 | 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 |
49 | CONFIG_SQL_PIM_BACKEND=y | 69 | CONFIG_SQL_PIM_BACKEND=y |
50 | CONFIG_LIBOPIE2UI=y | 70 | CONFIG_LIBOPIE2UI=y |
51 | # CONFIG_LIBOPIE2MM is not set | 71 | # CONFIG_LIBOPIE2MM is not set |
72 | # CONFIG_LIBOPIE2SECURITY is not set | ||
52 | 73 | ||
53 | # | 74 | # |
54 | # the examples need a libqpe, libopie2core, libopie2db, libopie2net, libopie2pim, libopie2ui and libopie2mm | 75 | # the examples need a libqpe, libopie2core, libopie2db, libopie2net, libopie2pim, libopie2ui and libopie2mm |
@@ -58,12 +79,10 @@ CONFIG_LIBOPIE2UI=y | |||
58 | # | 79 | # |
59 | # | 80 | # |
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 |
62 | # CONFIG_OPIEALARM is not set | 84 | # CONFIG_OPIEALARM is not set |
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 |
68 | 87 | ||
69 | # | 88 | # |
@@ -73,6 +92,7 @@ CONFIG_LAUNCHER_CORE=y | |||
73 | # | 92 | # |
74 | # Applets | 93 | # Applets |
75 | # | 94 | # |
95 | CONFIG_ABOUTAPPLET=y | ||
76 | CONFIG_BATTERYAPPLET=y | 96 | CONFIG_BATTERYAPPLET=y |
77 | # CONFIG_CARDMON is not set | 97 | # CONFIG_CARDMON is not set |
78 | CONFIG_CLIPBOARDAPPLET=y | 98 | CONFIG_CLIPBOARDAPPLET=y |
@@ -80,7 +100,6 @@ CONFIG_CLOCKAPPLET=y | |||
80 | CONFIG_HOMEAPPLET=y | 100 | CONFIG_HOMEAPPLET=y |
81 | # CONFIG_IRDAAPPLET is not set | 101 | # CONFIG_IRDAAPPLET is not set |
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 |
85 | # CONFIG_RESTARTAPPLET is not set | 104 | # CONFIG_RESTARTAPPLET is not set |
86 | # CONFIG_ROTATEAPPLET is not set | 105 | # CONFIG_ROTATEAPPLET is not set |
@@ -117,7 +136,7 @@ CONFIG_OPIE-WRITE=y | |||
117 | CONFIG_OXYGEN=y | 136 | CONFIG_OXYGEN=y |
118 | # CONFIG_QASHMONEY is not set | 137 | # CONFIG_QASHMONEY is not set |
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 |
122 | 141 | ||
123 | # | 142 | # |
@@ -131,7 +150,14 @@ CONFIG_TABLEVIEWER=y | |||
131 | # Net | 150 | # Net |
132 | # | 151 | # |
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 |
136 | # CONFIG_OPIE-RDESKTOP is not set | 162 | # CONFIG_OPIE-RDESKTOP is not set |
137 | # CONFIG_OPIETOOTH is not set | 163 | # CONFIG_OPIETOOTH is not set |
@@ -158,7 +184,6 @@ CONFIG_TABLEVIEWER=y | |||
158 | # CONFIG_PARASHOOT is not set | 184 | # CONFIG_PARASHOOT is not set |
159 | # CONFIG_QASTEROIDS is not set | 185 | # CONFIG_QASTEROIDS is not set |
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 |
163 | # CONFIG_SOLITAIRE is not set | 188 | # CONFIG_SOLITAIRE is not set |
164 | # CONFIG_TETRIX is not set | 189 | # CONFIG_TETRIX is not set |
@@ -172,7 +197,6 @@ CONFIG_TABLEVIEWER=y | |||
172 | CONFIG_DRAWPAD=y | 197 | CONFIG_DRAWPAD=y |
173 | # CONFIG_OPIEPLAYER is not set | 198 | # CONFIG_OPIEPLAYER is not set |
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 |
177 | # CONFIG_SHOWIMG is not set | 201 | # CONFIG_SHOWIMG is not set |
178 | # CONFIG_TONLEITER is not set | 202 | # CONFIG_TONLEITER is not set |
@@ -209,7 +233,7 @@ CONFIG_TODAY=y | |||
209 | CONFIG_TODO=y | 233 | CONFIG_TODO=y |
210 | 234 | ||
211 | # | 235 | # |
212 | # Today Plugins | 236 | # Today Plugins --- |
213 | # | 237 | # |
214 | # CONFIG_TODAY_FORTUNE is not set | 238 | # CONFIG_TODAY_FORTUNE is not set |
215 | # CONFIG_TODAY_STOCKTICKER is not set | 239 | # CONFIG_TODAY_STOCKTICKER is not set |
@@ -229,7 +253,6 @@ CONFIG_BUTTON-SETTINGS=y | |||
229 | CONFIG_CITYTIME=y | 253 | CONFIG_CITYTIME=y |
230 | CONFIG_LAUNCHER-SETTINGS=y | 254 | 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 |
234 | # CONFIG_AQPKG is not set | 257 | # CONFIG_AQPKG is not set |
235 | CONFIG_BACKUP=y | 258 | CONFIG_BACKUP=y |
@@ -237,6 +260,7 @@ CONFIG_DOCTAB=y | |||
237 | CONFIG_LANGUAGE=y | 260 | CONFIG_LANGUAGE=y |
238 | # CONFIG_MEDIUMMOUNT is not set | 261 | # CONFIG_MEDIUMMOUNT is not set |
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 |
241 | # CONFIG_SSHKEYS is not set | 265 | # CONFIG_SSHKEYS is not set |
242 | CONFIG_SYSINFO=y | 266 | CONFIG_SYSINFO=y |
@@ -248,6 +272,10 @@ CONFIG_TABMANAGER=y | |||
248 | # | 272 | # |
249 | 273 | ||
250 | # | 274 | # |
275 | # Decorations --- | ||
276 | # | ||
277 | |||
278 | # | ||
251 | # Decorations | 279 | # Decorations |
252 | # | 280 | # |
253 | CONFIG_DECO_FLAT=y | 281 | CONFIG_DECO_FLAT=y |
@@ -255,6 +283,10 @@ CONFIG_DECO_LIQUID=y | |||
255 | CONFIG_DECO_POLISHED=y | 283 | CONFIG_DECO_POLISHED=y |
256 | 284 | ||
257 | # | 285 | # |
286 | # Styles --- | ||
287 | # | ||
288 | |||
289 | # | ||
258 | # Styles | 290 | # Styles |
259 | # | 291 | # |
260 | CONFIG_FLAT=y | 292 | CONFIG_FLAT=y |
@@ -271,6 +303,7 @@ CONFIG_CLOCK=y | |||
271 | CONFIG_EUROCONV=y | 303 | CONFIG_EUROCONV=y |
272 | # CONFIG_FORMATTER is not set | 304 | # CONFIG_FORMATTER is not set |
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 |
275 | 308 | ||
276 | # | 309 | # |
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 | |||
@@ -2,7 +2,9 @@ | |||
2 | unset LD_PREBIND | 2 | unset LD_PREBIND |
3 | unset LD_PREBIND_ALLOW_OVERLAP | 3 | 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 |
7 | THISDIR=`pwd` | 9 | THISDIR=`pwd` |
8 | QTDIR=$THISDIR/qt-2.3.2 | 10 | QTDIR=$THISDIR/qt-2.3.2 |
@@ -18,11 +20,15 @@ DYLD_LIBRARY_PATH="$QTDIR/lib":$DYLD_LIBRARY_PATH | |||
18 | OPIEDIR=$THISDIR/opie | 20 | OPIEDIR=$THISDIR/opie |
19 | DYLD_LIBRARY_PATH="$OPIEDIR/lib":$DYLD_LIBRARY_PATH | 21 | 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 |
22 | 28 | ||
23 | PS1='\u:(QT):\w\$ ' | 29 | 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 | ||
27 | # Now start virtual framebuffer device.. | 33 | # Now start virtual framebuffer device.. |
28 | qvfb -depth 16 & \ No newline at end of file | 34 | qvfb -depth 16 & \ No newline at end of file |