39 files changed, 6 insertions, 1 deletions
diff --git a/plugins/Utils.pas/fpc.cfg b/plugins/Utils.pas/fpc.cfg
index 88a79c0617..2e0892dafa 100644
--- a/plugins/Utils.pas/fpc.cfg
+++ b/plugins/Utils.pas/fpc.cfg
@@ -5,9 +5,14 @@
 -FE.\tmp
 -FU.\tmp
 -Fi..\Utils.pas
+-Fi..\..\plugins\Utils.pas
 -Fi..\..\include\delphi
 -Fi..\ExternalAPI\delphi
+-Fi..\..\plugins\ExternalAPI\delphi
 -Fu..\Libs
+-Fu..\..\plugins\Libs
 -Fu..\Utils.pas
+-Fu..\..\plugins\Utils.pas
 -Fu..\..\include\delphi
 -Fu..\ExternalAPI\delphi
+-Fu..\..\plugins\ExternalAPI\delphi
diff --git a/plugins/mRadio/activex.pp b/protocols/mRadio/activex.pp
index d36762ccf1..d36762ccf1 100644
--- a/plugins/mRadio/activex.pp
+++ b/protocols/mRadio/activex.pp
diff --git a/plugins/mRadio/commctrl.pp b/protocols/mRadio/commctrl.pp
index 56c995c210..56c995c210 100644
--- a/plugins/mRadio/commctrl.pp
+++ b/protocols/mRadio/commctrl.pp
diff --git a/plugins/mRadio/i_bass.inc b/protocols/mRadio/i_bass.inc
index 77f0d3650a..77f0d3650a 100644
--- a/plugins/mRadio/i_bass.inc
+++ b/protocols/mRadio/i_bass.inc
diff --git a/plugins/mRadio/i_cc.inc b/protocols/mRadio/i_cc.inc
index deb993ec0c..deb993ec0c 100644
--- a/plugins/mRadio/i_cc.inc
+++ b/protocols/mRadio/i_cc.inc
diff --git a/plugins/mRadio/i_frame.inc b/protocols/mRadio/i_frame.inc
index 89de119d0e..89de119d0e 100644
--- a/plugins/mRadio/i_frame.inc
+++ b/protocols/mRadio/i_frame.inc
diff --git a/plugins/mRadio/i_frameapi.inc b/protocols/mRadio/i_frameapi.inc
index 002e2fc142..002e2fc142 100644
--- a/plugins/mRadio/i_frameapi.inc
+++ b/protocols/mRadio/i_frameapi.inc
diff --git a/plugins/mRadio/i_hotkey.inc b/protocols/mRadio/i_hotkey.inc
index 04271fe824..04271fe824 100644
--- a/plugins/mRadio/i_hotkey.inc
+++ b/protocols/mRadio/i_hotkey.inc
diff --git a/plugins/mRadio/i_myservice.inc b/protocols/mRadio/i_myservice.inc
index b8338a0d81..b8338a0d81 100644
--- a/plugins/mRadio/i_myservice.inc
+++ b/protocols/mRadio/i_myservice.inc
diff --git a/plugins/mRadio/i_optdlg.inc b/protocols/mRadio/i_optdlg.inc
index e047fe20a1..e047fe20a1 100644
--- a/plugins/mRadio/i_optdlg.inc
+++ b/protocols/mRadio/i_optdlg.inc
diff --git a/plugins/mRadio/i_search.inc b/protocols/mRadio/i_search.inc
index d4330e84d1..d4330e84d1 100644
--- a/plugins/mRadio/i_search.inc
+++ b/protocols/mRadio/i_search.inc
diff --git a/plugins/mRadio/i_service.inc b/protocols/mRadio/i_service.inc
index 4f12544a81..4f12544a81 100644
--- a/plugins/mRadio/i_service.inc
+++ b/protocols/mRadio/i_service.inc
diff --git a/plugins/mRadio/i_tray.inc b/protocols/mRadio/i_tray.inc
index 096e288691..096e288691 100644
--- a/plugins/mRadio/i_tray.inc
+++ b/protocols/mRadio/i_tray.inc
diff --git a/plugins/mRadio/i_tray_api.inc b/protocols/mRadio/i_tray_api.inc
index 9339a10613..9339a10613 100644
--- a/plugins/mRadio/i_tray_api.inc
+++ b/protocols/mRadio/i_tray_api.inc
diff --git a/plugins/mRadio/i_variables.inc b/protocols/mRadio/i_variables.inc
index fead4afad8..fead4afad8 100644
--- a/plugins/mRadio/i_variables.inc
+++ b/protocols/mRadio/i_variables.inc
diff --git a/plugins/mRadio/i_vars.inc b/protocols/mRadio/i_vars.inc
index 26e7024cc1..26e7024cc1 100644
--- a/plugins/mRadio/i_vars.inc
+++ b/protocols/mRadio/i_vars.inc
diff --git a/plugins/mRadio/i_visual.inc b/protocols/mRadio/i_visual.inc
index 77012b55f2..77012b55f2 100644
--- a/plugins/mRadio/i_visual.inc
+++ b/protocols/mRadio/i_visual.inc
diff --git a/plugins/mRadio/ico/delete.ico b/protocols/mRadio/ico/delete.ico
index eea851da19..eea851da19 100644
--- a/plugins/mRadio/ico/delete.ico
+++ b/protocols/mRadio/ico/delete.ico
diff --git a/plugins/mRadio/ico/mradio.ico b/protocols/mRadio/ico/mradio.ico
index e95c6fe21a..e95c6fe21a 100644
--- a/plugins/mRadio/ico/mradio.ico
+++ b/protocols/mRadio/ico/mradio.ico
diff --git a/plugins/mRadio/ico/new.ico b/protocols/mRadio/ico/new.ico
index 73937210e0..73937210e0 100644
--- a/plugins/mRadio/ico/new.ico
+++ b/protocols/mRadio/ico/new.ico
diff --git a/plugins/mRadio/ico/off.ico b/protocols/mRadio/ico/off.ico
index 041e55bb9e..041e55bb9e 100644
--- a/plugins/mRadio/ico/off.ico
+++ b/protocols/mRadio/ico/off.ico
diff --git a/plugins/mRadio/ico/on.ico b/protocols/mRadio/ico/on.ico
index 35bf39e0b9..35bf39e0b9 100644
--- a/plugins/mRadio/ico/on.ico
+++ b/protocols/mRadio/ico/on.ico
diff --git a/plugins/mRadio/ico/recoff.ico b/protocols/mRadio/ico/recoff.ico
index 4bb6000ef0..4bb6000ef0 100644
--- a/plugins/mRadio/ico/recoff.ico
+++ b/protocols/mRadio/ico/recoff.ico
diff --git a/plugins/mRadio/ico/recon.ico b/protocols/mRadio/ico/recon.ico
index d8007b1c8c..d8007b1c8c 100644
--- a/plugins/mRadio/ico/recon.ico
+++ b/protocols/mRadio/ico/recon.ico
diff --git a/plugins/mRadio/make.bat b/protocols/mRadio/make.bat
index dd8fca64a6..2917577c4a 100644
--- a/plugins/mRadio/make.bat
+++ b/protocols/mRadio/make.bat
@@ -13,7 +13,7 @@ md tmp
 
 rem brcc32.exe mradio.rc -fomradio.res
 
-%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9
+%FPCBIN% @..\..\plugins\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9
 
 move .\tmp\%PROJECT%.dll %OUTDIR%
 del /Q tmp\*
diff --git a/plugins/mRadio/mr_rc.inc b/protocols/mRadio/mr_rc.inc
index 41998194b6..41998194b6 100644
--- a/plugins/mRadio/mr_rc.inc
+++ b/protocols/mRadio/mr_rc.inc
diff --git a/plugins/mRadio/mradio.dpr b/protocols/mRadio/mradio.dpr
index 56c2b7dba9..56c2b7dba9 100644
--- a/plugins/mRadio/mradio.dpr
+++ b/protocols/mRadio/mradio.dpr
diff --git a/plugins/mRadio/mradio.rc b/protocols/mRadio/mradio.rc
index 91e976fa35..91e976fa35 100644
--- a/plugins/mRadio/mradio.rc
+++ b/protocols/mRadio/mradio.rc
diff --git a/plugins/mRadio/mradio.res b/protocols/mRadio/mradio.res
index d70c64c58e..d70c64c58e 100644
--- a/plugins/mRadio/mradio.res
+++ b/protocols/mRadio/mradio.res
diff --git a/plugins/mRadio/proto_mradio/Proto_mRadio.vcxproj b/protocols/mRadio/proto_mradio/Proto_mRadio.vcxproj
index f78dc543ae..f78dc543ae 100644
--- a/plugins/mRadio/proto_mradio/Proto_mRadio.vcxproj
+++ b/protocols/mRadio/proto_mradio/Proto_mRadio.vcxproj
diff --git a/plugins/mRadio/proto_mradio/Proto_mRadio.vcxproj.filters b/protocols/mRadio/proto_mradio/Proto_mRadio.vcxproj.filters
index adb1b35427..adb1b35427 100644
--- a/plugins/mRadio/proto_mradio/Proto_mRadio.vcxproj.filters
+++ b/protocols/mRadio/proto_mradio/Proto_mRadio.vcxproj.filters
diff --git a/plugins/mRadio/proto_mradio/res/proto_away.ico b/protocols/mRadio/proto_mradio/res/proto_away.ico
index f9d97408f8..f9d97408f8 100644
--- a/plugins/mRadio/proto_mradio/res/proto_away.ico
+++ b/protocols/mRadio/proto_mradio/res/proto_away.ico
diff --git a/plugins/mRadio/proto_mradio/res/proto_invisible.ico b/protocols/mRadio/proto_mradio/res/proto_invisible.ico
index 6a868bc106..6a868bc106 100644
--- a/plugins/mRadio/proto_mradio/res/proto_invisible.ico
+++ b/protocols/mRadio/proto_mradio/res/proto_invisible.ico
diff --git a/plugins/mRadio/proto_mradio/res/proto_offline.ico b/protocols/mRadio/proto_mradio/res/proto_offline.ico
index 5a7e6172ac..5a7e6172ac 100644
--- a/plugins/mRadio/proto_mradio/res/proto_offline.ico
+++ b/protocols/mRadio/proto_mradio/res/proto_offline.ico
diff --git a/plugins/mRadio/proto_mradio/res/proto_online.ico b/protocols/mRadio/proto_mradio/res/proto_online.ico
index 53f13cddca..53f13cddca 100644
--- a/plugins/mRadio/proto_mradio/res/proto_online.ico
+++ b/protocols/mRadio/proto_mradio/res/proto_online.ico
diff --git a/plugins/mRadio/proto_mradio/res/resource.rc b/protocols/mRadio/proto_mradio/res/resource.rc
index 43ad52b944..43ad52b944 100644
--- a/plugins/mRadio/proto_mradio/res/resource.rc
+++ b/protocols/mRadio/proto_mradio/res/resource.rc
diff --git a/plugins/mRadio/proto_mradio/src/resource.h b/protocols/mRadio/proto_mradio/src/resource.h
index d425e7b8b1..d425e7b8b1 100644
--- a/plugins/mRadio/proto_mradio/src/resource.h
+++ b/protocols/mRadio/proto_mradio/src/resource.h
diff --git a/plugins/mRadio/readme.txt b/protocols/mRadio/readme.txt
index ea111e1056..ea111e1056 100644
--- a/plugins/mRadio/readme.txt
+++ b/protocols/mRadio/readme.txt
diff --git a/plugins/mRadio/variants.pas b/protocols/mRadio/variants.pas
index c7c8fdc824..c7c8fdc824 100644
--- a/plugins/mRadio/variants.pas
+++ b/protocols/mRadio/variants.pas