XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

Weather: now uses auto import(KX).

Browse Source 
git-svn-id: svn://kolibrios.org@9651 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
turbocat 2022-01-18 17:51:08 +00:00
parent 37d921475c
commit ee7c61f931
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
programs/other/Weather/Tupfile.lua
View File

@ -1,10 +1,10 @@
if tup.getconfig("NO_TCC") ~= "" then return end
TCC="kos32-tcc"
CFLAGS = "-I../../develop/ktcc/trunk/libc.obj/include"
LDFLAGS = "-nostdlib -L../../develop/ktcc/trunk/bin/lib ../../develop/ktcc/trunk/bin/lib/crt0.o"
LIBS = "-ltcc -limg -lhttp -lc.obj"
COMMAND = string.format("%s %s %s %s %s ", TCC, CFLAGS, LDFLAGS, "%f -o %o", LIBS)
tup.rule({"weather.c", "json/json.c"}, COMMAND .. tup.getconfig("KPACK_CMD"), "weather")
if tup.getconfig("NO_TCC") ~= "" then return end
if tup.getconfig("HELPERDIR") == ""
then
HELPERDIR = "../../../programs"
end
tup.include(HELPERDIR .. "/use_tcc.lua")
LIBS = "-lhttp -limg"
link_tcc({"weather.c", "json/json.c"}, "weather");

5
programs/other/Weather/weather.c
View File

@ -318,11 +318,6 @@ void set_lang()
int main()
{
win_pos = _ksys_get_mouse_pos(KSYS_MOUSE_SCREEN_POS); // Получаем позицию курсора
if(!kolibri_libimg_init()){ // Загружаем libimg.obj
notify_show("Libimg.obj not loaded!' -E");
exit(0);
}
_ksys_get_system_colors(&sys_color_table); // Получаем таблица цветов
char *city=NULL, *token=NULL, *units=NULL; // Указатели на токен, название города, систему мер