diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
| commit | 74380c2fc1384a529df4f4995bddcf587fbac389 (patch) | |
| tree | 0089fa6c54409e2a9515e0f530bf33e5f9561e29 /mesalib/windows | |
| parent | 2c345c9da4dedfafe791557ca3fcf891ce26249d (diff) | |
| parent | 1738a6973deb03f33a71c9527594727cb8bb64b4 (diff) | |
| download | vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.gz vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.bz2 vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 7 nov 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mesa/main/.gitignore
xkbcomp/listing.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/hw/xwin/winshadddnl.c
Diffstat (limited to 'mesalib/windows')
| -rw-r--r-- | mesalib/windows/VC8/mesa/makefile | 8 | ||||
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 2 | ||||
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters | 6 |
3 files changed, 14 insertions, 2 deletions
diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile index 0511d3c10..4f592b660 100644 --- a/mesalib/windows/VC8/mesa/makefile +++ b/mesalib/windows/VC8/mesa/makefile @@ -45,19 +45,23 @@ DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \ ..\..\..\src\mesa\main\dispatch.h \
..\..\..\src\mesa\main\glapitable.h \
..\..\..\src\mesa\main\enums.c \
+ ..\..\..\src\mesa\main\api_exec.c \
..\..\..\src\mesa\main\get_hash.h
all: Release\swrast_dri.dll Debug\swrast_dri.dll
..\..\..\src\mesa\main\dispatch.h: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml)
- cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -m remap_table > ..\..\..\mesa\main\dispatch.h
+ cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -f gl_and_es_API.xml -m remap_table > ..\..\..\mesa\main\dispatch.h
..\..\..\src\mesa\main\glapitable.h: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml)
- cd ..\..\..\src\mapi\glapi\gen & python gl_table.py > ..\..\..\mesa\main\glapitable.h
+ cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -f gl_and_es_API.xml > ..\..\..\mesa\main\glapitable.h
..\..\..\src\mesa\main\enums.c: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml)
cd ..\..\..\src\mapi\glapi\gen & python gl_enums.py -f gl_and_es_API.xml > ..\..\..\mesa\main\enums.c
+..\..\..\src\mesa\main\api_exec.c: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml)
+ cd ..\..\..\src\mapi\glapi\gen & python gl_genexec.py -f gl_and_es_API.xml > ..\..\..\mesa\main\api_exec.c
+
API_DEFINES=-DFEATURE_GL=1
GET_HASH_GEN = ..\..\..\src\mesa\main\get_hash_generator.py
GET_HASH_GEN_FLAGS := $(patsubst -DFEATURE_%=1,-a %, $(patsubst -DFEATURE_%=0,,$(API_DEFINES)))
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index f9b8adbbd..59bed9019 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -193,7 +193,9 @@ <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\arbprogram.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\errors.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\format_pack.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\glformats.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\pack.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 0105596e4..2010982ca 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -698,6 +698,12 @@ <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">
|