From 30c1f25537b9906ce5a0366dc6789e2cd91bebf1 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Mon, 28 Jun 2021 12:08:38 +0000
Subject: [PATCH] notes: code clean cmm: update build.bat files to use
 /D=LANG_XXX instead of creating lang.h--

git-svn-id: svn://kolibrios.org@8954 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/app_plus/Tupfile.lua          |  2 +-
 programs/cmm/app_plus/app_plus.c           |  4 --
 programs/cmm/app_plus/compile_en.bat       | 12 ++----
 programs/cmm/app_plus/compile_ru.bat       | 11 ++----
 programs/cmm/appearance/appearance.c       |  4 --
 programs/cmm/appearance/compile_en.bat     | 12 ++----
 programs/cmm/appearance/compile_ru.bat     | 10 ++---
 programs/cmm/barscfg/Tupfile.lua           |  2 +-
 programs/cmm/barscfg/barscfg.c             |  4 --
 programs/cmm/barscfg/compile_en.bat        | 13 ++----
 programs/cmm/barscfg/compile_ru.bat        | 12 ++----
 programs/cmm/browser/Tupfile.lua           |  2 +-
 programs/cmm/browser/WebView.c             |  4 --
 programs/cmm/browser/compile_en.bat        |  6 +--
 programs/cmm/browser/compile_ru.bat        |  6 +--
 programs/cmm/clipview/Tupfile.lua          |  2 +-
 programs/cmm/dicty/Tupfile.lua             |  2 +-
 programs/cmm/diff/Tupfile.lua              |  2 +-
 programs/cmm/downloader/Tupfile.lua        |  2 +-
 programs/cmm/downloader/compile_en.bat     |  6 +--
 programs/cmm/downloader/compile_ru.bat     |  6 +--
 programs/cmm/downloader/const.h            |  4 --
 programs/cmm/drvinst/Tupfile.lua           |  2 +-
 programs/cmm/drvinst/compile_en.bat        |  6 +--
 programs/cmm/drvinst/compile_ru.bat        |  6 +--
 programs/cmm/drvinst/drvinst.c             |  4 --
 programs/cmm/examples/Tupfile.lua          | 14 +++----
 programs/cmm/examples/compile_en.bat       |  2 +-
 programs/cmm/iconedit/Tupfile.lua          |  2 +-
 programs/cmm/iconedit/compile_en.bat       |  7 +---
 programs/cmm/iconedit/compile_ru.bat       |  7 +---
 programs/cmm/iconedit/iconedit.c           |  4 --
 programs/cmm/kf_font_viewer/Tupfile.lua    |  2 +-
 programs/cmm/kf_font_viewer/compile_en.bat |  6 +--
 programs/cmm/menu/Tupfile.lua              |  2 +-
 programs/cmm/misc/build.bat                |  5 +--
 programs/cmm/misc/easyshot.c               |  4 --
 programs/cmm/misc/install.c                |  4 --
 programs/cmm/misc/mblocks.c                |  4 --
 programs/cmm/misc/osupdate.c               |  4 --
 programs/cmm/mousecfg/Tupfile.lua          |  2 +-
 programs/cmm/mousecfg/compile_en.bat       |  8 +---
 programs/cmm/mousecfg/compile_ru.bat       |  8 +---
 programs/cmm/mousecfg/mousecfg.c           |  4 --
 programs/cmm/notes/Tupfile.lua             |  2 +-
 programs/cmm/notes/compile.bat             |  6 +--
 programs/cmm/notes/engine.h                |  4 +-
 programs/cmm/notes/notes.c                 | 46 +++++++++-------------
 programs/cmm/pixie2/Tupfile.lua            |  2 +-
 programs/cmm/pixie2/compile_en.bat         |  7 +---
 programs/cmm/quark/Tupfile.lua             |  2 +-
 programs/cmm/search/Tupfile.lua            |  2 +-
 programs/cmm/sysmon/Tupfile.lua            |  2 +-
 programs/cmm/sysmon/compile_en.bat         |  6 +--
 programs/cmm/sysmon/compile_ru.bat         |  6 +--
 programs/cmm/sysmon/sysmon.c               |  4 --
 programs/cmm/the_bus/Tupfile.lua           |  2 +-
 programs/cmm/the_bus/compile_en.bat        |  7 +---
 programs/cmm/the_bus/compile_ru.bat        |  7 +---
 programs/cmm/tmpdisk/Tupfile.lua           |  2 +-
 programs/cmm/tmpdisk/compile_en.bat        |  5 +--
 programs/cmm/tmpdisk/compile_ru.bat        |  5 +--
 programs/cmm/tmpdisk/tmpdisk.c             |  4 --
 63 files changed, 91 insertions(+), 265 deletions(-)

diff --git a/programs/cmm/app_plus/Tupfile.lua b/programs/cmm/app_plus/Tupfile.lua
index d9b37dae75..f666b7c7db 100644
--- a/programs/cmm/app_plus/Tupfile.lua
+++ b/programs/cmm/app_plus/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("app_plus.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "app_plus.com")
+tup.rule("app_plus.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "app_plus.com")
diff --git a/programs/cmm/app_plus/app_plus.c b/programs/cmm/app_plus/app_plus.c
index 8326d1739a..9560dc3d4b 100644
--- a/programs/cmm/app_plus/app_plus.c
+++ b/programs/cmm/app_plus/app_plus.c
@@ -8,10 +8,6 @@
 #include "..\lib\patterns\restart_process.h"
 #include "added_sysdir.c"
 
-#ifndef AUTOBUILD
-#include "lang.h--"
-#endif
-
 //===================================================//
 //                                                   //
 //                       DATA                        //
diff --git a/programs/cmm/app_plus/compile_en.bat b/programs/cmm/app_plus/compile_en.bat
index 796beec49b..04f23690f1 100644
--- a/programs/cmm/app_plus/compile_en.bat
+++ b/programs/cmm/app_plus/compile_en.bat
@@ -1,10 +1,6 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-
-@del app_plus
-cls
-@c-- app_plus.c
-@rename app_plus.com app_plus
+@c-- /D=LANG=ENG app_plus.c
+@del *.
+@rename *.com *.
 @del warning.txt
-@del lang.h--
 @pause
+
diff --git a/programs/cmm/app_plus/compile_ru.bat b/programs/cmm/app_plus/compile_ru.bat
index cabb2df27e..6f636017fd 100644
--- a/programs/cmm/app_plus/compile_ru.bat
+++ b/programs/cmm/app_plus/compile_ru.bat
@@ -1,10 +1,5 @@
-@del lang.h--
-@echo #define LANG_RUS 1 >lang.h--
-
-@del app_plus
-cls
-@c-- app_plus.c
-@rename app_plus.com app_plus
+@c-- /D=LANG=RUS app_plus.c
+@del *.
+@rename *.com *.
 @del warning.txt
-@del lang.h--
 @pause
diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c
index f695700f17..b93015437e 100644
--- a/programs/cmm/appearance/appearance.c
+++ b/programs/cmm/appearance/appearance.c
@@ -1,10 +1,6 @@
 //11.03.12 - start!
 //ver 2.31
 
-#ifndef AUTOBUILD
-	?include "lang.h--"
-#endif
-
 #define MEMSIZE 200*1024
 #include "../lib/mem.h"
 #include "../lib/strings.h"
diff --git a/programs/cmm/appearance/compile_en.bat b/programs/cmm/appearance/compile_en.bat
index 49d50ca716..de8fa61bad 100644
--- a/programs/cmm/appearance/compile_en.bat
+++ b/programs/cmm/appearance/compile_en.bat
@@ -1,9 +1,5 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-
-@C-- appearance.c
-@del appearance
-@rename appearance.com appearance
+@c-- /D=LANG_ENG appearance.c
+@del *.
+@rename *.com *.
 @del warning.txt
-@del lang.h--
-@pause
\ No newline at end of file
+@pause
diff --git a/programs/cmm/appearance/compile_ru.bat b/programs/cmm/appearance/compile_ru.bat
index 0d4d4df49c..81a378de93 100644
--- a/programs/cmm/appearance/compile_ru.bat
+++ b/programs/cmm/appearance/compile_ru.bat
@@ -1,9 +1,5 @@
-@del lang.h--
-@echo #define LANG_RUS 1 >lang.h--
-
-@C-- appearance.c
-@del appearance
-@rename appearance.com appearance
+@c-- /D=LANG_RUS appearance.c
+@del *.
+@rename *.com *.
 @del warning.txt
-@del lang.h--
 @pause
\ No newline at end of file
diff --git a/programs/cmm/barscfg/Tupfile.lua b/programs/cmm/barscfg/Tupfile.lua
index e5e8797872..a0ba32290a 100644
--- a/programs/cmm/barscfg/Tupfile.lua
+++ b/programs/cmm/barscfg/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("barscfg.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "barscfg.com")
+tup.rule("barscfg.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "barscfg.com")
diff --git a/programs/cmm/barscfg/barscfg.c b/programs/cmm/barscfg/barscfg.c
index 04fd40bd81..ebbebd4d38 100644
--- a/programs/cmm/barscfg/barscfg.c
+++ b/programs/cmm/barscfg/barscfg.c
@@ -1,7 +1,3 @@
-#ifndef AUTOBUILD
-#include "lang.h--"
-#endif
-
 #define MEMSIZE 0x23E80
 #include "..\lib\kolibri.h" 
 #include "..\lib\strings.h" 
diff --git a/programs/cmm/barscfg/compile_en.bat b/programs/cmm/barscfg/compile_en.bat
index 8646f3ff57..a98f5fcbcd 100644
--- a/programs/cmm/barscfg/compile_en.bat
+++ b/programs/cmm/barscfg/compile_en.bat
@@ -1,11 +1,6 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-
-@del barscfg
-cls
-@c-- barscfg.c
+@c-- /D=LANG_ENG barscfg.c
 @pause
-@echo off
-@rename barscfg.com barscfg
+@del barscfg
+@rename *.com *.
 @del warning.txt
-@del lang.h--
+
diff --git a/programs/cmm/barscfg/compile_ru.bat b/programs/cmm/barscfg/compile_ru.bat
index 40722df826..cc1cab9566 100644
--- a/programs/cmm/barscfg/compile_ru.bat
+++ b/programs/cmm/barscfg/compile_ru.bat
@@ -1,10 +1,6 @@
-@del lang.h--
-@echo #define LANG_RUS 1 >lang.h--
-
-@del barscfg
-cls
-@c-- barscfg.c
+@c-- /D=LANG_RUS barscfg.c
 @pause
-@rename barscfg.com barscfg
+@del barscfg
+@rename *.com *.
 @del warning.txt
-@del lang.h--
+
diff --git a/programs/cmm/browser/Tupfile.lua b/programs/cmm/browser/Tupfile.lua
index 5ab7fb5847..ced439d3e7 100644
--- a/programs/cmm/browser/Tupfile.lua
+++ b/programs/cmm/browser/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("WebView.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "WebView.com")
+tup.rule("WebView.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "WebView.com")
diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c
index 8572fc266c..40cb2c5697 100644
--- a/programs/cmm/browser/WebView.c
+++ b/programs/cmm/browser/WebView.c
@@ -1,10 +1,6 @@
 //Copyright 2007-2020 by Veliant & Leency
 //Asper, lev, Lrz, Barsuk, Nable, hidnplayr...
 
-#ifndef AUTOBUILD
-	#include "lang.h--"
-#endif
-
 //===================================================//
 //                                                   //
 //                       LIB                         //
diff --git a/programs/cmm/browser/compile_en.bat b/programs/cmm/browser/compile_en.bat
index 87991af5fc..76b2516b19 100644
--- a/programs/cmm/browser/compile_en.bat
+++ b/programs/cmm/browser/compile_en.bat
@@ -1,10 +1,6 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-
-@c-- WebView.c
+@c-- /D=LANG_ENG WebView.c
 @del WebView
 @rename WebView.com WebView
 @del warning.txt
-@del lang.h--
 
 if not exist WebView ( @pause )
\ No newline at end of file
diff --git a/programs/cmm/browser/compile_ru.bat b/programs/cmm/browser/compile_ru.bat
index b2dd40c0c8..d20bd5c2b2 100644
--- a/programs/cmm/browser/compile_ru.bat
+++ b/programs/cmm/browser/compile_ru.bat
@@ -1,10 +1,6 @@
-@del lang.h--
-@echo #define LANG_RUS 1 >lang.h--
-
-@c-- WebView.c
+@c-- /D=LANG_RUS WebView.c
 @del WebView
 @rename WebView.com WebView
 @del warning.txt
-@del lang.h--
 
 if not exist WebView ( @pause )
\ No newline at end of file
diff --git a/programs/cmm/clipview/Tupfile.lua b/programs/cmm/clipview/Tupfile.lua
index c2b064856b..8836dbc7b3 100644
--- a/programs/cmm/clipview/Tupfile.lua
+++ b/programs/cmm/clipview/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("clipview.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "clipview.com")
+tup.rule("clipview.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "clipview.com")
diff --git a/programs/cmm/dicty/Tupfile.lua b/programs/cmm/dicty/Tupfile.lua
index e5caa55c17..aebdbfe418 100644
--- a/programs/cmm/dicty/Tupfile.lua
+++ b/programs/cmm/dicty/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("dicty.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "dicty.com")
+tup.rule("dicty.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "dicty.com")
diff --git a/programs/cmm/diff/Tupfile.lua b/programs/cmm/diff/Tupfile.lua
index 750c144a47..457fdbbfb2 100644
--- a/programs/cmm/diff/Tupfile.lua
+++ b/programs/cmm/diff/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("diff.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "diff.com")
+tup.rule("diff.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "diff.com")
diff --git a/programs/cmm/downloader/Tupfile.lua b/programs/cmm/downloader/Tupfile.lua
index 200aedd658..77c91b6757 100644
--- a/programs/cmm/downloader/Tupfile.lua
+++ b/programs/cmm/downloader/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("dl.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "dl.com")
+tup.rule("dl.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "dl.com")
diff --git a/programs/cmm/downloader/compile_en.bat b/programs/cmm/downloader/compile_en.bat
index 8ee66a9d61..a9f80b172a 100644
--- a/programs/cmm/downloader/compile_en.bat
+++ b/programs/cmm/downloader/compile_en.bat
@@ -1,10 +1,6 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-
-@c-- dl.c
+@c-- /D=LANG_ENG dl.c
 @del dl
 @rename dl.com dl
 @del warning.txt
-@del lang.h--
 
 if not exist dl ( @pause )
\ No newline at end of file
diff --git a/programs/cmm/downloader/compile_ru.bat b/programs/cmm/downloader/compile_ru.bat
index 3901d9b9f6..de5a10c44d 100644
--- a/programs/cmm/downloader/compile_ru.bat
+++ b/programs/cmm/downloader/compile_ru.bat
@@ -1,10 +1,6 @@
-@del lang.h--
-@echo #define LANG_RUS 1 >lang.h--
-
-@c-- dl.c
+@c-- /D=LANG_RUS dl.c
 @del dl
 @rename dl.com dl
 @del warning.txt
-@del lang.h--
 
 if not exist dl ( @pause )
\ No newline at end of file
diff --git a/programs/cmm/downloader/const.h b/programs/cmm/downloader/const.h
index fb6315a423..c126c3fabc 100644
--- a/programs/cmm/downloader/const.h
+++ b/programs/cmm/downloader/const.h
@@ -1,9 +1,5 @@
 //Copyright 2020 by Leency
 
-#ifndef AUTOBUILD
-	#include "lang.h--"
-#endif
-
 #ifdef LANG_RUS
 	#define DL_WINDOW_HEADER "Œ¥­¥¤¦¥à § £à㧮ª"
 	#define T_DOWNLOAD "‘ª ç âì"
diff --git a/programs/cmm/drvinst/Tupfile.lua b/programs/cmm/drvinst/Tupfile.lua
index 0244feaa55..44ef26aed8 100644
--- a/programs/cmm/drvinst/Tupfile.lua
+++ b/programs/cmm/drvinst/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("drvinst.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "drvinst.com")
+tup.rule("drvinst.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "drvinst.com")
diff --git a/programs/cmm/drvinst/compile_en.bat b/programs/cmm/drvinst/compile_en.bat
index 6a5f225e5b..8e5cb5df5d 100644
--- a/programs/cmm/drvinst/compile_en.bat
+++ b/programs/cmm/drvinst/compile_en.bat
@@ -1,10 +1,6 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-
+@c-- /D=LANG_RUS drvinst.c
 @del *.kex
-@c-- drvinst.c
 @rename *.com *.kex
 @del warning.txt
-@del lang.h--
 
 @pause
\ No newline at end of file
diff --git a/programs/cmm/drvinst/compile_ru.bat b/programs/cmm/drvinst/compile_ru.bat
index 5654a0793c..8e5cb5df5d 100644
--- a/programs/cmm/drvinst/compile_ru.bat
+++ b/programs/cmm/drvinst/compile_ru.bat
@@ -1,10 +1,6 @@
-@del lang.h--
-@echo #define LANG_RUS 1 >lang.h--
-
+@c-- /D=LANG_RUS drvinst.c
 @del *.kex
-@c-- drvinst.c
 @rename *.com *.kex
 @del warning.txt
-@del lang.h--
 
 @pause
\ No newline at end of file
diff --git a/programs/cmm/drvinst/drvinst.c b/programs/cmm/drvinst/drvinst.c
index 6e1234ac36..994c2bde4e 100644
--- a/programs/cmm/drvinst/drvinst.c
+++ b/programs/cmm/drvinst/drvinst.c
@@ -1,9 +1,5 @@
 #define MEMSIZE 4096*20
 
-#ifndef AUTOBUILD
-#include "lang.h--"
-#endif
-
 //===================================================//
 //                                                   //
 //                       LIB                         //
diff --git a/programs/cmm/examples/Tupfile.lua b/programs/cmm/examples/Tupfile.lua
index 8065e07c86..cd57a8830c 100644
--- a/programs/cmm/examples/Tupfile.lua
+++ b/programs/cmm/examples/Tupfile.lua
@@ -3,10 +3,10 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("window.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "window.com")
-tup.rule("collections.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "collections.com")
-tup.rule("menu.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "menu.com")
-tup.rule("rgb.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "rgb.com")
-tup.rule("console.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "console.com")
-tup.rule("pigex.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pigex.com")
-tup.rule("math.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "math.com")
+tup.rule("window.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "window.com")
+tup.rule("collections.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "collections.com")
+tup.rule("menu.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "menu.com")
+tup.rule("rgb.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "rgb.com")
+tup.rule("console.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "console.com")
+tup.rule("pigex.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pigex.com")
+tup.rule("math.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "math.com")
diff --git a/programs/cmm/examples/compile_en.bat b/programs/cmm/examples/compile_en.bat
index 3229a88dbb..fb3561fb5f 100644
--- a/programs/cmm/examples/compile_en.bat
+++ b/programs/cmm/examples/compile_en.bat
@@ -1,6 +1,6 @@
 @del *.kex
 
-For /R %%i In (*.c) Do c-- "%%i"
+For /R %%i In (*.c) Do c-- /D=LANG_ENG "%%i"
 
 @rename *.com *.kex
 @mkdir bin
diff --git a/programs/cmm/iconedit/Tupfile.lua b/programs/cmm/iconedit/Tupfile.lua
index 111811bd89..e42f410670 100644
--- a/programs/cmm/iconedit/Tupfile.lua
+++ b/programs/cmm/iconedit/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("iconedit.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "iconedit.com")
+tup.rule("iconedit.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "iconedit.com")
diff --git a/programs/cmm/iconedit/compile_en.bat b/programs/cmm/iconedit/compile_en.bat
index b911fa2662..92fb562be8 100644
--- a/programs/cmm/iconedit/compile_en.bat
+++ b/programs/cmm/iconedit/compile_en.bat
@@ -1,12 +1,7 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
+@c-- /D=LANG_ENG iconedit.c
 @del iconedit
-cls
-
-@c-- iconedit.c
 @rename *.com *.
 @del warning.txt
-@del lang.h--
 
 if exist iconedit (
     "C:\Program Files (x86)\WinImage\winimage.exe" "D:\Kolibri\Desktop\kolibri.img" /H /Q /I iconedit
diff --git a/programs/cmm/iconedit/compile_ru.bat b/programs/cmm/iconedit/compile_ru.bat
index 48ca7eb67f..c42bd5b3f6 100644
--- a/programs/cmm/iconedit/compile_ru.bat
+++ b/programs/cmm/iconedit/compile_ru.bat
@@ -1,12 +1,7 @@
-@del lang.h--
-@echo #define LANG_RUS 1 >lang.h--
+@c-- /D=LANG_ENG iconedit.c
 @del iconedit
-cls
-
-@c-- iconedit.c
 @rename *.com *.
 @del warning.txt
-@del lang.h--
 
 if exist iconedit (
     "C:\Program Files (x86)\WinImage\winimage.exe" "D:\Kolibri\Desktop\kolibri.img" /H /Q /I iconedit
diff --git a/programs/cmm/iconedit/iconedit.c b/programs/cmm/iconedit/iconedit.c
index 4c2511d062..cb3311dd6e 100644
--- a/programs/cmm/iconedit/iconedit.c
+++ b/programs/cmm/iconedit/iconedit.c
@@ -21,10 +21,6 @@
 
 #include "colors_mas.h"
 
-#ifndef AUTOBUILD
-#include "lang.h--"
-#endif
-
 //===================================================//
 //                                                   //
 //                       DATA                        //
diff --git a/programs/cmm/kf_font_viewer/Tupfile.lua b/programs/cmm/kf_font_viewer/Tupfile.lua
index e6084acb0e..b9ae62b316 100644
--- a/programs/cmm/kf_font_viewer/Tupfile.lua
+++ b/programs/cmm/kf_font_viewer/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("font_viewer.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "font_viewer.com")
+tup.rule("font_viewer.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "font_viewer.com")
diff --git a/programs/cmm/kf_font_viewer/compile_en.bat b/programs/cmm/kf_font_viewer/compile_en.bat
index f98f965141..b4a920e8c5 100644
--- a/programs/cmm/kf_font_viewer/compile_en.bat
+++ b/programs/cmm/kf_font_viewer/compile_en.bat
@@ -1,5 +1,5 @@
-@del "kf_view"
-@C-- "font_viewer.c"
-@rename "font_viewer.com" "kf_view"
+@del kf_view
+@C-- font_viewer.c
+@rename font_viewer.com kf_view
 @del warning.txt
 @pause
\ No newline at end of file
diff --git a/programs/cmm/menu/Tupfile.lua b/programs/cmm/menu/Tupfile.lua
index 8862498b44..4fcd5f42f8 100644
--- a/programs/cmm/menu/Tupfile.lua
+++ b/programs/cmm/menu/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("menu.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "menu.com")
+tup.rule("menu.c", "c-- %f" .. tup.getconfig("KPACK_CMD"), "menu.com")
diff --git a/programs/cmm/misc/build.bat b/programs/cmm/misc/build.bat
index e9866fd95d..93b2bde05d 100644
--- a/programs/cmm/misc/build.bat
+++ b/programs/cmm/misc/build.bat
@@ -1,8 +1,6 @@
 @echo off
 
-echo #define LANG_ENG 1 >lang.h--
-
-For /R %%i In (*.c) Do c-- "%%i"
+For /R %%i In (*.c) Do c-- /D=LANG_ENG "%%i"
 
 mkdir bin
 del bin\*.* /Q
@@ -14,6 +12,5 @@ rename software_widget syspanel
 cd ..
 
 del warning.txt
-del lang.h--
 
 pause
\ No newline at end of file
diff --git a/programs/cmm/misc/easyshot.c b/programs/cmm/misc/easyshot.c
index 7b4d697a89..a2d27d4e30 100644
--- a/programs/cmm/misc/easyshot.c
+++ b/programs/cmm/misc/easyshot.c
@@ -8,10 +8,6 @@
 #include "../lib/obj/box_lib.h"
 #include "../lib/obj/proc_lib.h"
 
-#ifndef AUTOBUILD
-	#include "lang.h--"
-#endif
-
 /* === TRANSLATIONS === */
 
 #ifdef LANG_RUS
diff --git a/programs/cmm/misc/install.c b/programs/cmm/misc/install.c
index 745323f815..a08fa6f850 100644
--- a/programs/cmm/misc/install.c
+++ b/programs/cmm/misc/install.c
@@ -9,10 +9,6 @@
 
 #include "../lib/patterns/restart_process.h"
 
-#ifndef AUTOBUILD
-#include "lang.h--"
-#endif
-
 char logo[] = "
 ÛÛÛÛ   ÛÛÛÛ ÛÛÛÛÛÛÛÛÛÛ ÛÛÛÛ   ÛÛÛÛ ÛÛÛÛÛÛÛÛÛÛÛ
  ÛÛÛÛ   ÛÛ   ÛÛÛ         ÛÛÛ ÛÛÛ   ÛÛ  ÛÛÛ  ÛÛ
diff --git a/programs/cmm/misc/mblocks.c b/programs/cmm/misc/mblocks.c
index e8313492a3..c2031a1f68 100644
--- a/programs/cmm/misc/mblocks.c
+++ b/programs/cmm/misc/mblocks.c
@@ -12,10 +12,6 @@
 
 #include "..\lib\obj\libimg.h"
 
-#ifndef AUTOBUILD
-#include "lang.h--"
-#endif
-
 #define BTN_CLOSED 0
 #define BTN_PRESSED 1
 #define BTN_OPEN 2
diff --git a/programs/cmm/misc/osupdate.c b/programs/cmm/misc/osupdate.c
index dcd12d16f4..af95ca97e5 100644
--- a/programs/cmm/misc/osupdate.c
+++ b/programs/cmm/misc/osupdate.c
@@ -10,10 +10,6 @@
 
 #include "../lib/patterns/restart_process.h"
 
-#ifndef AUTOBUILD
-#include "lang.h--"
-#endif
-
 bool install_complete = false;
 _http http;
 
diff --git a/programs/cmm/mousecfg/Tupfile.lua b/programs/cmm/mousecfg/Tupfile.lua
index aa86d41816..5e61c62445 100644
--- a/programs/cmm/mousecfg/Tupfile.lua
+++ b/programs/cmm/mousecfg/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("mousecfg.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "mousecfg.com")
+tup.rule("mousecfg.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "mousecfg.com")
diff --git a/programs/cmm/mousecfg/compile_en.bat b/programs/cmm/mousecfg/compile_en.bat
index 323c153821..977582b6e7 100644
--- a/programs/cmm/mousecfg/compile_en.bat
+++ b/programs/cmm/mousecfg/compile_en.bat
@@ -1,11 +1,5 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-
+@c-- /D=LANG_ENG mousecfg.c
 @del mousecfg
-cls
-@c-- mousecfg.c
 @rename mousecfg.com mousecfg
-@kpack mousecfg
 @del warning.txt
-@del lang.h--
 @pause
\ No newline at end of file
diff --git a/programs/cmm/mousecfg/compile_ru.bat b/programs/cmm/mousecfg/compile_ru.bat
index 2ee98cf785..977582b6e7 100644
--- a/programs/cmm/mousecfg/compile_ru.bat
+++ b/programs/cmm/mousecfg/compile_ru.bat
@@ -1,11 +1,5 @@
-@del lang.h--
-@echo #define LANG_RUS 1 >lang.h--
-
+@c-- /D=LANG_ENG mousecfg.c
 @del mousecfg
-cls
-@c-- mousecfg.c
 @rename mousecfg.com mousecfg
-@kpack mousecfg
 @del warning.txt
-@del lang.h--
 @pause
\ No newline at end of file
diff --git a/programs/cmm/mousecfg/mousecfg.c b/programs/cmm/mousecfg/mousecfg.c
index 090a4da429..a94a570d21 100644
--- a/programs/cmm/mousecfg/mousecfg.c
+++ b/programs/cmm/mousecfg/mousecfg.c
@@ -1,9 +1,5 @@
 // Mouse Configuration Utility ver 1.62
 
-#ifndef AUTOBUILD
-#include "lang.h--"
-#endif
-
 #define MEMSIZE 4096*11
 
 #include "..\lib\strings.h" 
diff --git a/programs/cmm/notes/Tupfile.lua b/programs/cmm/notes/Tupfile.lua
index cedf506467..c29cd23fa2 100644
--- a/programs/cmm/notes/Tupfile.lua
+++ b/programs/cmm/notes/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("notes.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "notes.com")
+tup.rule("notes.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "notes.com")
diff --git a/programs/cmm/notes/compile.bat b/programs/cmm/notes/compile.bat
index 64d9a8b235..42db4260be 100644
--- a/programs/cmm/notes/compile.bat
+++ b/programs/cmm/notes/compile.bat
@@ -1,9 +1,5 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-
-C-- notes.c
+C-- /D=LANG_RUS notes.c
 @del notes
 @rename notes.com notes
 @pause
-@del lang.h--
 @del warning.txt
diff --git a/programs/cmm/notes/engine.h b/programs/cmm/notes/engine.h
index 18d6ace851..8f64829576 100644
--- a/programs/cmm/notes/engine.h
+++ b/programs/cmm/notes/engine.h
@@ -1,4 +1,4 @@
-#define MAX_LINE_CHARS 256
+#define MAX_LINE_CHARS 128
 
 #define CHBOX 12
 #define CHECKBOX_ID 50
@@ -35,7 +35,7 @@ void NOTE_LINE::Delete()
 
 struct NOTES : llist {
 	char txt_path[4096];
-	char txt_data[MAX_LINE_CHARS*LINES_COUNT];
+	char txt_data[MAX_LINE_CHARS+4*LINES_COUNT+30];
 	bool txt_file_exists;
 
 	NOTE_LINE lines[LINES_COUNT]; 
diff --git a/programs/cmm/notes/notes.c b/programs/cmm/notes/notes.c
index 1c23f26908..fa22df098a 100644
--- a/programs/cmm/notes/notes.c
+++ b/programs/cmm/notes/notes.c
@@ -1,6 +1,8 @@
 // Notes v1.1
 
-#define MEMSIZE 0xDAE80
+#define MEMSIZE 1024*40
+#define ENTRY_POINT #main
+
 #include "..\lib\kolibri.h" 
 
 #include "..\lib\obj\box_lib.h"
@@ -13,10 +15,6 @@
 //                                                   //
 //===================================================//
 
-#ifndef AUTOBUILD
-	#include "lang.h--"
-#endif
-
 #ifdef LANG_RUS
 	?define WINDOW_CAPTION "‡ ¬¥âª¨"
 	?define DELETE_TEXT "“¤ «¨âì";
@@ -39,18 +37,19 @@ unsigned char edge[sizeof(file "img/edge.raw")]= FROM "img/edge.raw"; //292x6
 #define DELETE_BTN 4;
 #define DELETE_W sizeof(DELETE_TEXT)+2*6
 
-proc_info Form;
-
 #include "engine.h"
 #include "ini.h"
+	
+proc_info Form;
 
-edit_box notebox = {NULL,NULL,NULL,COL_BG_ACTIVE,0x94AECE,COL_BG_ACTIVE,0xffffff,0,
-	MAX_LINE_CHARS-1,NULL,0,ed_always_focus+ed_focus};
+edit_box notebox = {WIN_W-RED_LINE_X-6,RED_LINE_X+5,RED_LINE_X,
+	COL_BG_ACTIVE, 0x94AECE,COL_BG_ACTIVE,0xffffff,0, 
+	MAX_LINE_CHARS-1, NULL,0,ed_always_focus+ed_focus};
 dword lists[] = { 0xEAEAEA, 0xCDCDCD, 0xF0F0F0, 0xD8D8D8, 0 };
 
 bool delete_active = false;
 bool window_dragable = true;
-block delBtn;
+block delBtn = { WIN_W-DELETE_W-1, NULL, DELETE_W, RED_LINE_X};
 
 //===================================================//
 //                                                   //
@@ -61,7 +60,6 @@ block delBtn;
 void main()
 {   
 	bool first_redraw=true;
-	dword cur_line_offset;
 	load_dll(boxlib, #box_lib_init,0);
 
 	if (GetCpuFrequency()/1000000>=1000) window_dragable=true; else window_dragable=false;
@@ -70,7 +68,6 @@ void main()
 
 	@SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER);
 	LoadIniSettings();
-
 	loop() switch(@WaitEvent())
 	{
 		case evMouse:
@@ -115,7 +112,7 @@ void main()
 			break;
 	 
 		case evKey:
-			GetKeys();
+			@GetKeys();
 			if (key_modifier&KEY_LCTRL) || (key_modifier&KEY_RCTRL)
 			{
 				if (key_scancode == SCAN_CODE_SPACE)
@@ -184,19 +181,6 @@ void draw_window()
 	EventListRedraw();
 }
 
-void DrawEditBoxN()
-{
-	notebox.width = notes.w-notes.x-8;
-	notebox.left = notes.x+5;
-	notebox.offset = notebox.shift = notebox.shift_old = 0;
-	notebox.cl_curs_x = notebox.cl_curs_y = 0;
-	notebox.size = strlen(notebox.text);
-	notebox.flags = ed_always_focus+ed_focus;
-	if (notebox.pos > notebox.size) notebox.pos = notebox.size;
-	notebox.top = notes.cur_y*notes.item_h+4+notes.y;
-	edit_box_draw stdcall(#notebox);	
-}
-
 //===================================================//
 //                                                   //
 //                     EVENTS                        //
@@ -209,7 +193,13 @@ void EventActivateLine(int line_n)
 	notes.cur_y = line_n;
 	notebox.text = notes.DrawLine(notes.cur_y, notes.item_h);
 	EventListRedraw();
-	DrawEditBoxN();
+
+	notebox.size = strlen(notebox.text);
+	notebox.offset = notebox.shift = notebox.shift_old = 0;
+	notebox.cl_curs_x = notebox.cl_curs_y = 0;
+	if (notebox.pos > notebox.size) notebox.pos = notebox.size;
+	notebox.top = notes.cur_y*notes.item_h+4+notes.y;
+	edit_box_draw stdcall(#notebox);
 }
 
 void EventExitApp()
@@ -222,7 +212,7 @@ void EventExitApp()
 void EventDrawDeleteButton()
 {
 	notes.DrawLine(notes.cur_y, notes.item_h);
-	delBtn.set_size(WIN_W-DELETE_W-1, notes.cur_y*notes.item_h+notes.y, DELETE_W, notes.item_h-1);
+	delBtn.y = notes.cur_y*notes.item_h+notes.y;
 	DefineButton(delBtn.x, delBtn.y, delBtn.w, delBtn.h, DELETE_BTN, 0xFF0000);
 	WriteText(delBtn.x+10, delBtn.h/2-3 + delBtn.y, 0x80, 0xFFFfff, DELETE_TEXT);
 	notebox.top=-20;
diff --git a/programs/cmm/pixie2/Tupfile.lua b/programs/cmm/pixie2/Tupfile.lua
index 30782d51dc..d3802d0f4d 100644
--- a/programs/cmm/pixie2/Tupfile.lua
+++ b/programs/cmm/pixie2/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("pixie.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pixie.com")
+tup.rule("pixie.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "pixie.com")
diff --git a/programs/cmm/pixie2/compile_en.bat b/programs/cmm/pixie2/compile_en.bat
index 5466fa8d8e..a886c74649 100644
--- a/programs/cmm/pixie2/compile_en.bat
+++ b/programs/cmm/pixie2/compile_en.bat
@@ -1,10 +1,5 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-
-@C-- pixie.c
+@C-- /D=LANG_ENG pixie.c
 @del pixie
-@kpack pixie.com
 @rename pixie.com pixie
 @del warning.txt
-@del lang.h--
 @pause
\ No newline at end of file
diff --git a/programs/cmm/quark/Tupfile.lua b/programs/cmm/quark/Tupfile.lua
index e0e0203184..dbcbd6a9c5 100644
--- a/programs/cmm/quark/Tupfile.lua
+++ b/programs/cmm/quark/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("quark.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "quark.com")
+tup.rule("quark.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "quark.com")
diff --git a/programs/cmm/search/Tupfile.lua b/programs/cmm/search/Tupfile.lua
index 2feb05e32d..d54a4bbd1f 100644
--- a/programs/cmm/search/Tupfile.lua
+++ b/programs/cmm/search/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("search.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "search.com")
+tup.rule("search.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "search.com")
diff --git a/programs/cmm/sysmon/Tupfile.lua b/programs/cmm/sysmon/Tupfile.lua
index 7919019adb..271b8b9db9 100644
--- a/programs/cmm/sysmon/Tupfile.lua
+++ b/programs/cmm/sysmon/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("sysmon.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "sysmon.com")
+tup.rule("sysmon.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "sysmon.com")
diff --git a/programs/cmm/sysmon/compile_en.bat b/programs/cmm/sysmon/compile_en.bat
index 03e553dc0e..4657bfbf0c 100644
--- a/programs/cmm/sysmon/compile_en.bat
+++ b/programs/cmm/sysmon/compile_en.bat
@@ -1,9 +1,5 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-
-@del sysmon
+@del /D=LANG_ENG sysmon
 @c-- sysmon.c
 @rename sysmon.com sysmon
 @del warning.txt
-@del lang.h--
 @pause
\ No newline at end of file
diff --git a/programs/cmm/sysmon/compile_ru.bat b/programs/cmm/sysmon/compile_ru.bat
index f47286eaad..3396a8079c 100644
--- a/programs/cmm/sysmon/compile_ru.bat
+++ b/programs/cmm/sysmon/compile_ru.bat
@@ -1,9 +1,5 @@
-@del lang.h--
-@echo #define LANG_RUS 1 >lang.h--
-
-@del sysmon
+@del /D=LANG_RUS sysmon
 @c-- sysmon.c
 @rename sysmon.com sysmon
 @del warning.txt
-@del lang.h--
 @pause
\ No newline at end of file
diff --git a/programs/cmm/sysmon/sysmon.c b/programs/cmm/sysmon/sysmon.c
index f44c25a44a..787b330070 100644
--- a/programs/cmm/sysmon/sysmon.c
+++ b/programs/cmm/sysmon/sysmon.c
@@ -6,10 +6,6 @@
 
 #define MEMSIZE 4096*30
 
-#ifndef AUTOBUILD
-#include "lang.h--"
-#endif
-
 //===================================================//
 //                                                   //
 //                       LIB                         //
diff --git a/programs/cmm/the_bus/Tupfile.lua b/programs/cmm/the_bus/Tupfile.lua
index cd9d6f889d..de47c9cdac 100644
--- a/programs/cmm/the_bus/Tupfile.lua
+++ b/programs/cmm/the_bus/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("the_bus.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "the_bus.com")
+tup.rule("the_bus.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "the_bus.com")
diff --git a/programs/cmm/the_bus/compile_en.bat b/programs/cmm/the_bus/compile_en.bat
index 448947680b..d2385f3626 100644
--- a/programs/cmm/the_bus/compile_en.bat
+++ b/programs/cmm/the_bus/compile_en.bat
@@ -1,10 +1,5 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-
 @del the_bus
-@cls
-@c-- the_bus.c
+@c-- /D=LANG_ENG the_bus.c
 @pause
 @rename the_bus.com the_bus
 @del warning.txt
-@del lang.h--
diff --git a/programs/cmm/the_bus/compile_ru.bat b/programs/cmm/the_bus/compile_ru.bat
index 42cac61727..aec950f187 100644
--- a/programs/cmm/the_bus/compile_ru.bat
+++ b/programs/cmm/the_bus/compile_ru.bat
@@ -1,10 +1,5 @@
-@del lang.h--
-@echo #define LANG_RUS 1 >lang.h--
-
 @del the_bus
-@cls
-@c-- the_bus.c
+@c-- /D=LANG_RUS the_bus.c
 @pause
 @rename the_bus.com the_bus
 @del warning.txt
-@del lang.h--
diff --git a/programs/cmm/tmpdisk/Tupfile.lua b/programs/cmm/tmpdisk/Tupfile.lua
index 682cb57f84..b7c46c8a29 100644
--- a/programs/cmm/tmpdisk/Tupfile.lua
+++ b/programs/cmm/tmpdisk/Tupfile.lua
@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("tmpdisk.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "tmpdisk.com")
+tup.rule("tmpdisk.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "tmpdisk.com")
diff --git a/programs/cmm/tmpdisk/compile_en.bat b/programs/cmm/tmpdisk/compile_en.bat
index f258be2e66..3a8b03facc 100644
--- a/programs/cmm/tmpdisk/compile_en.bat
+++ b/programs/cmm/tmpdisk/compile_en.bat
@@ -1,8 +1,5 @@
-@echo #define LANG_ENG 1 >lang.h--
-
-@C-- tmpdisk.c
+@C-- /D=LANG_ENG tmpdisk.c
 @del tmpdisk
 @rename tmpdisk.com tmpdisk
 @del warning.txt
-@del lang.h--
 @pause
diff --git a/programs/cmm/tmpdisk/compile_ru.bat b/programs/cmm/tmpdisk/compile_ru.bat
index f3b43449b4..99a53a406d 100644
--- a/programs/cmm/tmpdisk/compile_ru.bat
+++ b/programs/cmm/tmpdisk/compile_ru.bat
@@ -1,8 +1,5 @@
-@echo #define LANG_RUS 1 >lang.h--
-
-@C-- tmpdisk.c
+@C-- /D=LANG_RUS tmpdisk.c
 @del tmpdisk
 @rename tmpdisk.com tmpdisk
 @del warning.txt
-@del lang.h--
 @pause
diff --git a/programs/cmm/tmpdisk/tmpdisk.c b/programs/cmm/tmpdisk/tmpdisk.c
index 8516166af9..3a53289682 100644
--- a/programs/cmm/tmpdisk/tmpdisk.c
+++ b/programs/cmm/tmpdisk/tmpdisk.c
@@ -4,10 +4,6 @@
 #include "..\lib\strings.h"
 #include "..\lib\fs.h"
 
-#ifndef AUTOBUILD
-#include "lang.h--"
-#endif
-
 /////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////              Program data                  ////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////