Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4366 → Rev 4367

/contrib/sdk/sources/Intel-2D/pixlib-uxa.c
57,6 → 57,7
if (service != 0)
return caps & hw_caps;
 
#ifndef BUILD_EBOX
service = get_service("DISPLAY");
if (service == 0)
goto fail;
84,6 → 85,7
(hw_caps & HW_VID_BLIT) != 0 ? "HW_VID_BLIT " : "");
 
return caps & hw_caps;
#endif
 
fail:
service = 0;
280,3 → 282,8
 
return 0;
};
 
int sna_create_mask()
{
return 0;
};
/contrib/sdk/sources/Intel-2D/pixlib.ver
0,0 → 1,22
LIBDRM {
global: DllStartup;
init_pixlib;
done_pixlib;
create_bitmap;
resize_bitmap;
destroy_bitmap;
lock_bitmap;
blit_bitmap;
fplay_blit_bitmap;
sna_bitmap_from_handle;
sna_blit_tex;
sna_create_mask;
sna_set_bo_handle;
 
local: __chkstk;
__chkstk_ms;
_alloca;
__uxa_lock;
_nm__tls_alloc;
*;
};
/contrib/sdk/sources/Intel-2D/uxa/uxa.c
60,11 → 60,6
 
int uxa_update_fb(struct intel_screen_private *intel);
 
int sna_create_mask()
{
return 0;
};
 
static void i830_done_composite(PixmapPtr dest)
{
intel_screen_private *intel = intel_get_screen_private();
/contrib/sdk/sources/cairo/Makefile.ebox
File deleted
\ No newline at end of file
/contrib/sdk/sources/cairo/Makefile
142,6 → 142,9
 
OBJECTS = $(patsubst %.c, src/%.o, $(SOURCES))
 
ifeq ($(findstring ebox,$(MAKECMDGOALS)),ebox)
CFLAGS+=-march=pentium-mmx
endif
 
# targets
 
148,6 → 151,7
 
all: $(LIBRARY).a $(LIBRARY).dll
 
ebox: $(LIBRARY).a $(LIBRARY).dll
 
$(LIBRARY).a: $(OBJECTS) Makefile
ar cvrs $(LIBRARY).a $(OBJECTS)
/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 -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
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
CXXFLAGS= -D__STDC_CONSTANT_MACROS
ASFLAGS= -I../newlib/include -U_Win32 -U_WIN32 -U__MINGW32__
AS_C=-c
/contrib/sdk/sources/freetype/Makefile.ebox
File deleted
\ No newline at end of file
/contrib/sdk/sources/freetype/Makefile
62,10 → 62,15
OBJECTS = $(patsubst %.c, %.o, $(SOURCES))
 
ifeq ($(findstring ebox,$(MAKECMDGOALS)),ebox)
CFLAGS+=-march=pentium-mmx
endif
 
# targets
 
all:lib$(LIBRARY).a $(LIBRARY).dll
 
ebox:lib$(LIBRARY).a $(LIBRARY).dll
 
lib$(LIBRARY).a: $(OBJECTS) Makefile
ar cvrs lib$(LIBRARY).a $(OBJECTS)
/contrib/sdk/sources/libpng/Makefile
20,11 → 20,13
 
DEFS = -DHAVE_CONFIG_H
 
 
LIBPNG_DEFINES = -DPNG_CONFIGURE_LIBPNG
 
DEFINES= $(DEFS) $(LIBPNG_DEFINES)
 
ifeq ($(findstring ebox,$(MAKECMDGOALS)),ebox)
CFLAGS+=-march=pentium-mmx
endif
 
 
SOURCES = png.c pngerror.c pngget.c pngmem.c pngpread.c \
41,6 → 43,7
 
all:$(LIBRARY).a $(LIBRARY).dll
 
ebox:$(LIBRARY).a $(LIBRARY).dll
 
$(LIBRARY).a: $(OBJECTS) Makefile
ar cvrs $(LIBRARY).a $(OBJECTS)
/contrib/sdk/sources/pixman/Makefile
53,11 → 53,17
OBJECTS = $(patsubst %.c, %.o, $(SOURCES))
 
ifeq ($(findstring ebox,$(MAKECMDGOALS)),ebox)
CFLAGS+=-march=pentium-mmx
endif
 
# targets
 
all:$(LIBRARY).a $(LIBRARY).dll
 
ebox:$(LIBRARY).a $(LIBRARY).dll
 
 
$(LIBRARY).a: $(OBJECTS) Makefile
ar cvrs $(LIBRARY).a $(OBJECTS)
mv -f $(LIBRARY).a ../../lib
/contrib/sdk/sources/zlib/Makefile
13,7 → 13,7
 
PREFIX =
CC = $(PREFIX)gcc
CFLAGS = $(LOC) -U_Win32 -U_WIN32 -U__MINGW32__ -O3 -Wall -fomit-frame-pointer
CFLAGS = $(LOC) -U_Win32 -U_WIN32 -U__MINGW32__ -O2 -Wall -fomit-frame-pointer
 
AS = $(CC)
ASFLAGS = $(LOC) -Wall
36,6 → 36,9
 
LIBS:= -ldll -lc.dll
 
ifeq ($(findstring ebox,$(MAKECMDGOALS)),ebox)
CFLAGS+=-march=pentium-mmx
endif
 
OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
43,6 → 46,7
 
all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) Makefile
 
ebox: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) Makefile
 
.c.o:
$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<