Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6535 → Rev 6534

/contrib/C_Layer/ASM/loadboxlib.asm
17,10 → 17,8
;;; Returns 0 on success. -1 on failure.
 
proc init_boxlib
pusha
mcall 68,11
stdcall dll.Load, @IMPORT
popa
ret
endp
60,9 → 58,9
menu_bar_draw, 'menu_bar_draw' , \
menu_bar_mouse, 'menu_bar_mouse' , \
menu_bar_activate, 'menu_bar_activate' , \
fb_draw_panel, 'FileBrowser_draw' , \
fb_mouse, 'FileBrowser_mouse' , \
fb_key, 'FileBrowser_key' , \
fb_draw_panel, 'filebrowser_draw' , \
fb_mouse, 'filebrowser_mouse' , \
fb_key, 'filebrowser_key' , \
tl_data_init, 'tl_data_init' , \
tl_data_clear, 'tl_data_clear' , \
tl_info_clear, 'tl_info_clear' , \
152,7 → 150,3
 
public path_show_prepare as '_path_show_prepare'
public path_show_draw as '_path_show_draw'
 
public fb_draw_panel as '_filebrowse_draw'
public fb_mouse as '_filebrowse_mouse'
public fb_key as '_filebrowse_key'
/contrib/C_Layer/ASM/loadbuf2d.asm
14,10 → 14,8
;;; Returns 0 on success. -1 on failure.
 
proc init_buf2d
pusha
mcall 68,11
stdcall dll.Load, @IMPORT
popa
ret
endp
 
/contrib/C_Layer/ASM/loadhttp.asm
21,10 → 21,8
;;; Returns 0 on success. -1 on failure.
 
proc init_network
pusha
mcall 68,11
stdcall dll.Load, @IMPORT
popa
ret
endp
/contrib/C_Layer/ASM/loadkmenu.asm
13,10 → 13,8
;;; Returns 0 on success. -1 on failure.
 
proc init_kmenu
pusha
mcall 68,11
stdcall dll.Load, @IMPORT
popa
ret
endp
/contrib/C_Layer/ASM/loadlibimg.asm
14,10 → 14,8
;;; Returns 0 on success. -1 on failure.
 
proc init_libimg
pusha
mcall 68,11
stdcall dll.Load, @IMPORT
popa
ret
endp
 
/contrib/C_Layer/ASM/loadlibini.asm
15,10 → 15,8
;;; Returns 0 on success. -1 on failure.
 
proc init_libini
pusha
mcall 68,11
stdcall dll.Load, @IMPORT
popa
ret
endp
/contrib/C_Layer/ASM/loadproclib.asm
14,10 → 14,8
;;; Returns 0 on success. -1 on failure.
 
proc init_proclib
pusha
mcall 68,11
stdcall dll.Load, @IMPORT
popa
ret
endp
 
/contrib/C_Layer/ASM/loadrasterworks.asm
15,10 → 15,8
;;; Returns 0 on success. -1 on failure.
 
proc init_rasterworks
pusha
mcall 68,11
stdcall dll.Load, @IMPORT
popa
ret
endp
/contrib/C_Layer/EXAMPLE/libguic_kolibri/Makefile482
File deleted
/contrib/C_Layer/EXAMPLE/libguic_kolibri/Makefile
5,13 → 5,13
SDK_DIR:= $(abspath ../../../sdk)
CLAYER:= $(abspath ../../)
 
LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/lib/app-dynamic.lds \
--image-base 0 -lgcc -ldll -lc.dll
LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app.lds \
--image-base 0 -lgcc -ldll -lc.dll -lapp
 
CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__ -std=gnu90
CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__
 
INCLUDES= -I. -I$(SDK_DIR)/sources/newlib/libc/include -I$(CLAYER)/INCLUDE
LIBPATH:= -L $(SDK_DIR)/lib
LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
 
OBJPATH = $(CLAYER)/OBJ
 
/contrib/C_Layer/EXAMPLE/libguic_kolibri/dbutton_files.c
22,7 → 22,7
#include "kolibri_libimg.h"
 
char temp_path[4096];
char** sys_path = (char**)0x20; // hack - get path from KOS header. analog argv[0]
char** sys_path = (char**)0x20; // hack - get path from KOS header
 
int main(int argc, char **argv)
{
48,7 → 48,7
*image_data, *pc;
// make full path + argv
strcpy(temp_path, *sys_path);
pc = strrchr(temp_path, '/'); // this fails if has params with '/' within. use argv[0] instead
pc = strrchr(temp_path, '/');
if (pc) pc[1] = 0;
strcat(temp_path, "reload_16x16_8b.png");
debug_board_write_str(temp_path);
/contrib/C_Layer/INCLUDE/kolibri_filebrowse.h
File deleted
/contrib/C_Layer/INCLUDE/kolibri_menubar.h
40,7 → 40,7
} menubar;
 
 
static inline menubar* kolibri_menubar(menubar* bar, uint32_t x_w, uint32_t y_h, uint16_t sub_w, uint16_t sub_h, char **menutext,
inline menubar* kolibri_menubar(menubar* bar, uint32_t x_w, uint32_t y_h, uint16_t sub_w, uint16_t sub_h, char **menutext,
color_t sel_font, color_t unsel_font, color_t top_bg, color_t top_select, color_t sub_bg, color_t sub_select)
{
static char procinfo[1024];