Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4361 → Rev 4362

/contrib/sdk/sources/cairo/cairo2.orig.def
File deleted
/contrib/sdk/sources/cairo/cairo2.def
File deleted
/contrib/sdk/sources/cairo/mem
File deleted
/contrib/sdk/sources/cairo/Makefile
5,7 → 5,7
CFLAGS = -c -O2 -ffast-math -Wall -Winline -Wno-attributes -fomit-frame-pointer
 
LD = ld
LDFLAGS = -shared -s -nostdlib -T ../newlib/dll.lds --entry _DllStartup --image-base=0 --output-def $(LIBRARY).orig.def --out-implib $(LIBRARY).dll.a
LDFLAGS = -shared -s -nostdlib -T ../newlib/dll.lds --entry _DllStartup --image-base=0 --version-script cairo.ver --output-def $(LIBRARY).orig.def --out-implib $(LIBRARY).dll.a
 
STRIP = $(PREFIX)strip
 
151,7 → 151,7
 
$(LIBRARY).a: $(OBJECTS) Makefile
ar cvrs $(LIBRARY).a $(OBJECTS)
mv -f $(LIBRARY).a ../../static
mv -f $(LIBRARY).a ../../lib
 
 
$(LIBRARY).dll: $(OBJECTS) Makefile
/contrib/sdk/sources/cairo/Makefile.ebox
5,7 → 5,7
CFLAGS = -c -O2 -march=pentium-mmx -ffast-math -Wall -Winline -Wno-attributes -fomit-frame-pointer
 
LD = ld
LDFLAGS = -shared -s -nostdlib -T ../newlib/dll.lds --entry _DllStartup --image-base=0 --output-def $(LIBRARY).orig.def --out-implib $(LIBRARY).dll.a
LDFLAGS = -shared -s -nostdlib -T ../newlib/dll.lds --entry _DllStartup --image-base=0 --version-script cairo.ver --output-def $(LIBRARY).orig.def --out-implib $(LIBRARY).dll.a
 
STRIP = $(PREFIX)strip
 
14,7 → 14,7
INCLUDES = -I. -I../newlib/include -I../pixman -I../zlib -I../libpng -I../freetype/include
 
 
LIBPATH:= -L../../import -L../../static
LIBPATH:= -L../../lib
 
LIBS:= -ldll -lgcc -lfreetype.dll -lz.dll -lpixman-1.dll -lpng16.dll -lc.dll
 
151,7 → 151,7
 
$(LIBRARY).a: $(OBJECTS) Makefile
ar cvrs $(LIBRARY).a $(OBJECTS)
mv -f $(LIBRARY).a ../../static
mv -f $(LIBRARY).a ../../lib
 
 
$(LIBRARY).dll: $(OBJECTS) Makefile
160,8 → 160,8
sed -e "s/ @[^ ]*//" $(LIBRARY).orig.def > $(LIBRARY).def
sed -f ../newlib/cmd1.sed $(LIBRARY).def > mem
sed -f ../newlib/cmd2.sed mem >$(LIBRARY).inc
mv -f $@ ../../lib
mv -f $(LIBRARY).dll.a ../../import
mv -f $@ ../../bin
mv -f $(LIBRARY).dll.a ../../lib
 
%.o : %.c
$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -o $@ $<
/contrib/sdk/sources/cairo/cairo.ver
0,0 → 1,10
LIBDRM {
global: DllStartup;
*;
local: __chkstk;
__chkstk_ms;
_alloca;
_nm____ctype_ptr__;
longjmp;
setjmp;
};
/contrib/sdk/sources/cairo/cairo2.inc
4,9 → 4,6
__cairo_contour_add_point,'__cairo_contour_add_point',\
__cairo_contour_remove_last_chain,'__cairo_contour_remove_last_chain',\
__cairo_no_compositor,'__cairo_no_compositor',\
__chkstk,'__chkstk',\
__chkstk_ms,'__chkstk_ms',\
_alloca,'_alloca',\
_cairo_analysis_surface_create,'_cairo_analysis_surface_create',\
_cairo_analysis_surface_get_bounding_box,'_cairo_analysis_surface_get_bounding_box',\
_cairo_analysis_surface_get_ctm,'_cairo_analysis_surface_get_ctm',\
781,7 → 778,6
_do_cairo_gstate_backend_to_user_distance,'_do_cairo_gstate_backend_to_user_distance',\
_do_cairo_gstate_user_to_backend,'_do_cairo_gstate_user_to_backend',\
_do_cairo_gstate_user_to_backend_distance,'_do_cairo_gstate_user_to_backend_distance',\
_nm____ctype_ptr__,'_nm____ctype_ptr__',\
_pixman_format_from_masks,'_pixman_format_from_masks',\
_pixman_format_to_masks,'_pixman_format_to_masks',\
_pixman_image_add_traps,'_pixman_image_add_traps',\
1115,5 → 1111,3
cairo_user_to_device_distance,'cairo_user_to_device_distance',\
cairo_version,'cairo_version',\
cairo_version_string,'cairo_version_string',\
longjmp,'longjmp',\
setjmp,'setjmp',\