Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

eolite: switched to autoimport

Browse Source 
git-svn-id: svn://kolibrios.org@9719 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Coldy 2022-02-18 18:41:31 +00:00
parent d37b797def
commit 5052d133da
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/cmm/eolite/Tupfile.lua
View File

@ -1,6 +1,16 @@
if tup.getconfig("NO_CMM") ~= "" then return end if tup.getconfig("NO_CMM") ~= "" then return end
if tup.getconfig("NO_TCC") ~= "" then return end
HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
tup.include(HELPERDIR .. "/use_tcc.lua")
if tup.getconfig("LANG") == "ru" if tup.getconfig("LANG") == "ru"
then C_LANG = "LANG_RUS" then C_LANG = "LANG_RUS"
else C_LANG = "LANG_ENG" -- this includes default case without config else C_LANG = "LANG_ENG" -- this includes default case without config
end end
tup.rule("Eolite.c", "c-- /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "Eolite.com")
LFLAGS = LFLAGS .. " -stack=20480"
LIBS = LIBS .. " ../../develop/ktcc/trunk/bin/lib/tiny.o -nostdlib -lbox_lib -lini -limg"
tup.rule("Eolite.c", "c-- -coff /D=" .. C_LANG .. " %f %o", "%B.obj")
tup.rule("Eolite.obj", "objconv -felf32 %f %o", "%B.o")
link_tcc("Eolite.o", "%B.com")

12
programs/cmm/lib/obj/box_lib.h
View File

@ -8,7 +8,7 @@
#ifdef __COFF__ #ifdef __COFF__
extern dword edit_box_draw; extern dword edit_box_draw;
extern dword edit_box_key; extern dword edit_box_key_safe;
extern dword edit_box_mouse; extern dword edit_box_mouse;
extern dword edit_box_set_text; extern dword edit_box_set_text;
@ -24,6 +24,16 @@ extern dword progressbar_draw;
extern dword progressbar_progress; extern dword progressbar_progress;
extern dword frame_draw; extern dword frame_draw;
/*
Legacy support
For new programs need to use edit_box_key_safe
TODO: change in all cmm programs edit_box_key to edit_box_key_safe,
after that delete #define below
*/
#define edit_box_key edit_box_key_safe
#else #else
#ifndef INCLUDE_DLL_H #ifndef INCLUDE_DLL_H
#include "../lib/dll.h" #include "../lib/dll.h"