From 7592583563ffff162811a79864e80e67756d4269 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 9 Jan 2022 10:00:41 +0000 Subject: [PATCH] do not include config.inc into IMG, use var in macros.inc as it was before webview: more peach default bg git-svn-id: svn://kolibrios.org@9604 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 2 +- programs/cmm/browser/TWB/TWB.c | 2 +- programs/macros.inc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 1ab5f3881c..fe9239a063 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -13,7 +13,7 @@ PROGS = "../programs" -- The first subitem of every item is name inside kolibri.img, the second is name of local file. img_files = { {"MACROS.INC", PROGS .. "/macros.inc"}, - {"CONFIG.INC", PROGS .. "/config.inc"}, +-- {"CONFIG.INC", PROGS .. "/config.inc"}, {"STRUCT.INC", PROGS .. "/struct.inc"}, {"FB2READ", "common/fb2read"}, {"ALLGAMES", "common/allgames"}, diff --git a/programs/cmm/browser/TWB/TWB.c b/programs/cmm/browser/TWB/TWB.c index 87ab7227fd..06aa7fd2aa 100644 --- a/programs/cmm/browser/TWB/TWB.c +++ b/programs/cmm/browser/TWB/TWB.c @@ -3,7 +3,7 @@ #include "TWB\parse_tag.h" #include "TWB\special.h" #include "TWB\tag_list.h" -#define DEFAULT_BG_COL 0xffEBE8E9; +#define DEFAULT_BG_COL 0xffFBE5E4; //- peach; 0xffEBE8E9 - more grey dword link_color_default; dword link_color_active; #include "TWB\links.h" diff --git a/programs/macros.inc b/programs/macros.inc index c3342acb46..9674f8a2af 100644 --- a/programs/macros.inc +++ b/programs/macros.inc @@ -290,8 +290,8 @@ macro __mov reg,a,b { ; mike.dld } -include 'config.inc' -;__CPU_type equ p5 +;include 'config.inc' +__CPU_type equ p5 SYSENTER_VAR equ 0 macro mcall a,b,c,d,e,f,g { ; [mike.dld], [Ghost]