Index: proxy/dummies.c
===================================================================
--- proxy/dummies.c	(revision 52)
+++ proxy/dummies.c	(working copy)
@@ -5,7 +5,7 @@
 
 struct wps_state wps_state;
 struct gui_wps gui_wps[NB_SCREENS];
-static struct wps_data wps_datas[NB_SCREENS];
+struct wps_data wps_datas[NB_SCREENS];
 struct cuesheet *curr_cue;
 struct cuesheet *temp_cue;
 struct system_status global_status;
Index: proxy/api.c
===================================================================
--- proxy/api.c	(revision 52)
+++ proxy/api.c	(working copy)
@@ -11,6 +11,7 @@
 #include "dummies.h"
 #include "scroll_engine.h"
 #include "wpsstate.h"
+#include <string.h>
 
 struct proxy_api *xapi;
 
Index: proxy/proxy.c
===================================================================
--- proxy/proxy.c	(revision 52)
+++ proxy/proxy.c	(working copy)
@@ -6,7 +6,8 @@
 #include "proxy.h"
 #include "checkwps.h"
 #include "api.h"
-
+#include <string.h>
+
 struct screen screens[NB_SCREENS];
 struct wps_data wpsdata;
 struct gui_wps gwps;
Index: proxy/Makefile
===================================================================
--- proxy/Makefile	(revision 52)
+++ proxy/Makefile	(working copy)
@@ -8,7 +8,15 @@
 #
 ROOT=../../..
 
-CC = mingw32-gcc.exe
+ifeq ($(findstring MINGW,$(shell uname)),MINGW)
+OS = w32
+CC = mingw32-gcc
+endif
+ifeq ($(findstring Linux,$(shell uname)),Linux)
+OS = linux
+CC = gcc
+endif
+
 COPY = cp
 
 COMMON= \
@@ -47,7 +55,7 @@
         -I $(ROOT)/apps \
 		-I .
 
-CFLAGS = -g -D__PCTOOL__ -D__QDEBUG__ -DQT_READBMP -DDEBUG -DROCKBOX_DIR_LEN=1 -DWPS_DIR=\".\" -DBUTTON_REMOTE
+CFLAGS = -g -D__PCTOOL__ -D__QDEBUG__ -DQT_READBMP -DDEBUG -DROCKBOX_DIR_LEN=1 -DBUTTON_REMOTE
 
 all: proxy.c  $(COMMON)
 	@echo CC [IRIVER_H10_5GB]
@@ -55,11 +63,18 @@
 debug: proxy.c  $(COMMON)
 	@echo CC [IRIVER_H10_5GB]
 	@$(CC) $(INCLUDE) $(CFLAGS) -DIRIVER_H10_5GB -DTARGET_MODEL=\"h10_5gb\" $(COMMON)  proxy.c -o bin/debug/proxy.exe
-shared:proxy.c  $(COMMON)
+shared: shared-$(OS)
+
+shared-w32:proxy.c  $(COMMON)
 	@echo CC [IRIVER_H10_5GB]
 	@$(CC) $(INCLUDE) $(CFLAGS) -DIRIVER_H10_5GB -DTARGET_MODEL=\"h10_5gb\" -DBUILD_DLL $(COMMON)  -shared proxy.c -o bin/debug/proxy.dll
 	@$(COPY) bin/debug/proxy.dll ../gui/bin/proxy.dll
 
+shared-linux: proxy.c $(COMMON)
+	@echo CC [IRIVER_H10_5GB]
+	@$(CC) $(INCLUDE) $(CFLAGS) -DIRIVER_H10_5GB -DTARGET_MODEL=\"h10_5gb\" $(COMMON)  proxy.c  -fPIC -o proxy.o -Wl,"-soname libproxy.so.1,-olibproxy.so.1"
+	@$(COPY) libproxy.so.1 ../gui/bin/libproxy.so.1
+
 checkwps.$(MODEL): proxy.c  $(COMMON)
 	@echo CC [$(TARGET)]
 	@$(CC) $(INCLUDE) $(CFLAGS) -D$(TARGET) $(COMMON) -shared proxy.c -o checkwps.$(MODEL).exe
Index: gui/gui.pro
===================================================================
--- gui/gui.pro	(revision 52)
+++ gui/gui.pro	(working copy)
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET =
 DEPENDPATH += . build src ui
-INCLUDEPATH += . src/qpropertyeditor ../proxy
+INCLUDEPATH += . src/QPropertyEditor ../proxy
 DESTDIR = bin
 OBJECTS_DIR = build
 MOC_DIR = build
@@ -23,6 +23,9 @@
  src/sliderimpl.cpp \
  src/qmp3state.cpp \
  src/qwpsstate.cpp
+
+ LIBS += -Lbin -lproxy
+
 CONFIG(debug, debug|release) {
  LIBS +=  -lQPropertyEditord
  TARGET =  guid
Index: gui/src/mainwindowimpl.cpp
===================================================================
--- gui/src/mainwindowimpl.cpp	(revision 52)
+++ gui/src/mainwindowimpl.cpp	(working copy)
@@ -1,7 +1,7 @@
 #include "mainwindowimpl.h"
 #include "wpsdrawer.h"
-#include <qfiledialog>
-#include <qdebug>
+#include <QFileDialog>
+#include <QDebug>
 
 //
 MainWindowImpl::MainWindowImpl( QWidget * parent, Qt::WFlags f)
Index: gui/src/wpsdrawer.cpp
===================================================================
--- gui/src/wpsdrawer.cpp	(revision 52)
+++ gui/src/wpsdrawer.cpp	(working copy)
@@ -1,7 +1,7 @@
 #include "wpsdrawer.h"
 #include "sliderimpl.h"
-#include <qtgui>
-#include <qlibrary>
+#include <QtGui>
+#include <QLibrary>
 #include <stdarg.h>
 //
 #define DEBUGF1 qDebug
Index: gui/src/qwpsstate.h
===================================================================
--- gui/src/qwpsstate.h	(revision 52)
+++ gui/src/qwpsstate.h	(working copy)
@@ -1,7 +1,7 @@
 #ifndef __WPSSTATE_H__
 #define __WPSSTATE_H__
 
-#include <qobject>
+#include <QObject>
 #include "wpsstate.h"
 
 class QWpsState : public QObject {
Index: gui/src/wpsdrawer.h
===================================================================
--- gui/src/wpsdrawer.h	(revision 52)
+++ gui/src/wpsdrawer.h	(working copy)
@@ -3,8 +3,8 @@
 //
 #include <QWidget>
 #include <QPixmap>
-#include "..\..\proxy\api.h"
-#include "QMp3State.h"
+#include "../../proxy/api.h"
+#include "qmp3state.h"
 #include "qwpsstate.h"
 //
 
Index: gui/src/sliderimpl.cpp
===================================================================
--- gui/src/sliderimpl.cpp	(revision 52)
+++ gui/src/sliderimpl.cpp	(working copy)
@@ -1,6 +1,6 @@
 #include "sliderimpl.h"
 #include "mainwindowimpl.h"
-#include <qdebug>
+#include <QDebug>
 //
 SliderImpl::SliderImpl( QString caption, int min, int max )
 {
Index: gui/src/qmp3state.h
===================================================================
--- gui/src/qmp3state.h	(revision 52)
+++ gui/src/qmp3state.h	(working copy)
@@ -2,7 +2,7 @@
 #define __QMP3STATE_H__
 
 #include "wpsstate.h"
-#include <qobject>
+#include <QObject>
 
 class QWpsState;
 
Index: gui/src/QPropertyEditor/QPropertyEditor.pro
===================================================================
--- gui/src/QPropertyEditor/QPropertyEditor.pro	(revision 52)
+++ gui/src/QPropertyEditor/QPropertyEditor.pro	(working copy)
@@ -15,12 +15,12 @@
 UI_DIR = .
 CONFIG(debug, debug|release) {
  TARGET =  QPropertyEditord
- OBJECTS_DIR =  ../../Build/QPropertyEditor/Debug
- MOC_DIR =  ../../Build/QPropertyEditor/Debug
+ OBJECTS_DIR =  ../../build/QPropertyEditor/debug
+ MOC_DIR =  ../../build/QPropertyEditor/debug
 }
 CONFIG(release, debug|release) {
  TARGET =  QPropertyEditor
- OBJECTS_DIR =  ../../Build/QPropertyEditor/Release
- MOC_DIR =  ../../Build/QPropertyEditor/Release
+ OBJECTS_DIR =  ../../build/QPropertyEditor/release
+ MOC_DIR =  ../../build/QPropertyEditor/release
  DEFINES +=  QT_NO_DEBUG
 }
Index: gui/ui/mainwindow.ui
===================================================================
--- gui/ui/mainwindow.ui	(revision 52)
+++ gui/ui/mainwindow.ui	(working copy)
@@ -106,7 +106,7 @@
   <customwidget>
    <class>QPropertyEditorWidget</class>
    <extends>QTreeView</extends>
-   <header>qpropertyeditorwidget.h</header>
+   <header>QPropertyEditorWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>