diff options
| author | marha <marha@users.sourceforge.net> | 2015-02-24 07:44:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-02-24 07:44:41 +0100 |
| commit | f64e43decd0fdac938feddeedee255dc4508aaa5 (patch) | |
| tree | 34e1cfaaea9ad73d9335197ee79b4f99affe4ea9 /mesalib/windows/VC8/mesa/makefile | |
| parent | 462f18c7b25fe3e467f837647d07ab0a78aa8d2b (diff) | |
| parent | ac2c8a704aac7569f4ae85b890a546644bd86c60 (diff) | |
| download | vcxsrv-f64e43decd0fdac938feddeedee255dc4508aaa5.tar.gz vcxsrv-f64e43decd0fdac938feddeedee255dc4508aaa5.tar.bz2 vcxsrv-f64e43decd0fdac938feddeedee255dc4508aaa5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
apps/xcalc/math.c
freetype/src/base/ftbdf.c
freetype/src/base/fttype1.c
freetype/src/pfr/pfrobjs.c
mesalib/src/mesa/main/.gitignore
openssl/Configure
openssl/Makefile
openssl/crypto/cryptlib.c
openssl/crypto/opensslconf.h
openssl/test/v3nametest.c
openssl/util/mk1mf.pl
openssl/util/pl/VC-32.pl
xorg-server/Xi/xipassivegrab.c
xorg-server/dix/dispatch.c
xorg-server/dix/getevents.c
xorg-server/glx/glxcmds.c
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_reqsize.h
xorg-server/hw/xwin/winclipboard/internal.h
xorg-server/hw/xwin/winclipboard/thread.c
xorg-server/hw/xwin/winclipboard/wndproc.c
xorg-server/hw/xwin/winclipboard/xevents.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winprocarg.c
xorg-server/render/render.c
Diffstat (limited to 'mesalib/windows/VC8/mesa/makefile')
| -rw-r--r-- | mesalib/windows/VC8/mesa/makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile index a35b594ec..cb75cce2f 100644 --- a/mesalib/windows/VC8/mesa/makefile +++ b/mesalib/windows/VC8/mesa/makefile @@ -52,7 +52,8 @@ DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \ ..\..\..\src\mesa\main\api_exec.c \
..\..\..\src\mesa\main\get_hash.h \
..\..\..\src\mesa\main\format_info.c \
- ..\..\..\src\util\format_srgb.c \
+ ..\..\..\src\mesa\main\format_unpack.c \
+ ..\..\..\src\mesa\main\format_pack.c \
..\..\..\src\mesa\main\remap_helper.h \
..\..\..\src\mesa\drivers\dri\common\xmlpool\options.h
@@ -84,6 +85,12 @@ GEN_FORMAT_INFO=../../../src/mesa/main/format_info.py ..\..\..\src\util\format_srgb.c: ..\..\..\src\util\format_srgb.py
python $< > $@
+..\..\..\src\mesa\main\format_unpack.c: ..\..\..\src\mesa\main\format_unpack.py ..\..\..\src\mesa\main\formats.csv
+ python ..\..\..\src\mesa\main\format_unpack.py ..\..\..\src\mesa\main\formats.csv > $@
+
+..\..\..\src\mesa\main\format_pack.c: ..\..\..\src\mesa\main\format_pack.py ..\..\..\src\mesa\main\formats.csv
+ python ..\..\..\src\mesa\main\format_pack.py ..\..\..\src\mesa\main\formats.csv > $@
+
REMAP_HELPER = ../../../src/mapi/glapi/gen/remap_helper.py
..\..\..\src\mesa\main\remap_helper.h: ..\..\..\src\mapi\glapi\gen\gl_and_es_API.xml $(REMAP_HELPER)
python $(REMAP_HELPER) -f $(subst $/,/,$<) > $@
|