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',\
/contrib/sdk/sources/ffmpeg/config.mak
34,7 → 34,7
CP=cp -p
LN_S=ln -s -f
CPPFLAGS= -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=32 -D_LARGEFILE_SOURCE -U__STRICT_ANSI__
CFLAGS= -I../newlib/include -U_Win32 -U_WIN32 -U__MINGW32__ -std=c99 -fomit-frame-pointer -Wdeclaration-after-statement -Wall -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -O2 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla
CFLAGS= -I../newlib/include -U_Win32 -U_WIN32 -U__MINGW32__ -std=c99 -march=pentium-mmx -fomit-frame-pointer -Wdeclaration-after-statement -Wall -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -O2 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla
CXXFLAGS= -D__STDC_CONSTANT_MACROS
ASFLAGS= -I../newlib/include -U_Win32 -U_WIN32 -U__MINGW32__
AS_C=-c
/contrib/sdk/sources/freetype/Makefile
69,7 → 69,7
 
lib$(LIBRARY).a: $(OBJECTS) Makefile
ar cvrs lib$(LIBRARY).a $(OBJECTS)
mv -f lib$(LIBRARY).a ../../static
mv -f lib$(LIBRARY).a ../../lib
 
$(LIBRARY).dll: lib$(LIBRARY).def $(OBJECTS) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ lib$(LIBRARY).def $(OBJECTS) $(LIBS)
/contrib/sdk/sources/freetype/Makefile.ebox
11,7 → 11,7
 
INCLUDES= -I../newlib/include -I./include -I./include/freetype/config
 
LIBPATH:= -L../../import -L../../static
LIBPATH:= -L../../lib
 
LIBS:= -ldll -lc.dll -lgcc
 
69,7 → 69,7
 
lib$(LIBRARY).a: $(OBJECTS) Makefile
ar cvrs lib$(LIBRARY).a $(OBJECTS)
mv -f lib$(LIBRARY).a ../../static
mv -f lib$(LIBRARY).a ../../lib
 
$(LIBRARY).dll: lib$(LIBRARY).def $(OBJECTS) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ lib$(LIBRARY).def $(OBJECTS) $(LIBS)
76,8 → 76,8
$(STRIP) $@
sed -f ../newlib/cmd1.sed lib$(LIBRARY).def > mem
sed -f ../newlib/cmd2.sed mem >$(LIBRARY).inc
mv -f $@ ../../lib
mv -f lib$(LIBRARY).dll.a ../../import
mv -f $@ ../../bin
mv -f lib$(LIBRARY).dll.a ../../lib
 
%.o : %.c Makefile
/contrib/sdk/sources/libpng/Makefile
44,7 → 44,7
 
$(LIBRARY).a: $(OBJECTS) Makefile
ar cvrs $(LIBRARY).a $(OBJECTS)
mv -f $(LIBRARY).a ../../static
mv -f $(LIBRARY).a ../../lib
 
$(LIBRARY).dll: libpng16.def $(OBJECTS) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ libpng16.def $(OBJECTS) $(LIBS)
/contrib/sdk/sources/libpng/Makefile.ebox
44,7 → 44,7
 
$(LIBRARY).a: $(OBJECTS) Makefile
ar cvrs $(LIBRARY).a $(OBJECTS)
mv -f $(LIBRARY).a ../../static
mv -f $(LIBRARY).a ../../lib
 
$(LIBRARY).dll: libpng16.def $(OBJECTS) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ libpng16.def $(OBJECTS) $(LIBS)
51,8 → 51,8
$(STRIP) $@
sed -f ../newlib/cmd1.sed libpng16.def > mem
sed -f ../newlib/cmd2.sed mem >libpng.inc
mv -f $@ ../../lib
mv -f $(LIBRARY).dll.a ../../import
mv -f $@ ../../bin
mv -f $(LIBRARY).dll.a ../../lib
 
 
%.o : %.c Makefile
/contrib/sdk/sources/newlib/Makefile.ebox
15,7 → 15,7
 
INCLUDES:= -I $(LIBC_INCLUDES)
 
LIBPATH:= -L ../../static
LIBPATH:= -L ../../lib
 
STATIC_SRCS:= \
crt/start.S \
380,10 → 380,10
sed -f newlib.sed mem > libc.inc
 
install: libc.dll libc.dll.a libapp.a libdll.a
mv -f libc.dll ../../lib
mv -f libc.dll.a ../../import
mv -f libapp.a ../../static
mv -f libdll.a ../../static
mv -f libc.dll ../../bin
mv -f libc.dll.a ../../lib
mv -f libapp.a ../../lib
mv -f libdll.a ../../lib
 
libapp.a: $(LIBCRT_OBJS) Makefile
$(AR) libapp.a $(LIBCRT_OBJS)
/contrib/sdk/sources/newlib/include/stdio.h.bak
File deleted
/contrib/sdk/sources/pixman/Makefile
60,7 → 60,7
 
$(LIBRARY).a: $(OBJECTS) Makefile
ar cvrs $(LIBRARY).a $(OBJECTS)
mv -f $(LIBRARY).a ../../static
mv -f $(LIBRARY).a ../../lib
 
$(LIBRARY).dll: $(LIBRARY).def $(OBJECTS) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ $(LIBRARY).def $(OBJECTS) $(LIBS)
/contrib/sdk/sources/pixman/Makefile.ebox
11,7 → 11,7
 
INCLUDES= -I. -I../newlib/include
 
LIBPATH:= -L../../import -L../../static
LIBPATH:= -L../../lib
 
LIBS:= -ldll -lc.dll -lgcc
 
60,7 → 60,7
 
$(LIBRARY).a: $(OBJECTS) Makefile
ar cvrs $(LIBRARY).a $(OBJECTS)
mv -f $(LIBRARY).a ../../static
mv -f $(LIBRARY).a ../../lib
 
$(LIBRARY).dll: $(LIBRARY).def $(OBJECTS) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ $(LIBRARY).def $(OBJECTS) $(LIBS)
67,8 → 67,8
$(STRIP) $@
sed -f ../newlib/cmd1.sed $(LIBRARY).def > mem
sed -f ../newlib/cmd2.sed mem >$(LIBRARY).inc
mv -f $@ ../../lib
mv -f lib$(LIBRARY).dll.a ../../import
mv -f $@ ../../bin
mv -f lib$(LIBRARY).dll.a ../../lib
 
%.o : %.c Makefile
/contrib/sdk/sources/zlib/Makefile
52,7 → 52,7
 
$(STATICLIB): $(OBJS) $(OBJA) Makefile
$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
mv -f libz.a ../../static
mv -f libz.a ../../lib
 
$(IMPLIB): $(SHAREDLIB)
 
/contrib/sdk/sources/zlib/Makefile.ebox
32,7 → 32,7
 
INCLUDES= -I../newlib/include
 
LIBPATH:= -L../../import -L../../static
LIBPATH:= -L../../lib
 
LIBS:= -ldll -lc.dll
 
52,7 → 52,7
 
$(STATICLIB): $(OBJS) $(OBJA) Makefile
$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
mv -f libz.a ../../static
mv -f libz.a ../../lib
 
$(IMPLIB): $(SHAREDLIB)
 
61,8 → 61,8
$(STRIP) $@
sed -f ../newlib/cmd1.sed zlib.def > mem
sed -f ../newlib/cmd2.sed mem >zlib.inc
mv -f zlib.dll ../../lib
mv -f libz.dll.a ../../import
mv -f zlib.dll ../../bin
mv -f libz.dll.a ../../lib
 
 
adler32.o: zlib.h zconf.h