diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-05 23:40:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-05 23:42:09 +0100 |
| commit | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (patch) | |
| tree | ba0af42750f0ab6dc4724342a7063835636222b5 /mesalib/windows/VC8/mesa/makefile | |
| parent | 87e58a93f7248171e736656080069cb65ff56aae (diff) | |
| parent | 8574eba804031f6b19713f0b02952280730bf62e (diff) | |
| download | vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.gz vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.bz2 vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/queryobj.c
Diffstat (limited to 'mesalib/windows/VC8/mesa/makefile')
| -rw-r--r-- | mesalib/windows/VC8/mesa/makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile index b8b58d760..6fed31994 100644 --- a/mesalib/windows/VC8/mesa/makefile +++ b/mesalib/windows/VC8/mesa/makefile @@ -52,7 +52,7 @@ DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \ ..\..\..\src\mesa\main\enums.c \
..\..\..\src\mesa\main\api_exec.c \
..\..\..\src\mesa\main\get_hash.h \
- ..\..\..\src\mesa\main\format_info.c \
+ ..\..\..\src\mesa\main\format_info.h \
..\..\..\src\mesa\main\format_unpack.c \
..\..\..\src\mesa\main\format_pack.c \
..\..\..\src\util\format_srgb.c \
@@ -82,7 +82,7 @@ GET_HASH_GEN = ../../../src/mesa/main/get_hash_generator.py python $(GET_HASH_GEN) -f $(subst $/,/,$<) > $@
GEN_FORMAT_INFO=../../../src/mesa/main/format_info.py
-..\..\..\src\mesa\main\format_info.c: ..\..\..\src\mesa\main\formats.csv ..\..\..\src\mesa\main\format_parser.py $(GEN_FORMAT_INFO)
+..\..\..\src\mesa\main\format_info.h: ..\..\..\src\mesa\main\formats.csv ..\..\..\src\mesa\main\format_parser.py $(GEN_FORMAT_INFO)
python $(GEN_FORMAT_INFO) $< > $@
..\..\..\src\util\format_srgb.c: ..\..\..\src\util\format_srgb.py
|