diff --git a/programs/develop/ktcc/trunk/kx/doc/en/Features.txt b/programs/develop/ktcc/trunk/bin/doc/en/Features.txt similarity index 100% rename from programs/develop/ktcc/trunk/kx/doc/en/Features.txt rename to programs/develop/ktcc/trunk/bin/doc/en/Features.txt diff --git a/programs/develop/ktcc/trunk/kx/doc/en/How to use.txt b/programs/develop/ktcc/trunk/bin/doc/en/How to use.txt similarity index 100% rename from programs/develop/ktcc/trunk/kx/doc/en/How to use.txt rename to programs/develop/ktcc/trunk/bin/doc/en/How to use.txt diff --git a/programs/develop/ktcc/trunk/kx/doc/ru/Features.txt b/programs/develop/ktcc/trunk/bin/doc/ru/Features.txt similarity index 100% rename from programs/develop/ktcc/trunk/kx/doc/ru/Features.txt rename to programs/develop/ktcc/trunk/bin/doc/ru/Features.txt diff --git a/programs/develop/ktcc/trunk/kx/doc/ru/History.txt b/programs/develop/ktcc/trunk/bin/doc/ru/History.txt similarity index 100% rename from programs/develop/ktcc/trunk/kx/doc/ru/History.txt rename to programs/develop/ktcc/trunk/bin/doc/ru/History.txt diff --git a/programs/develop/ktcc/trunk/kx/doc/ru/How to use.txt b/programs/develop/ktcc/trunk/bin/doc/ru/How to use.txt similarity index 100% rename from programs/develop/ktcc/trunk/kx/doc/ru/How to use.txt rename to programs/develop/ktcc/trunk/bin/doc/ru/How to use.txt diff --git a/programs/develop/ktcc/trunk/bin/kos32-tcc b/programs/develop/ktcc/trunk/bin/kos32-tcc index 5596e714a5..5fa83afe5e 100755 Binary files a/programs/develop/ktcc/trunk/bin/kos32-tcc and b/programs/develop/ktcc/trunk/bin/kos32-tcc differ diff --git a/programs/develop/ktcc/trunk/bin/kos32-tcc.exe b/programs/develop/ktcc/trunk/bin/kos32-tcc.exe deleted file mode 100644 index fb44b69813..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/kos32-tcc.exe and /dev/null differ diff --git a/programs/develop/ktcc/trunk/kx/lib/box.def b/programs/develop/ktcc/trunk/bin/lib/box.def similarity index 100% rename from programs/develop/ktcc/trunk/kx/lib/box.def rename to programs/develop/ktcc/trunk/bin/lib/box.def diff --git a/programs/develop/ktcc/trunk/bin/lib/box_lib.def b/programs/develop/ktcc/trunk/bin/lib/box_lib.def new file mode 100644 index 0000000000..1badc805c9 --- /dev/null +++ b/programs/develop/ktcc/trunk/bin/lib/box_lib.def @@ -0,0 +1,98 @@ +LIBRARY box_lib.obj + +EXPORTS +edit_box +edit_box_key +edit_box_mouse +edit_box_set_text +version_ed +init_checkbox2 +check_box_draw2 +check_box_mouse2 +version_ch2 +option_box_draw +option_box_mouse +version_op +scrollbar_v_draw +scrollbar_v_mouse +scrollbar_h_draw +scrollbar_h_mouse +version_scrollbar +dbutton_draw +dbutton_mouse +version_dbutton +menu_bar_draw +menu_bar_mouse +menu_bar_activate +version_menu_bar +FileBrowser_draw +FileBrowser_mouse +FileBrowser_key +version_FileBrowser +tl_data_init +tl_data_clear +tl_info_clear +tl_key +tl_mouse +tl_draw +tl_info_undo +tl_info_redo +tl_node_add +tl_node_set_data +tl_node_get_data +tl_node_delete +tl_cur_beg +tl_cur_next +tl_cur_perv +tl_node_close_open +tl_node_lev_inc +tl_node_lev_dec +tl_node_move_up +tl_node_move_down +tl_node_poi_get_info +tl_node_poi_get_next_info +tl_node_poi_get_data +tl_save_mem +tl_load_mem +tl_get_mem_size +version_tree_list +PathShow_prepare +PathShow_draw +version_PathShow +ted_but_sumb_upper +ted_but_sumb_lover +ted_but_convert_by_table +ted_can_save +ted_clear +ted_delete +ted_draw +ted_init +ted_init_scroll_bars +ted_init_syntax_file +ted_is_select +ted_key +ted_mouse +ted_open_file +ted_save_file +ted_text_add +ted_but_select_word +ted_but_cut +ted_but_copy +ted_but_paste +ted_but_undo +ted_but_redo +ted_but_reverse +ted_but_find +ted_but_replace +ted_text_colored +ted_go_to_position +version_text_edit +frame_draw +version_frame +progressbar_draw +progressbar_progress +tooltip_init +tooltip_delete +tooltip_test_show +tooltip_mouse +get_font_size diff --git a/programs/develop/ktcc/trunk/kx/lib/console.def b/programs/develop/ktcc/trunk/bin/lib/console.def similarity index 100% rename from programs/develop/ktcc/trunk/kx/lib/console.def rename to programs/develop/ktcc/trunk/bin/lib/console.def diff --git a/programs/develop/ktcc/trunk/bin/lib/crt0.o b/programs/develop/ktcc/trunk/bin/lib/crt0.o deleted file mode 100644 index 598dbd5fcc..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/lib/crt0.o and /dev/null differ diff --git a/programs/develop/ktcc/trunk/kx/lib/dialog.def b/programs/develop/ktcc/trunk/bin/lib/dialog.def similarity index 88% rename from programs/develop/ktcc/trunk/kx/lib/dialog.def rename to programs/develop/ktcc/trunk/bin/lib/dialog.def index eac5819e3a..f292613608 100644 --- a/programs/develop/ktcc/trunk/kx/lib/dialog.def +++ b/programs/develop/ktcc/trunk/bin/lib/dialog.def @@ -2,6 +2,7 @@ LIBRARY proc_lib.obj EXPORTS ColorDialog_init +ColorDialog_start OpenDialog_start OpenDialog_init OpenDialog_set_file_ext diff --git a/programs/develop/ktcc/trunk/kx/lib/http.def b/programs/develop/ktcc/trunk/bin/lib/http.def similarity index 100% rename from programs/develop/ktcc/trunk/kx/lib/http.def rename to programs/develop/ktcc/trunk/bin/lib/http.def diff --git a/programs/develop/ktcc/trunk/kx/lib/img.def b/programs/develop/ktcc/trunk/bin/lib/img.def similarity index 87% rename from programs/develop/ktcc/trunk/kx/lib/img.def rename to programs/develop/ktcc/trunk/bin/lib/img.def index 857a64cd0f..a8a0922d11 100644 --- a/programs/develop/ktcc/trunk/kx/lib/img.def +++ b/programs/develop/ktcc/trunk/bin/lib/img.def @@ -17,4 +17,4 @@ img_rotate img_rotate_layer img_scale img_to_rgb -img_to_rgb2 \ No newline at end of file +img_to_rgb2 diff --git a/programs/develop/ktcc/trunk/bin/lib/libbox.a b/programs/develop/ktcc/trunk/bin/lib/libbox.a deleted file mode 100644 index cf3aa51b7c..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/lib/libbox.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/bin/lib/libbuf2d.a b/programs/develop/ktcc/trunk/bin/lib/libbuf2d.a deleted file mode 100644 index 30a0f85c7f..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/lib/libbuf2d.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/kx/lib/libc.def b/programs/develop/ktcc/trunk/bin/lib/libc.def similarity index 97% rename from programs/develop/ktcc/trunk/kx/lib/libc.def rename to programs/develop/ktcc/trunk/bin/lib/libc.def index c36e2999fd..b37a70843f 100644 --- a/programs/develop/ktcc/trunk/kx/lib/libc.def +++ b/programs/develop/ktcc/trunk/bin/lib/libc.def @@ -175,3 +175,6 @@ time localtime asctime difftime +;___LIBGEN___ +basename +dirname diff --git a/programs/develop/ktcc/trunk/bin/lib/libc.obj.a b/programs/develop/ktcc/trunk/bin/lib/libc.obj.a deleted file mode 100644 index d0cb67e74c..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/lib/libc.obj.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/bin/lib/libck.a b/programs/develop/ktcc/trunk/bin/lib/libck.a deleted file mode 100644 index 8ce0341010..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/lib/libck.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/bin/lib/libdialog.a b/programs/develop/ktcc/trunk/bin/lib/libdialog.a deleted file mode 100644 index 04a5772a1d..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/lib/libdialog.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/bin/lib/libgb.a b/programs/develop/ktcc/trunk/bin/lib/libgb.a deleted file mode 100644 index b6680ec90d..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/lib/libgb.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/bin/lib/libhttp.a b/programs/develop/ktcc/trunk/bin/lib/libhttp.a deleted file mode 100644 index 80fdce442a..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/lib/libhttp.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/bin/lib/libimg.a b/programs/develop/ktcc/trunk/bin/lib/libimg.a deleted file mode 100644 index c5f7806118..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/lib/libimg.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/bin/lib/libinputbox.a b/programs/develop/ktcc/trunk/bin/lib/libinputbox.a deleted file mode 100644 index 59de846216..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/lib/libinputbox.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/bin/lib/libmsgbox.a b/programs/develop/ktcc/trunk/bin/lib/libmsgbox.a deleted file mode 100644 index a23e582777..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/lib/libmsgbox.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/bin/lib/libnetwork.a b/programs/develop/ktcc/trunk/bin/lib/libnetwork.a deleted file mode 100644 index 200b6f9f58..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/lib/libnetwork.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/bin/lib/librasterworks.a b/programs/develop/ktcc/trunk/bin/lib/librasterworks.a deleted file mode 100644 index c7bc4b96c2..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/lib/librasterworks.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/bin/lib/libtcc.a b/programs/develop/ktcc/trunk/bin/lib/libtcc1.a similarity index 100% rename from programs/develop/ktcc/trunk/bin/lib/libtcc.a rename to programs/develop/ktcc/trunk/bin/lib/libtcc1.a diff --git a/programs/develop/ktcc/trunk/kx/lib/mbedtls.def b/programs/develop/ktcc/trunk/bin/lib/mbedtls.def similarity index 100% rename from programs/develop/ktcc/trunk/kx/lib/mbedtls.def rename to programs/develop/ktcc/trunk/bin/lib/mbedtls.def diff --git a/programs/develop/ktcc/trunk/bin/lib/msgbox.def b/programs/develop/ktcc/trunk/bin/lib/msgbox.def new file mode 100644 index 0000000000..eb37dca5e5 --- /dev/null +++ b/programs/develop/ktcc/trunk/bin/lib/msgbox.def @@ -0,0 +1,6 @@ +LIBRARY msgbox.obj + +EXPORTS +mb_create +mb_reinit +mb_setfunctions diff --git a/programs/develop/ktcc/trunk/kx/lib/network.def b/programs/develop/ktcc/trunk/bin/lib/network.def similarity index 100% rename from programs/develop/ktcc/trunk/kx/lib/network.def rename to programs/develop/ktcc/trunk/bin/lib/network.def diff --git a/programs/develop/ktcc/trunk/bin/lib/rasterworks.def b/programs/develop/ktcc/trunk/bin/lib/rasterworks.def new file mode 100644 index 0000000000..ca51de693a --- /dev/null +++ b/programs/develop/ktcc/trunk/bin/lib/rasterworks.def @@ -0,0 +1,7 @@ +LIBRARY rasterworks.obj + +EXPORTS +charsFit +cntUTF-8 +drawText +strWidth diff --git a/programs/develop/ktcc/trunk/bin/tcc b/programs/develop/ktcc/trunk/bin/tcc deleted file mode 100644 index 1c7e416f6c..0000000000 Binary files a/programs/develop/ktcc/trunk/bin/tcc and /dev/null differ diff --git a/programs/develop/ktcc/trunk/kx/lib/crt0.o b/programs/develop/ktcc/trunk/kx/lib/crt0.o deleted file mode 100644 index b857c80565..0000000000 Binary files a/programs/develop/ktcc/trunk/kx/lib/crt0.o and /dev/null differ diff --git a/programs/develop/ktcc/trunk/kx/lib/libck.a b/programs/develop/ktcc/trunk/kx/lib/libck.a deleted file mode 100644 index 96b3ff2ae4..0000000000 Binary files a/programs/develop/ktcc/trunk/kx/lib/libck.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/kx/lib/libcryptal.a b/programs/develop/ktcc/trunk/kx/lib/libcryptal.a deleted file mode 100644 index 59467f1660..0000000000 Binary files a/programs/develop/ktcc/trunk/kx/lib/libcryptal.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/kx/lib/libtcc.a b/programs/develop/ktcc/trunk/kx/lib/libtcc.a deleted file mode 100644 index 77e05da5e8..0000000000 Binary files a/programs/develop/ktcc/trunk/kx/lib/libtcc.a and /dev/null differ diff --git a/programs/develop/ktcc/trunk/kx/src/crt/crt0.asm b/programs/develop/ktcc/trunk/kx/src/crt/crt0.asm deleted file mode 100644 index 55bf4f6f69..0000000000 --- a/programs/develop/ktcc/trunk/kx/src/crt/crt0.asm +++ /dev/null @@ -1,127 +0,0 @@ -; -; 2021, Edited by Coldy -; -; This module same as original crt0.asm, but cut: -; 1. virtual header block (hparams change to __app_params, hpath change to __app_path) -; 2. init heap of memory - not needed because 68.18 (68.19) init heap implicitly -; (it is does dll.obj) -; 3. loader (he lives in dll.obj) -; - -format ELF -section '.text' executable -public start -public start as '_start' - -extrn main -;include 'debug2.inc' -include '/../../../../../../proc32.inc' -include '/../../../../../../macros.inc' -__DEBUG__ = 0 - -__app_params equ 0x1C ; Pointer to program arguments -;__app_path equ 0x20 ; Pointer to program path - -start: -;DEBUGF 'Start programm\n' - - mov [argc], 0 - mov eax, [__app_params] - test eax, eax - jz .without_path - mov eax, path - cmp word ptr eax, 32fh ; '/#3' UTF8 - jne .without_path - mov word ptr eax, 12fh ; '/#1' fix to CP866 -.without_path: - mov esi, eax - call push_param -; retrieving parameters - mov esi, params - xor edx, edx ; dl - идёт параметр(1) или разделители(0) - ; dh - символ с которого начался параметр (1 кавычки, 0 остальное) - mov ecx, 1 ; cl = 1 - ; ch = 0 просто ноль -.parse: - lodsb - test al, al - jz .run - test dl, dl - jnz .findendparam - ;{если был разделитель - cmp al, ' ' - jz .parse ;загружен пробел, грузим следующий символ - mov dl, cl ;начинается параметр - cmp al, '"' - jz @f ;загружены кавычки - mov dh, ch ;параметр без кавычек - dec esi - call push_param - inc esi - jmp .parse - - @@: - mov dh, cl ;параметр в кавычеках - call push_param ;если не пробел значит начинается какой то параметр - jmp .parse ;если был разделитель} - -.findendparam: - test dh, dh - jz @f ; без кавычек - cmp al, '"' - jz .clear - jmp .parse - @@: - cmp al, ' ' - jnz .parse - -.clear: - lea ebx, [esi - 1] - mov [ebx], ch - mov dl, ch - jmp .parse - -.run: - push argv - push [argc] - call main -.exit: - xor eax,eax - dec eax - int 0x40 - dd -1 -.crash: - jmp .exit -;============================ -push_param: -;============================ -;parameters -; esi - pointer -;description -; procedure increase argc -; and add pointer to array argv -; procedure changes ebx - mov ebx, [argc] - cmp ebx, max_parameters - jae .dont_add - mov [argv+4*ebx], esi - inc [argc] -.dont_add: - ret - - -;============================== -public argc as '__argc' -public params as '__argv' -public path as '__path' - -section '.bss' -buf_len = 0x400 -max_parameters=0x20 -argc rd 1 -argv rd max_parameters -path rb buf_len -params rb buf_len - -;section '.data' -;include_debug_strings ; ALWAYS present in data section diff --git a/programs/develop/ktcc/trunk/kx/src/tests/kxtest.c b/programs/develop/ktcc/trunk/kx/src/tests/kxtest.c deleted file mode 100644 index f53e59a567..0000000000 --- a/programs/develop/ktcc/trunk/kx/src/tests/kxtest.c +++ /dev/null @@ -1,18 +0,0 @@ -// -// This sample show that KX extension supported or not - -#include - -int main(){ - - char* kx_ext = -#ifndef __KX__ - "not " -#endif - "supported" - ; - - printf("KX extension %s", kx_ext); - - return 0; -} \ No newline at end of file diff --git a/programs/develop/ktcc/trunk/kx/src/tests/kxtest.sh b/programs/develop/ktcc/trunk/kx/src/tests/kxtest.sh deleted file mode 100644 index 94fb434702..0000000000 --- a/programs/develop/ktcc/trunk/kx/src/tests/kxtest.sh +++ /dev/null @@ -1,3 +0,0 @@ -#SHS -../../../tcc ../src/tests/kxtest.c -o kxtest -I../../include -llibc -exit \ No newline at end of file