update makefiles

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

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 $@ $<

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