6 files changed, 21 insertions, 15 deletions
diff --git a/bin10/pascal32.bat b/bin10/pascal32.bat
index 90048be23c..09d2423230 100644
--- a/bin10/pascal32.bat
+++ b/bin10/pascal32.bat
@@ -20,6 +20,8 @@ popd
 
 pushd Watrack
 call make.bat fpc
+cd icons
+call makeicons.bat fpc
 popd
 
 pushd Dbx_mmap_SA\Cryptors\Athena
diff --git a/bin10/pascal64.bat b/bin10/pascal64.bat
index c6aa34de28..865a345b69 100644
--- a/bin10/pascal64.bat
+++ b/bin10/pascal64.bat
@@ -16,6 +16,8 @@ popd
 
 pushd Watrack
 call make.bat fpc64
+cd icons
+call makeicons.bat fpc64
 popd
 
 pushd Dbx_mmap_SA\Cryptors\Athena
diff --git a/plugins/Dbx_mmap_SA/Cryptors/Athena/How to build Athena.txt b/plugins/Dbx_mmap_SA/Cryptors/Athena/How to build Athena.txt
deleted file mode 100644
index deae9e767c..0000000000
--- a/plugins/Dbx_mmap_SA/Cryptors/Athena/How to build Athena.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-1. Obtain sources from http://delphi-miranda-plugins.googlecode.com/svn/trunk with your favorite SVN client.
-
-2. Copy Athena folder to the root directory of the abovementioned sources.
-
-3. Open Command prompt, navigate to Athena folder.
-
-4. Type: "make" (without quotes) - to build 32-bit version with Delphi 5,
-         "make fpc" -  to build Free Pascal 32-bit version,
-         "make fpc64" - to build Free Pascal 64-bit version,
-         "make xe2" - to build Delphi XE2 32-bit version,
-         "make xe64" - to build Delphi XE2 64-bit version.
-\ No newline at end of file
diff --git a/plugins/Dbx_mmap_SA/Cryptors/Athena/make.bat b/plugins/Dbx_mmap_SA/Cryptors/Athena/make.bat
index a69a30549f..44d2af2c3f 100644
--- a/plugins/Dbx_mmap_SA/Cryptors/Athena/make.bat
+++ b/plugins/Dbx_mmap_SA/Cryptors/Athena/make.bat
@@ -1,4 +1,4 @@
-@echo off
+rem @echo off
 if /i '%1' == 'fpc' (
   set OUTDIR="..\..\..\..\bin10\Release\Plugins\Cryptors"
   set FPCBIN=fpc.exe
diff --git a/plugins/Watrack/icons/TASM/icons.bat b/plugins/Watrack/icons/TASM/icons.bat
index 5dd69d1433..e0affe69dc 100644
--- a/plugins/Watrack/icons/TASM/icons.bat
+++ b/plugins/Watrack/icons/TASM/icons.bat
@@ -2,8 +2,7 @@
 if /i '%1' == 'buttons' (set iconres=icons) else set iconres=iconspl
 brcc32 %iconres%.rc -i%2 -foicons.res
 tasm32 watrack.asm
-tlink32 -Tpd watrack.obj,watrack_%1.dll,,,,icons.res
+tlink32 -Tpd watrack.obj,Watrack_%1.dll,,,,icons.res
 del *.map
 del *.obj
-del *.res
-move watrack_%1.dll ..\..\..\bin
-\ No newline at end of file
+del *.res
+\ No newline at end of file
diff --git a/plugins/Watrack/icons/makeicons.bat b/plugins/Watrack/icons/makeicons.bat
new file mode 100644
index 0000000000..fe3604b963
--- /dev/null
+++ b/plugins/Watrack/icons/makeicons.bat
@@ -0,0 +1,14 @@
+rem @echo off
+if /i '%1' == 'fpc' (
+  set OUTDIR="..\..\..\bin10\Release\Icons"
+  set FPCBIN=fpc.exe
+) else if /i '%1' == 'fpc64' (
+  set OUTDIR="..\..\..\bin10\Release64\Icons"
+  set FPCBIN=ppcrossx64.exe
+)
+if not exist %OUTDIR% mkdir %OUTDIR%
+
+call make buttons
+call make icons
+
+move /Y Tasm\Watrack_*.dll %Outdir%
+\ No newline at end of file