Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4926 → Rev 4930

/contrib/sdk/sources/Intel-2D/Makefile
12,7 → 12,7
SNAFLAGS:= --version-script sna.ver --output-def sna.def
UXAFLAGS:= --version-script uxa.ver --output-def uxa.def
INCLUDES= -I. -I../libdrm/intel -I../libdrm/include/drm -I./render_program -I../pixman -I../newlib/include
INCLUDES= -I. -I../libdrm/intel -I../libdrm/include/drm -I./render_program -I../pixman -I../newlib/libc/include
 
LIBPATH:= -L../../lib
 
/contrib/sdk/sources/Intel-2D/sna/kgem.c
2744,7 → 2744,7
 
if (DEBUG_DUMP)
{
int fd = open("/tmp1/1/batchbuffer.bin", O_CREAT|O_WRONLY|O_BINARY);
int fd = open("/tmp1/1/batchbuffer.bin", O_CREAT|O_WRONLY);
if (fd != -1) {
ret = write(fd, kgem->batch, batch_end*sizeof(uint32_t));
fd = close(fd);
/contrib/sdk/sources/Intel-2D/sna/sna.h
46,7 → 46,7
#include "compiler.h"
 
 
//#include <memory.h>
#include <string.h>
#include <malloc.h>
#include <errno.h>
#include <kos32sys.h>
/contrib/sdk/sources/Intel-2D/sna/sna_stream.c
86,7 → 86,7
 
if (DEBUG_DUMP)
{
int fd = open("/tmp1/1/static.bin", O_CREAT|O_WRONLY|O_BINARY);
int fd = open("/tmp1/1/static.bin", O_CREAT|O_WRONLY);
if (fd != -1) {
write(fd, stream->data, stream->used);
close(fd);
/contrib/sdk/sources/Makefile
12,8 → 12,8
newlib: $(DLL_DIR)/libc.dll $(LIB_DIR)/libc.dll.a $(LIB_DIR)/libapp.a $(LIB_DIR)/libdll.a
 
$(DLL_DIR)/libc.dll $(LIB_DIR)/libc.dll.a $(LIB_DIR)/libapp.a $(LIB_DIR)/libdll.a:
$(MAKE) -C newlib shared
$(MAKE) -C newlib install
$(MAKE) -C newlib/libc shared
$(MAKE) -C newlib/libc install
 
#####################################
 
/contrib/sdk/sources/Mesa/Makefile
15,8 → 15,8
LDFLAGS = -nostdlib -shared -s --image-base 0 -T ../newlib/dll.lds -e _DllStartup
LDFLAGS+= --out-implib lib$(EGL).dll.a
 
INC_MESA= -I../newlib/include -I./include -I./src -I./src/glsl -I./src/mesa -I./src/mapi
INC_EGL= -I../newlib/include -I../../includes -I./include -I../libdrm -I../libdrm/include/drm -I./src/egl/main -I./src/gbm/backends/dri -I./src/gbm/main
INC_MESA= -I../newlib/libc/include -I./include -I./src -I./src/glsl -I./src/mesa -I./src/mapi
INC_EGL= -I../newlib/libc/include -I../../includes -I./include -I../libdrm -I../libdrm/include/drm -I./src/egl/main -I./src/gbm/backends/dri -I./src/gbm/main
 
LIBPATH:= -L../../lib -L/home/autobuild/tools/win32/mingw32/lib
 
/contrib/sdk/sources/Mesa/src/egl/Makefile
8,7 → 8,7
 
LDFLAGS = -nostdlib -shared -s --image-base 0 -T $(SRC_DIR)/newlib/dll.lds --out-implib libegl.dll.a -e _DllStartup
 
INC_EGL:= -I$(SRC_DIR)/newlib/include -I$(SDK_DIR)/includes -I$(SRC_DIR)/Mesa/include
INC_EGL:= -I$(SRC_DIR)/newlib/libc/include -I$(SDK_DIR)/includes -I$(SRC_DIR)/Mesa/include
INC_EGL+= -I$(SRC_DIR)/libdrm -I$(SRC_DIR)/libdrm/include/drm -I./main
INC_EGL+= -I$(MESA_SRC)/gbm/backends/dri -I$(MESA_SRC)/gbm/main
 
/contrib/sdk/sources/Mesa/src/glsl/Makefile
6,7 → 6,7
CFLAGS_OPT+= -fomit-frame-pointer -mno-ms-bitfields
CFLAGS = -c $(CFLAGS_OPT)
 
INC_MESA:= -I$(SRC_DIR)/newlib/include -I$(SRC_DIR)/Mesa/include
INC_MESA:= -I$(SRC_DIR)/newlib/libc/include -I$(SRC_DIR)/Mesa/include
INC_MESA+= -I./src -I$(MESA_SRC)/glsl -I$(MESA_SRC)/mesa -I$(MESA_SRC)/mapi
 
MESA_DEFS= -DMESA_DLL -DBUILD_GL32 -DMAPI_MODE_UTIL -DMAPI_TABLE_NUM_STATIC=87 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_SSE_ASM -DMAPI_TABLE_NUM_DYNAMIC=256
/contrib/sdk/sources/Mesa/src/mapi/Makefile
8,7 → 8,7
 
LDFLAGS = -nostdlib -shared -s --image-base 0 -T $(SRC_DIR)/newlib/dll.lds --out-implib libGL.dll.a -e _DllStartup
 
INC_MESA:= -I$(SRC_DIR)/newlib/include -I$(SRC_DIR)/Mesa/include
INC_MESA:= -I$(SRC_DIR)/newlib/libc/include -I$(SRC_DIR)/Mesa/include
INC_MESA+= -I./src -I$(MESA_SRC)/glsl -I$(MESA_SRC)/mesa -I$(MESA_SRC)/mapi
 
 
/contrib/sdk/sources/Mesa/src/mesa/Makefile
8,7 → 8,7
 
LDFLAGS = -nostdlib -shared -s --image-base 0 -T $(SRC_DIR)/newlib/dll.lds -e _DllStartup
 
INC_MESA:= -I$(SRC_DIR)/newlib/include -I$(SRC_DIR)/Mesa/include
INC_MESA:= -I$(SRC_DIR)/newlib/libc/include -I$(SRC_DIR)/Mesa/include
INC_MESA+= -I./ -I$(MESA_SRC)/glsl -I$(MESA_SRC)/mesa -I$(MESA_SRC)/mapi
INC_MESA+= -I$(SRC_DIR)/libdrm -I$(MESA_SRC) -I$(SRC_DIR)/expat/lib
INC_I965:= -I$(SRC_DIR)/libdrm/intel -I$(SRC_DIR)/libdrm/include/drm -I$(MESA_SRC)/mesa/drivers/dri/common
/contrib/sdk/sources/cairo/Makefile
14,7 → 14,7
 
DEFINES = -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -U_MSC_VER -DHAVE_CONFIG_H=1 -DCAIRO_NO_MUTEX=1
 
INCLUDES = -I. -I../newlib/include -I../pixman -I../zlib -I../libpng -I../freetype/include
INCLUDES = -I. -I../newlib/libc/include -I../pixman -I../zlib -I../libpng -I../freetype/include
 
LIBPATH:= -L../../lib -L/home/autobuild/tools/win32/mingw32/lib
 
/contrib/sdk/sources/eglut/Makefile
8,9 → 8,9
 
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -fomit-frame-pointer
 
INCLUDES= -I. -I../newlib/include -I../Mesa/include -I../Mesa/src/gbm/main -I../libdrm/include
INCLUDES= -I. -I../newlib/libc/include -I../Mesa/include -I../Mesa/src/gbm/main -I../libdrm/include
 
LDFLAGS:= -shared -s -nostdlib -T ../newlib/dll.lds --entry _DllStartup --image-base=0
LDFLAGS:= -shared -s -nostdlib -T ../newlib/libc/dll.lds --entry _DllStartup --image-base=0
LDFLAGS+= --out-implib $(IMPLIB)
 
LIBPATH:= -L../../lib
/contrib/sdk/sources/expat/Makefile
8,7 → 8,7
 
ARFLAGS = crs
 
INCLUDES= -I. -I../newlib/include
INCLUDES= -I. -I../newlib/libc/include
 
DEFS = -DHAVE_EXPAT_CONFIG_H
 
/contrib/sdk/sources/ffmpeg/config.mak
34,9 → 34,9
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 -I../zlib -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/libc/include -I../zlib -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__
ASFLAGS= -I../newlib/libc/include -U_Win32 -U_WIN32 -U__MINGW32__
AS_C=-c
AS_O=-o $@
CC_C=-c
/contrib/sdk/sources/freetype/Makefile
12,7 → 12,7
 
ARFLAGS = crs
 
INCLUDES= -I../newlib/include -I./include -I./include/freetype/config
INCLUDES= -I../newlib/libc/include -I./include -I./include/freetype/config
 
LIBPATH:= -L../../lib -L/home/autobuild/tools/win32/mingw32/lib
 
/contrib/sdk/sources/gcc_eh/Makefile
11,7 → 11,7
 
ARFLAG = crs
 
INCLUDES= -I. -I../newlib/include
INCLUDES= -I. -I../newlib/libc/include
 
LIBS:= -ldll -lc.dll
 
/contrib/sdk/sources/libdrm/Makefile
12,7 → 12,7
 
ARFLAGS = crs
 
INCLUDES= -I. -I./include/drm -I../newlib/include
INCLUDES= -I. -I./include/drm -I../newlib/libc/include
 
LIBPATH:= -L../../lib -L/home/autobuild/tools/win32/mingw32/lib
 
/contrib/sdk/sources/libpng/Makefile
12,7 → 12,7
ARFLAGS:= crs
 
INCLUDES= -I. -I../newlib/include -I../zlib
INCLUDES= -I. -I../newlib/libc/include -I../zlib
 
LIBPATH:= -L../../lib
 
/contrib/sdk/sources/libsupc++/Makefile
10,7 → 10,7
 
ARFLAGS= crs
 
INCLUDES= -I. -I../newlib/include
INCLUDES= -I. -I../newlib/libc/include
 
LIBS:= -ldll -lc.dll
 
/contrib/sdk/sources/newlib/libc/Makefile
1,5 → 1,4
 
 
CC = kos32-gcc
AR = kos32-ar
LD = kos32-ld
9,6 → 8,7
#LDFLAGS+= --output-def libc.orig.def
ARFLAGS = crs
 
SDK_DIR:= $(abspath ../../..)
 
LIBC_TOPDIR = .
LIBC_INCLUDES = $(LIBC_TOPDIR)/include
19,7 → 19,7
 
INCLUDES:= -I $(LIBC_INCLUDES)
 
LIBPATH:= -L../../lib -L/home/autobuild/tools/win32/mingw32/lib
LIBPATH:= -L$(SDK_DIR)/lib -L/home/autobuild/tools/win32/mingw32/lib
 
STATIC_SRCS:= \
crt/start.S \
400,10 → 400,10
#sed -f newlib.sed mem > libc.inc
 
install: libc.dll libc.dll.a libapp.a libdll.a
mv -f libc.dll ../../bin
mv -f libc.dll.a ../../lib
mv -f libapp.a ../../lib
mv -f libdll.a ../../lib
mv -f libc.dll $(SDK_DIR)/bin
mv -f libc.dll.a $(SDK_DIR)/lib
mv -f libapp.a $(SDK_DIR)/lib
mv -f libdll.a $(SDK_DIR)/lib
 
libapp.a: $(LIBCRT_OBJS) Makefile
$(AR) $(ARFLAGS) libapp.a $(LIBCRT_OBJS)
/contrib/sdk/sources/newlib/libc/Makefile.ebox
1,11 → 1,14
 
CC = gcc
AR = ar rc
LD = ld
CC = kos32-gcc
AR = kos32-ar
LD = kos32-ld
 
CFLAGS = -c -O2 -march=pentium-mmx -fomit-frame-pointer -DBUILD_DLL
CFLAGS = -c -O2 -march=pentium-mmx -fomit-frame-pointer -DBUILD_DLL -DMISSING_SYSCALL_NAMES
LDFLAGS = -nostdlib -shared -s -T libcdll.lds --output-def libc.orig.def --out-implib libc.dll.a --image-base 0
ARFLAGS = crs
 
SDK_DIR:= $(abspath ../../..)
 
LIBC_TOPDIR = .
LIBC_INCLUDES = $(LIBC_TOPDIR)/include
 
15,7 → 18,7
 
INCLUDES:= -I $(LIBC_INCLUDES)
 
LIBPATH:= -L ../../lib
LIBPATH:= -L$(SDK_DIR)/lib -L/home/autobuild/tools/win32/mingw32/lib
 
STATIC_SRCS:= \
crt/start.S \
54,7 → 57,6
crt/thread.S \
crt/tls.S \
crt/setjmp.S \
crt/assert.c \
crt/cpu_features.c \
ctype/ctype_.c \
ctype/isascii.c \
93,28 → 95,43
errno/errno.c \
locale/locale.c \
locale/lctype.c \
locale/ldpart.c \
reent/impure.c \
reent/init_reent.c \
reent/getreent.c \
reent/mutex.c \
reent/gettimeofdayr.c \
reent/hdlman.c \
reent/isattyr.c \
reent/openr.c \
reent/closer.c \
reent/linkr.c \
reent/readr.c \
reent/lseekr.c \
reent/fstatr.c \
reent/writer.c \
reent/timesr.c \
reent/unlinkr.c \
search/qsort.c \
search/bsearch.c \
signal/signal.c \
sys/close.c \
sys/create.c \
sys/delete.c \
sys/errno.c \
sys/finfo.c \
sys/fsize.c \
sys/fstat.c \
sys/gettod.c \
sys/io.c \
sys/ioread.c \
sys/iowrite.c \
sys/isatty.c \
sys/lseek.c \
sys/open.c \
sys/read.c \
sys/unlink.c \
sys/write.c \
sys/fsize.c \
sys/io_alloc.S \
time/asctime.c \
time/asctime_r.c \
time/clock.c \
130,6 → 147,7
time/lcltime_r.c \
time/strftime.c \
time/time.c \
time/timelocal.c \
time/tzlock.c \
time/tzvars.c
 
139,6 → 157,8
__call_atexit.c \
abort.c \
abs.c \
assert.c \
atexit.c \
atof.c \
atoi.c \
atol.c \
248,7 → 268,6
refill.c \
rget.c \
remove.c \
rename.c \
setvbuf.c \
stdio.c \
tmpfile.c \
374,28 → 393,28
 
 
$(NAME).dll: $(LIB_OBJS) $(SRC_DEP) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ $(LIB_OBJS) --version-script libc.ver
sed -e "s/ @[^ ]*//" libc.orig.def > libc.def
sed -f cmd2.sed libc.def > mem
sed -f newlib.sed mem > libc.inc
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ $(LIB_OBJS) -lgcc --version-script libc.ver
#sed -e "s/ @[^ ]*//" libc.orig.def > libc.def
#sed -f cmd2.sed libc.def > mem
#sed -f newlib.sed mem > libc.inc
 
install: libc.dll libc.dll.a libapp.a libdll.a
mv -f libc.dll ../../bin
mv -f libc.dll.a ../../lib
mv -f libapp.a ../../lib
mv -f libdll.a ../../lib
mv -f libc.dll $(SDK_DIR)/bin
mv -f libc.dll.a $(SDK_DIR)/lib
mv -f libapp.a $(SDK_DIR)/lib
mv -f libdll.a $(SDK_DIR)/lib
 
libapp.a: $(LIBCRT_OBJS) Makefile
$(AR) libapp.a $(LIBCRT_OBJS)
$(AR) $(ARFLAGS) libapp.a $(LIBCRT_OBJS)
 
libdll.a: $(LIBDLL_OBJS) Makefile
$(AR) libdll.a $(LIBDLL_OBJS)
$(AR) $(ARFLAGS) libdll.a $(LIBDLL_OBJS)
 
 
static: $(NAME).a
 
$(NAME).a: $(LIB_OBJS) $(SRC_DEP) Makefile
$(AR) $(NAME).a $(LIB_OBJS)
$(AR) $(ARFLAGS) $(NAME).a $(LIB_OBJS)
 
 
 
/contrib/sdk/sources/newlib/libc/crt/emutls.c
26,6 → 26,7
 
#include <stdlib.h>
#include <malloc.h>
#include <string.h>
#include <errno.h>
#include <gthr.h>
 
/contrib/sdk/sources/newlib/libc/include/assert.h
2,6 → 2,9
assert.h
*/
 
#ifndef __ASSERT_H__
#define __ASSERT_H__
 
#ifdef __cplusplus
extern "C" {
#endif
48,3 → 51,5
#ifdef __cplusplus
}
#endif
 
#endif /* __ASSERT_H__ */
/contrib/sdk/sources/newlib/libc/include/inttypes.h
177,8 → 177,8
#define __PRI64(x) __STRINGIFY(l##x)
#define __SCN64(x) __STRINGIFY(l##x)
#elif __have_longlong64
#define __PRI64(x) __STRINGIFY(ll##x)
#define __SCN64(x) __STRINGIFY(ll##x)
#define __PRI64(x) __STRINGIFY(I64##x)
#define __SCN64(x) __STRINGIFY(I64##x)
#else
#define __PRI64(x) __STRINGIFY(x)
#define __SCN64(x) __STRINGIFY(x)
/contrib/sdk/sources/newlib/libc/include/stdint.h
35,6 → 35,7
#define __have_long64 1
#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff && !defined(__SPU__)
#define __have_long32 1
#define __have_long64 0
#endif
 
#ifdef ___int8_t_defined
/contrib/sdk/sources/newlib/libc/include/sys/stat.h
142,8 → 142,6
#define UTIME_OMIT -1L
#endif
 
int _EXFUN(chmod,( const char *__path, mode_t __mode ));
int _EXFUN(fchmod,(int __fd, mode_t __mode));
int _EXFUN(fstat,( int __fd, struct stat *__sbuf ));
int _EXFUN(mkdir,( const char *_path, mode_t __mode ));
int _EXFUN(mkfifo,( const char *__path, mode_t __mode ));
/contrib/sdk/sources/pixman/Makefile
12,7 → 12,7
 
ARFLAGS = cvrs
 
INCLUDES= -I. -I../newlib/include
INCLUDES= -I. -I../newlib/libc/include
 
LIBPATH:= -L../../lib -L/home/autobuild/tools/win32/mingw32/lib
 
/contrib/sdk/sources/pixman/Makefile.ebox
9,7 → 9,7
 
STRIP = $(PREFIX)strip
 
INCLUDES= -I. -I../newlib/include
INCLUDES= -I. -I../newlib/libc/include
 
LIBPATH:= -L../../lib
 
/contrib/sdk/sources/render/Makefile
6,7 → 6,7
 
AR= ar
 
INCLUDES= -I. -I../newlib/include -I../Mesa/include -I../libdrm/include/drm
INCLUDES= -I. -I../newlib/libc/include -I../Mesa/include -I../libdrm/include/drm
 
LIBPATH:= -L../../lib
 
/contrib/sdk/sources/zlib/Makefile
16,7 → 16,7
AR = kos32-ar
STRIP = kos32-strip
 
CFLAGS = $(LOC) -U_Win32 -U_WIN32 -U__MINGW32__ -O2 -Wall -fomit-frame-pointer
CFLAGS = $(LOC) -DHAVE_UNISTD_H -U_Win32 -U_WIN32 -U__MINGW32__ -O2 -Wall -fomit-frame-pointer
 
AS = $(CC)
ASFLAGS = $(LOC) -Wall
27,7 → 27,7
 
LDFLAGS:= -shared -s -nostdlib -T ../newlib/dll.lds --entry _DllStartup --image-base=0 --out-implib $(IMPLIB)
 
INCLUDES= -I../newlib/include
INCLUDES= -I../newlib/libc/include
 
LIBPATH:= -L../../lib
 
/contrib/sdk/sources/zlib/Makefile.ebox
30,7 → 30,7
 
LDFLAGS:= -shared -s -nostdlib -T ../newlib/dll.lds --entry _DllStartup --image-base=0 --out-implib $(IMPLIB)
 
INCLUDES= -I../newlib/include
INCLUDES= -I../newlib/libc/include
 
LIBPATH:= -L../../lib