2 files changed, 33 insertions, 22 deletions

diff --git a/development/macosx/README_MACOSX b/development/macosx/README_MACOSX
index 25de8d6..34360c5 100644
--- a/development/macosx/README_MACOSX
+++ b/development/macosx/README_MACOSX
@@ -82,5 +82,5 @@ Now create a link for the uic of qt-2.3.2 into the bin-directory of qt/e 2.3.7 !
 Otherwise OPIE will fail to compile !
 
-Compile OPIE:
+Compile OPIE (Please don't forget to read the following "Known Bugs" section!):
 Set your environment
 (You may use the script "set_vars.sh" to set your variables successfully !
@@ -114,8 +114,8 @@ which adds them for everything.. Yes, also for libqpe etc..
 Therefore this project will not compile out of the box. You have to compile in a two-pass way:
 
-Pass 1: Find the line "LIBS += -lopiedb2 -lqpe" in the file include.pro and comment out it (put a "#" 
-        in front of it)
+Pass 1: Find the line "LIBS += -lopiedb2 -lqpe" or "LIBS += -lqpe" and the line "LIBS += -lopiecore2" in the file include.pro 
+        and comment them out (put a "#" in front of them)
         Do a "make -k" to compile what is already compileable (some will not compile)
-Pass 2: Remove the comment from Pass1 and do a "make". The rest should compile now successfully.
+Pass 2: Remove the comments from Pass1 and do a "make". The rest should compile successfully.
 
 
diff --git a/development/macosx/config_macosx b/development/macosx/config_macosx
index 39bf3fc..dd94328 100644
--- a/development/macosx/config_macosx
+++ b/development/macosx/config_macosx
@@ -10,4 +10,5 @@ CONFIG_TARGET_MACOSX=y
 # CONFIG_TARGET_SHARP is not set
 # CONFIG_TARGET_C700 is not set
+# CONFIG_TARGET_OE is not set
 # CONFIG_TARGET_IPAQ is not set
 # CONFIG_TARGET_RAMSES is not set
@@ -22,4 +23,5 @@ CONFIG_QUICKLAUNCH_PATH="/Users/stefan/Developer/opie/bin/quicklauncher"
 CONFIG_SPECFILE="qws/macx-generic-g++"
 CONFIG_EXPERIMENTAL=y
+# CONFIG_USE_CCACHE is not set
 
 #
@@ -35,4 +37,5 @@ CONFIG_USE_FILE_NOTIFICATION=y
 # CONFIG_OPIE_NEW_ALLOC is not set
 # CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE is not set
+# CONFIG_LIBQPE_WITHROHFEEDBACK is not set
 # CONFIG_OPIE_NO_SOUND_PCM_READ_BITS is not set
 
@@ -55,5 +58,4 @@ CONFIG_LIBSQLITE_INC_DIR=""
 CONFIG_LIBQPE=y
 # CONFIG_X11 is not set
-CONFIG_LIBOPIE=y
 
 #
@@ -64,8 +66,8 @@ CONFIG_LIBOPIE2DB=y
 
 #
-# libopie2net needs a libqpe and libopie2core
+# libopie2net needs a libqpe, libopie2core and libpcap dependency
 #
 CONFIG_LIBOPIE2PIM=y
-CONFIG_SQL_PIM_BACKEND=y
+# CONFIG_SQL_PIM_BACKEND is not set
 CONFIG_LIBOPIE2UI=y
 # CONFIG_LIBOPIE2MM is not set
@@ -101,5 +103,4 @@ CONFIG_HOMEAPPLET=y
 # CONFIG_IRDAAPPLET is not set
 # CONFIG_LOGOUTAPPLET is not set
-# CONFIG_OBEX is not set
 # CONFIG_RESTARTAPPLET is not set
 # CONFIG_ROTATEAPPLET is not set
@@ -109,4 +110,6 @@ CONFIG_HOMEAPPLET=y
 # CONFIG_VOLUMEAPPLET is not set
 # CONFIG_VTAPPLET is not set
+# CONFIG_AUTOROTATEAPPLET is not set
+# CONFIG_BRIGHTNESSAPPLET is not set
 # CONFIG_MEMORYAPPLET is not set
 
@@ -115,4 +118,6 @@ CONFIG_HOMEAPPLET=y
 #
 CONFIG_NOTESAPPLET=y
+# CONFIG_PYQUICKLAUNCH is not set
+# CONFIG_ZKBAPPLET is not set
 
 #
@@ -131,9 +136,12 @@ CONFIG_CONFEDIT=y
 # CONFIG_BARTENDER is not set
 # CONFIG_OPIE-CONSOLE is not set
+
+#
+# gutenbrowser needs a libqpe, ftplib, libopie2core and libopie2ui
+#
 # CONFIG_OPIE-READER is not set
 CONFIG_OPIE-SHEET=y
 CONFIG_OPIE-WRITE=y
 CONFIG_OXYGEN=y
-# CONFIG_QASHMONEY is not set
 CONFIG_TABLEVIEWER=y
 # CONFIG_TINYKATE is not set
@@ -143,11 +151,6 @@ CONFIG_TABLEVIEWER=y
 # Communications and Networking
 #
-# CONFIG_GSMTOOL is not set
 # CONFIG_KEYPEBBLE is not set
 # CONFIG_MOBILEMSG is not set
-
-#
-# Net
-#
 # CONFIG_FTPLIB is not set
 
@@ -161,6 +164,4 @@ CONFIG_TABLEVIEWER=y
 # CONFIG_OPIEIRC is not set
 # CONFIG_OPIE-RDESKTOP is not set
-# CONFIG_OPIETOOTH is not set
-# CONFIG_UBROWSER is not set
 
 #
@@ -190,4 +191,6 @@ CONFIG_TABLEVIEWER=y
 # CONFIG_TICTAC is not set
 # CONFIG_WORDGAME is not set
+# CONFIG_ZLINES is not set
+# CONFIG_ZSAME is not set
 
 #
@@ -198,5 +201,10 @@ CONFIG_DRAWPAD=y
 # CONFIG_OPIEPLAYER is not set
 # CONFIG_CAMERA is not set
+
+#
+# opieplayer2 requires libopie2core, libopie2ui and libxine
+#
 # CONFIG_OPIEREC is not set
+# CONFIG_POWERCHORD is not set
 # CONFIG_SHOWIMG is not set
 # CONFIG_TONLEITER is not set
@@ -226,7 +234,7 @@ CONFIG_UNIKEYBOARD=y
 # Pim
 #
+# CONFIG_OBEX is not set
 CONFIG_ADDRESSBOOK=y
 CONFIG_DATEBOOK=y
-CONFIG_DATEBOOK2=y
 CONFIG_OSEARCH=y
 CONFIG_TODAY=y
@@ -262,4 +270,5 @@ CONFIG_LANGUAGE=y
 # CONFIG_NETSYSTEMTIME is not set
 # CONFIG_INTERFACES is not set
+# CONFIG_NS2CORE is not set
 # CONFIG_SOUND is not set
 # CONFIG_SSHKEYS is not set
@@ -294,5 +303,7 @@ CONFIG_FRESH=y
 CONFIG_LIQUID=y
 CONFIG_METAL=y
+# CONFIG_PHASE is not set
 CONFIG_THEME=y
+# CONFIG_WEBSTYLE is not set
 
 #
@@ -304,5 +315,9 @@ CONFIG_EUROCONV=y
 # CONFIG_FORMATTER is not set
 CONFIG_OPIE-SH=y
-CONFIG_PIMCONVERTER=y
+
+#
+# The pim converter needs libqpe, libopie2core, libopie2pim, libopie2db and SQL Backend for libopie2pim
+#
+# CONFIG_PYQUICKLAUNCHER is not set
 # CONFIG_REMOTE is not set
 
@@ -324,8 +339,4 @@ CONFIG_PIMCONVERTER=y
 # Unsupported / Unmaintained
 #
-# CONFIG_FILEBROWSER is not set
-# CONFIG_MAILIT is not set
-# CONFIG_OIPKG is not set
-# CONFIG_QPDF is not set
 
 #