Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8545 → Rev 8581

/contrib/C_Layer/EXAMPLE/boxlib/Makefile
8,7 → 8,7
LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app.lds \
--image-base 0
 
CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__
CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__ -std=c99
 
INCLUDES = -I. -I$(SDK_DIR)/sources/newlib/libc/include
LIBPATH = -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
29,4 → 29,4
$(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $<
 
clean:
-rm -f *.o *.map
-rm -f *.o *.map $(NAME)
/contrib/C_Layer/EXAMPLE/img_example/Makefile
8,7 → 8,7
LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app.lds \
--image-base 0
 
CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -fno-ident -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32
CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -fno-ident -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -std=c99
 
INCLUDES= -I. -I$(SDK_DIR)/sources/newlib/libc/include -I$(CLAYER)/INCLUDE
LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
17,9 → 17,9
 
all:
$(CC) $(CFLAGS) $(INCLUDES) $(SOURCES) main.c
$(LD) $(LIBPATH) $(LDFLAGS) --subsystem native main.o $(OBJPATH)/loadlibimg.obj -o $(NAME) -lgcc -lc.dll
$(LD) $(LIBPATH) $(LDFLAGS) --subsystem native main.o $(OBJPATH)/loadlibimg.obj $(OBJPATH)/loadboxlib.obj -o $(NAME) -lgcc -lc.dll
strip -S $(NAME)
objcopy $(NAME) -O binary
 
clean:
-rm -f *.o
-rm -f *.o $(NAME)
/contrib/C_Layer/EXAMPLE/img_example/main.c
3,8 → 3,9
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <kos32sys.h>
#include <kolibri_gui.h>
#include <kolibri_libimg.h>
#include <kos32sys.h>
 
#define NEW_IMG_H 128
#define NEW_IMG_W 128
/contrib/C_Layer/EXAMPLE/kmenu/Makefile
8,7 → 8,7
LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app.lds \
--image-base 0 -lgcc -ldll -lc.dll
 
CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__ -std=gnu90
CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__ -std=c99
 
INCLUDES= -I. -I$(SDK_DIR)/sources/newlib/libc/include -I$(CLAYER)/INCLUDE
LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
29,4 → 29,4
$(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $<
 
clean:
-rm -f *.o *.map
-rm -f *.o *.map $(NAME)
/contrib/C_Layer/EXAMPLE/libguic_kolibri/Makefile
8,7 → 8,7
LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app-dynamic.lds \
--image-base 0 -lgcc -ldll -lc.dll
 
CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__ -std=gnu90 -mno-ms-bitfields
CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__ -std=c99 -mno-ms-bitfields
 
INCLUDES= -I. -I$(SDK_DIR)/sources/newlib/libc/include -I$(CLAYER)/INCLUDE
LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
47,4 → 47,4
$(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $<
 
clean:
-rm -f *.o
-rm -f *.o boardmsg boardmsg.map dbutton_files editor_tree_msgbox editor_tree_msgbox.map option_menu scroll_progress
/contrib/C_Layer/EXAMPLE/libguic_kolibri/editor_tree_msgbox.c
22,6 → 22,14
#include "kolibri_libimg.h"
#include "kolibri_msgbox.h"
 
/*extern inline scrollbar* kolibri_scrollbar(scrollbar* sb, uint32_t x_w, uint32_t y_h, uint32_t btn_height, uint32_t max_area,
uint32_t cur_area, uint32_t position, uint32_t back_color, uint32_t front_color, uint32_t line_color);
 
extern inline scrollbar* kolibri_new_scrollbar(uint32_t x_w, uint32_t y_h, uint32_t btn_height, uint32_t max_area,
uint32_t cur_area, uint32_t position, uint32_t back_color, uint32_t front_color, uint32_t line_color);
 
extern inline scrollbar* kolibri_new_scrollbar_def(uint32_t x_w, uint32_t y_h, uint32_t max_area, uint32_t cur_area, uint32_t position);
*/
char run_path[4096];
char fname[4096];
 
83,17 → 91,17
treelist *tl = kolibri_new_treelist(X_Y(0, 200), X_Y(200, 200), 16, X_Y(16, 16), 100, 50, 0, 0, /*TL_KEY_NO_EDIT |*/ TL_DRAW_PAR_LINE, &ed_lock, 0x8080ff, 0x0000ff, 0xffffff);
(*tl_data_init)(tl);
 
// ÷èòàåì ôàéë ñ êóðñîðàìè è ëèíèÿìè
// ������ ���� � ��������� � �������
strcpy(fname, run_path);
strcat(fname, "tl_sys_16.png");
tl->data_img_sys = load_image_file(fname);
 
// ÷èòàåì ôàéë ñ èêîíêàìè óçëîâ
// ������ ���� � �������� �����
strcpy(fname, run_path);
strcat(fname, "tl_nod_16.png");
tl->data_img = load_image_file(fname);
 
treelist_node_add(tl, "node1", 1, 0, 0); // ãäå 1 íîìåð èêîíêè ñ êíèãîé
treelist_node_add(tl, "node1", 1, 0, 0); // ��� 1 ����� ������ � ������
(*tl_cur_next)(tl);
treelist_node_add(tl, "node1.1", 1, 0, 1);
(*tl_cur_next)(tl);
110,7 → 118,7
treelist_node_add(tl, "node3", 1, 0, 0);
(*tl_cur_next)(tl);
 
(*tl_cur_beg)(tl); //;ñòàâèì êóðñîð íà íà÷àëî ñïèñêà
(*tl_cur_beg)(tl); //;������ ������ �� ������ ������
gui_add_treelist(main_window, tl);
 
// treelist as listbox, no caption, no icons
121,7 → 129,7
tl2->data_img_sys = tl->data_img_sys;
//tl2->data_img = tl->data_img; - no icons will be drawed
 
treelist_node_add(tl2, "list1", 0, 0, 0); // ãäå 1 íîìåð èêîíêè ñ êíèãîé
treelist_node_add(tl2, "list1", 0, 0, 0); // ��� 1 ����� ������ � ������
(*tl_cur_next)(tl2);
 
treelist_node_add(tl2, "list2", 0, 0, 0);
130,7 → 138,7
treelist_node_add(tl2, "list3", 0, 0, 0);
(*tl_cur_next)(tl2);
 
(*tl_cur_beg)(tl2); //;ñòàâèì êóðñîð íà íà÷àëî ñïèñêà
(*tl_cur_beg)(tl2); //;������ ������ �� ������ ������
gui_add_treelist(main_window, tl2);
 
msgbox* box = kolibri_new_msgbox("Exit", "Are\rYOU\rSure?", 3, "YES", "Absolute", "Not Yet", NULL); // default NOT
230,14 → 238,14
char *image_data = 0, *image_data_rgb = 0, *filedata = 0;
 
filedata = load_file_inmem(fname, &read_bytes);
// îïðåäåëÿåì âèä èçîáðàæåíèÿ è ïåðåâîäèì åãî âî âðåìåííûé áóôåð image_data
// ���������� ��� ����������� � ��������� ��� �� ��������� ����� image_data
image_data = (*img_decode)(filedata, read_bytes, 0);
w = *(int*)(image_data +4);
h = *(int*)(image_data +8);
image_data_rgb = malloc(w * h * 3);
// ïðåîáðàçóåì èçîáðàæåíèå ê ôîðìàòó rgb
// ����������� ����������� � ������� rgb
(*img_to_rgb2)(image_data, image_data_rgb);
// óäàëÿåì âðåìåííûé áóôåð image_data
// ������� ��������� ����� image_data
(*img_destroy)(image_data);
free(filedata);
 
/contrib/C_Layer/EXAMPLE/libguic_kolibri/option_menu.c
20,8 → 20,8
 
#define SCAN_CODE_ALTM 50
#define SCAN_CODE_ALTE 18
inline
uint32_t get_os_keyb_modifiers()
 
static inline uint32_t get_os_keyb_modifiers()
{
register uint32_t val;
__asm__ __volatile__(
43,8 → 43,7
#define KEY_LWIN 0x200
#define KEY_RWIN 0x400
 
inline
void set_os_keyb_mode(int mode)
static inline void set_os_keyb_mode(int mode)
// 0 - ASCII, 1 - SCAN
{
__asm__ __volatile__(
/contrib/C_Layer/EXAMPLE/rasterworks/Makefile
8,7 → 8,7
LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app.lds \
--image-base 0 -lgcc -ldll -lc.dll
 
CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__
CFLAGS = -g -U_Win32 -U_WIN32 -U__MINGW32__ -std=c99
 
INCLUDES= -I. -I$(SDK_DIR)/sources/newlib/libc/include -I$(CLAYER)/INCLUDE
LIBPATH:= -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
29,4 → 29,4
$(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $<
 
clean:
-rm -f *.o
-rm -f *.o $(NAME)