Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4866 → Rev 4865

/contrib/sdk/sources/Intel-2D/Makefile
1,14 → 1,15
CC=gcc
LD = ld
AR= ar
 
LIBRARY= pixlib
 
CC = kos32-gcc
AR = kos32-ar
LD = kos32-ld
STRIP = kos32-strip
 
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -fomit-frame-pointer
 
STRIP = $(PREFIX)strip
 
LDFLAGS:= -shared -s -nostdlib -T ../newlib/dll.lds --entry _DllStartup --image-base=0
PXFLAGS:= --version-script pixlib.ver --out-implib $(LIBRARY).dll.a
PXFLAGS:= --version-script pixlib.ver --output-def $(LIBRARY).orig.def --out-implib $(LIBRARY).dll.a
SNAFLAGS:= --version-script sna.ver --output-def sna.def
UXAFLAGS:= --version-script uxa.ver --output-def uxa.def
20,6 → 21,7
 
DEFINES:= -DHAS_DEBUG_FULL=0 -DSHOW_BATCH=0 -DDEBUG_DUMP=0
 
 
SRC_PIXLIB = pixlib.c
 
SRC_SNA = \
64,7 → 66,6
OBJECTS= $(OBJ_SNA)
DEFINES+= -DBUILD_SNA
LIBS+= -lgcc
LIBPATH+= -L/home/autobuild/tools/win32/mingw32/lib
endif
endif
 
77,11 → 78,13
 
$(LIBRARY).dll: $(OBJ_PIXLIB) Makefile
$(LD) $(LDFLAGS) $(PXFLAGS) $(LIBPATH) -o $@ $(OBJ_PIXLIB) $(LIBS)
$(STRIP) $@
mv -f $@ ../../bin
mv -f $(LIBRARY).dll.a ../../lib
 
intel-sna.drv: $(OBJ_SNA) Makefile
$(LD) $(LDFLAGS) $(SNAFLAGS) $(LIBPATH) -o $@ $(OBJ_SNA) $(LIBS)
$(STRIP) $@
mv -f $@ ../../bin
 
intel-uxa.drv: $(OBJ_UXA) Makefile
/contrib/sdk/sources/Intel-2D/sna/sna.c
37,7 → 37,7
#include "config.h"
#endif
 
//#include <memory.h>
#include <memory.h>
#include <malloc.h>
#include "i915_pciids.h"
 
/contrib/sdk/sources/Intel-2D/sna/sna.h
46,7 → 46,7
#include "compiler.h"
 
 
//#include <memory.h>
#include <memory.h>
#include <malloc.h>
#include <errno.h>
#include <kos32sys.h>