diff --git a/kernel/trunk/boot/bootcode.inc b/kernel/trunk/boot/bootcode.inc index 4cb0dd3d9d..506de049e8 100644 --- a/kernel/trunk/boot/bootcode.inc +++ b/kernel/trunk/boot/bootcode.inc @@ -816,7 +816,7 @@ end if mov [boot_dev], al ; GET MEMORY MAP -include 'detect/biosmem.inc' +include '../detect/biosmem.inc' ; READ DISKETTE TO MEMORY diff --git a/kernel/trunk/drivers/sb16/sb16.asm b/kernel/trunk/drivers/sb16/sb16.asm index 33a62da5df..424c7f9583 100644 --- a/kernel/trunk/drivers/sb16/sb16.asm +++ b/kernel/trunk/drivers/sb16/sb16.asm @@ -7,7 +7,7 @@ format MS COFF -include 'config.inc' +include 'CONFIG.INC' ;structs---------------------------------------------------------- struc IOCTL @@ -33,7 +33,7 @@ include '..\imports.inc' section '.flat' code readable align 16 -include 'sb16.inc' +include 'SB16.INC' ;------------------------------------------------------------------------------- proc START stdcall, state:dword diff --git a/programs/games/invaders/ASCGL.INC b/programs/games/invaders/ascgl.inc similarity index 100% rename from programs/games/invaders/ASCGL.INC rename to programs/games/invaders/ascgl.inc diff --git a/programs/network/https/trunk/https.asm b/programs/network/https/trunk/https.asm index 6045af826a..9ae60e8037 100644 --- a/programs/network/https/trunk/https.asm +++ b/programs/network/https/trunk/https.asm @@ -29,7 +29,7 @@ use32 dd 0x20000 dd 0,0 ; reserved=no extended header -include "MACROS.INC" +include "macros.inc" ; 0x0+ - program image ; 0x1ffff - stack diff --git a/programs/system/docpack/trunk/docpack.asm b/programs/system/docpack/trunk/docpack.asm index a3ae8d4ad3..6e6e03fe03 100755 --- a/programs/system/docpack/trunk/docpack.asm +++ b/programs/system/docpack/trunk/docpack.asm @@ -17,7 +17,7 @@ macro embed_file fn label3: db fn label: - file fn + file '%DOCDIR%' # fn label2: FILE_COUNT=FILE_COUNT+1 } @@ -179,15 +179,27 @@ embedded: ; -- Start of embedding area ------ embed_file 'README.TXT' ;a +if lang eq ru embed_file 'GNU.TXT' ;b +else + embed_file 'COPYING.TXT' ;b +end if embed_file 'HOT_KEYS.TXT' ;c embed_file 'FASM.TXT' ;d embed_file 'MTDBG.TXT' ;e +if lang eq ru embed_file 'VRR_RUS.TXT' ;f embed_file 'SYSFUNCR.TXT' ;g - embed_file 'PPP_RUS.TXT' ;h - embed_file 'STACK_RU.TXT' ;i - embed_file 'GROBFAR.TXT' ;j + embed_file 'STACK_RU.TXT' ;h + embed_file 'GROBFAR.TXT' ;i +else + embed_file 'VRR_ENG.TXT' ;f + embed_file 'SYSFUNCS.TXT' ;g + embed_file 'STACK.TXT' ;h + embed_file 'FARA.TXT' ;i +end if + embed_file 'KFAR_KEYS.TXT' ;j + embed_file 'INI.TXT' ;k ; -- End of embedding area ------- dd 0 diff --git a/programs/system/panel/trunk/@PANEL.ASM b/programs/system/panel/trunk/@PANEL.ASM index 9f27615ade..eda83c1d13 100644 --- a/programs/system/panel/trunk/@PANEL.ASM +++ b/programs/system/panel/trunk/@PANEL.ASM @@ -16,7 +16,7 @@ use32 include 'lang.inc' include '..\..\..\macros.inc' -include 'moi.inc' ;раскладки клавиатуры +include 'MOI.INC' ;раскладки клавиатуры time_bgr_color = 0x66cc