KolibriOS/kolibrios
13
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

update makefiles

Browse Source 
git-svn-id: svn://kolibrios.org@6668 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2016-11-04 06:36:45 +00:00
parent 9dafb230e4
commit 78cec47872
8 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/sdk/sources/Makefile
View File

@ -6,7 +6,7 @@ LIB_DIR:= /home/autobuild/tools/win32/lib
# targets
all: libsync newlib zlib libpng libjpeg freetype pixman cairo \
libdrm pixlib ffmpeg libsupc++ libstdc++ expat \
libdrm pixlib ffmpeg expat \
Mesa eglut vaapi sound
libsync: $(LIB_DIR)/libsync.a
@ -133,7 +133,7 @@ Mesa: $(DLL_DIR)/libGL.dll $(DLL_DIR)/libegl.dll $(DLL_DIR)/i965_dri.drv
$(DLL_DIR)/libGL.dll $(DLL_DIR)/libegl.dll $(DLL_DIR)/i965_dri.drv \
$(LIB_DIR)/libGL.dll.a $(LIB_DIR)/libegl.dll.a \
$(LIB_DIR)/libglsl.a: newlib libdrm libsupc++ expat
$(LIB_DIR)/libglsl.a: newlib libdrm expat
$(MAKE) -C Mesa/mesa-9.2.5
#####################################

12
contrib/sdk/sources/pixlib-3/Makefile
View File

@ -5,9 +5,11 @@ AR = kos32-ar
LD = kos32-ld
STRIP = kos32-strip
INSTALLDIR:= /home/autobuild/tools/win32/lib
ARFLAGS = crs
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -fno-ident -fomit-frame-pointer
LDFLAGS:= -shared -s -nostdlib -Map px.map -T ../newlib/dll.lds --entry _DllStartup --image-base=0
LDFLAGS:= -shared -s -Map px.map -T dll.lds --entry _DllStartup --image-base=0
LDFLAGS+= --file-alignment 256
INCLUDES= -I. -I../newlib/libc/include
@ -15,9 +17,7 @@ INCLUDES= -I. -I../newlib/libc/include
PXGL_INCLUDES= $(INCLUDES) -I../libdrm/intel -I../libdrm/include
PXGL_INCLUDES+= -I ../Mesa/mesa-9.2.5/include -I../Mesa/mesa-9.2.5/src/gbm/main
LIBPATH:= -L../../lib -L/home/autobuild/tools/win32/mingw32/lib
LIBS:= -ldll -legl.dll -lGL.dll -lc.dll -lgcc
LIBS:= -ldll -legl.dll -lGL.dll -lgcc -lc.dll
#LIBS+= -ldrm.dll
DEFINES:= -DNDEBUG
@ -35,10 +35,10 @@ all: lib$(LIBRARY).a pixlib-gl.dll
lib$(LIBRARY).a: $(OBJ_PIXLIB) Makefile
$(AR) $(ARFLAGS) lib$(LIBRARY).a $(OBJ_PIXLIB)
mv -f lib$(LIBRARY).a ../../lib
mv -f lib$(LIBRARY).a $(INSTALLDIR)
pixlib-gl.dll: $(OBJ_PXGL) Makefile
$(LD) $(LDFLAGS) $(PXFLAGS) $(LIBPATH) -o $@ $(OBJ_PXGL) $(LIBS)
$(LD) $(LDFLAGS) $(PXFLAGS) -o $@ $(OBJ_PXGL) $(LIBS)
mv -f $@ ../../bin
pixlib3.o : pixlib3.c Makefile

20
contrib/sdk/sources/pixlib-3/pxgl.c
View File

@ -807,7 +807,7 @@ static int hw_blit(bitmap_t *bitmap, int dst_x, int dst_y,
state = *(uint8_t*)(proc_info+70);
if(state & (WIN_STATE_MINIMIZED|WIN_STATE_ROLLED))
return;
return 0;
winx = *(uint32_t*)(proc_info+34);
winy = *(uint32_t*)(proc_info+38);
@ -818,7 +818,7 @@ static int hw_blit(bitmap_t *bitmap, int dst_x, int dst_y,
if( 0 != drm_ioctl(px->fd, SRV_FBINFO, &fb))
{
DBG("failed to get framebuffer info\n");
return;
return 0;
};
if( fb.width != px->scr_width ||
@ -830,7 +830,7 @@ static int hw_blit(bitmap_t *bitmap, int dst_x, int dst_y,
eglDestroyImageKHR(px->dpy, px->screen);
if(update_fb(px, fb.name, fb.pitch))
return;
return 0;
};
update.handle = px->mask.handle;
@ -843,7 +843,7 @@ static int hw_blit(bitmap_t *bitmap, int dst_x, int dst_y,
if(drm_ioctl(px->fd, SRV_MASK_UPDATE_EX, &update))
{
return;
return 0;
}
xscale = 1.0/px->scr_width;
@ -886,7 +886,7 @@ static int hw_blit(bitmap_t *bitmap, int dst_x, int dst_y,
glFlush();
return;
return 0;
};
static int hw_blit_planar(planar_t *planar, int dst_x, int dst_y,
@ -905,7 +905,7 @@ static int hw_blit_planar(planar_t *planar, int dst_x, int dst_y,
state = *(uint8_t*)(proc_info+70);
if(state & (WIN_STATE_MINIMIZED|WIN_STATE_ROLLED))
return;
return 0;
winx = *(uint32_t*)(proc_info+34);
winy = *(uint32_t*)(proc_info+38);
@ -916,7 +916,7 @@ static int hw_blit_planar(planar_t *planar, int dst_x, int dst_y,
if( 0 != drm_ioctl(px->fd, SRV_FBINFO, &fb))
{
DBG("failed to get framebuffer info\n");
return;
return 0;
};
if( fb.width != px->scr_width ||
@ -928,7 +928,7 @@ static int hw_blit_planar(planar_t *planar, int dst_x, int dst_y,
eglDestroyImageKHR(px->dpy, px->screen);
if(update_fb(px, fb.name, fb.pitch))
return;
return 0;
};
update.handle = px->mask.handle;
@ -941,7 +941,7 @@ static int hw_blit_planar(planar_t *planar, int dst_x, int dst_y,
if(drm_ioctl(px->fd, SRV_MASK_UPDATE_EX, &update))
{
return;
return 0;
}
xscale = 1.0/px->scr_width;
@ -988,7 +988,7 @@ static int hw_blit_planar(planar_t *planar, int dst_x, int dst_y,
glFlush();
return;
return 0;
};
static int hw_create_client(int x, int y, uint32_t width, uint32_t height)

14
contrib/sdk/sources/pixman/Makefile
View File

@ -5,18 +5,18 @@ AR = kos32-ar
LD = kos32-ld
STRIP = kos32-strip
INSTALLDIR:= /home/autobuild/tools/win32/lib
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -Wall -Winline -fno-ident -fomit-frame-pointer
LDFLAGS = -shared -s -nostdlib -T ../newlib/dll.lds --entry _DllStartup --image-base=0
LDFLAGS = -shared -s -T dll.lds --entry _DllStartup --image-base=0
LDFLAGS+= --out-implib lib$(LIBRARY).dll.a
ARFLAGS = cvrs
INCLUDES= -I. -I../newlib/libc/include
LIBPATH:= -L../../lib -L/home/autobuild/tools/win32/mingw32/lib
LIBS:= -ldll -lc.dll -lgcc
LIBS:= -ldll -lgcc -lc.dll
#DEFINES = -DHAVE_CONFIG_H -DPIXMAN_NO_TLS
DEFINES = -DHAVE_CONFIG_H
@ -68,14 +68,14 @@ ebox:$lib(LIBRARY).a $(LIBRARY).dll
lib$(LIBRARY).a: $(OBJECTS) Makefile
$(AR) $(ARFLAGS) lib$(LIBRARY).a $(OBJECTS)
mv -f lib$(LIBRARY).a ../../lib
mv -f lib$(LIBRARY).a $(INSTALLDIR)
$(LIBRARY).dll: $(LIBRARY).def $(OBJECTS) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ $(LIBRARY).def $(OBJECTS) $(LIBS)
$(LD) $(LDFLAGS) -o $@ $(LIBRARY).def $(OBJECTS) $(LIBS)
#sed -f ../newlib/cmd1.sed $(LIBRARY).def > mem
#sed -f ../newlib/cmd2.sed mem >$(LIBRARY).inc
mv -f $@ ../../bin
mv -f lib$(LIBRARY).dll.a ../../lib
mv -f lib$(LIBRARY).dll.a $(INSTALLDIR)
%.o : %.c Makefile

4
contrib/sdk/sources/sound/Makefile
View File

@ -2,6 +2,8 @@
AR = kos32-ar
FASM:= fasm
INSTALLDIR:= /home/autobuild/tools/win32/lib
TARGET:= libsound
dirs := ./src
@ -18,4 +20,4 @@ all: $(TARGET).a
$(TARGET).a: $(target_objs) Makefile
$(AR) cvrs $@ $(target_objs)
mv -f $@ ../../lib
mv -f $@ $(INSTALLDIR)

12
contrib/sdk/sources/vaapi/intel-driver-1.6.2/Makefile
View File

@ -8,17 +8,15 @@ STRIP = kos32-strip
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -Wall -Winline -fno-ident
CFLAGS+= -mno-ms-bitfields -fomit-frame-pointer
LDFLAGS = -shared -s -nostdlib -T ../../newlib/dll.lds --entry _DllStartup --image-base=0
LDFLAGS+= --version-script i965-video.ver --out-implib lib$(LIBRARY).dll.a
LDFLAGS = -shared -s -T dll.lds --entry _DllStartup --image-base=0
LDFLAGS+= --version-script i965-video.ver
ARFLAGS = crs
INCLUDES= -I../../newlib/libc/include -I../../libdrm -I../../libdrm/intel -I../../libdrm/include/drm
INCLUDES+= -I../libva-1.6.2
LIBPATH:= -L../../../lib -L/home/autobuild/tools/win32/mingw32/lib
LIBS:= -ldll -ldrm -lc.dll -lgcc
LIBS:= -ldll -ldrm.dll -lgcc -lc.dll
DEFINES:= -DHAVE_CONFIG_H
@ -77,11 +75,9 @@ OBJECTS = $(patsubst %.c, %.o, $(SOURCES))
all: $(LIBRARY).dll
$(LIBRARY).dll: $(OBJECTS) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ $(OBJECTS) $(LIBS)
$(LD) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
$(STRIP) $@
mv -f $@ ../../../bin
mv -f lib$(LIBRARY).dll.a ../../../lib
%.o : %.c Makefile
$(CC) $(INCLUDES) $(CFLAGS) $(DEFINES) -o $@ $<

12
contrib/sdk/sources/vaapi/libva-1.6.2/Makefile
View File

@ -5,10 +5,12 @@ AR = kos32-ar
LD = kos32-ld
STRIP = kos32-strip
INSTALLDIR:= /home/autobuild/tools/win32/lib
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -Wall -Winline -fno-ident
CFLAGS+= -mno-ms-bitfields -fomit-frame-pointer -Wno-attributes -Wno-unused
LDFLAGS = -shared -s -nostdlib -T ../../newlib/dll.lds --entry _DllStartup --image-base=0
LDFLAGS = -shared -s -T dll.lds --entry _DllStartup --image-base=0
LDFLAGS+= --out-implib $(LIBRARY).dll.a
ARFLAGS = crs
@ -16,9 +18,7 @@ ARFLAGS = crs
INCLUDES= -I../../newlib/libc/include -I../../libdrm -I../../libdrm/intel -I../../libdrm/include/drm
INCLUDES+= -I. -I./va
LIBPATH:= -L../../../lib -L/home/autobuild/tools/win32/mingw32/lib
LIBS:= -ldll -ldrm -lc.dll -lgcc
LIBS:= -ldll -ldrm.dll -lgcc -lc.dll
DEFINES:= -DHAVE_CONFIG_H
@ -39,10 +39,10 @@ OBJECTS = $(patsubst %.c, %.o, $(SOURCES))
all: $(LIBRARY).dll
$(LIBRARY).dll: $(OBJECTS) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ $(OBJECTS) $(LIBS)
$(LD) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
$(STRIP) $@
mv -f $@ ../../../bin
mv -f $(LIBRARY).dll.a ../../../lib
mv -f $(LIBRARY).dll.a $(INSTALLDIR)
%.o : %.c Makefile

12
contrib/sdk/sources/zlib/Makefile
View File

@ -16,6 +16,8 @@ LD = kos32-ld
AR = kos32-ar
STRIP = kos32-strip
INSTALLDIR:= /home/autobuild/tools/win32/lib
CFLAGS = $(LOC) -DHAVE_UNISTD_H -U_Win32 -U_WIN32 -U__MINGW32__ -O2 -Wall -fno-ident -fomit-frame-pointer
AS = $(CC)
@ -25,12 +27,10 @@ LDFLAGS = $(LOC)
ARFLAGS = rcs
LDFLAGS:= -shared -s -nostdlib -T ../newlib/dll.lds --entry _DllStartup --image-base=0 --out-implib $(IMPLIB)
LDFLAGS:= -shared -s -T dll.lds --entry _DllStartup --image-base=0 --out-implib $(IMPLIB)
INCLUDES= -I../newlib/libc/include
LIBPATH:= -L../../lib
LIBS:= -ldll -lc.dll
ifeq ($(findstring ebox,$(MAKECMDGOALS)),ebox)
@ -53,17 +53,17 @@ ebox: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) Makefile
$(STATICLIB): $(OBJS) $(OBJA) Makefile
$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
mv -f libz.a ../../lib
mv -f libz.a $(INSTALLDIR)
$(IMPLIB): $(SHAREDLIB)
$(SHAREDLIB): zlib.def $(OBJS) $(OBJA) Makefile
$(LD) $(LDFLAGS) $(LIBPATH) -o $@ zlib.def $(OBJS) $(OBJA) $(LIBS)
$(LD) $(LDFLAGS) -o $@ zlib.def $(OBJS) $(OBJA) $(LIBS)
$(STRIP) $@
#sed -f ../newlib/cmd1.sed zlib.def > mem
#sed -f ../newlib/cmd2.sed mem >zlib.inc
mv -f libz.dll ../../bin
mv -f libz.dll.a ../../lib
mv -f libz.dll.a $(INSTALLDIR)
adler32.o: zlib.h zconf.h