diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-11 08:54:06 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-11 08:54:06 +0100 |
| commit | 8d07c58314685d56a0586d0a437b541ea2b92a54 (patch) | |
| tree | 6631fbbabd62bbfec0855f505c86c91a2e697cd8 | |
| parent | 0e1adc84d471955eaabe26486154e8ec44e91dd4 (diff) | |
| download | vcxsrv-8d07c58314685d56a0586d0a437b541ea2b92a54.tar.gz vcxsrv-8d07c58314685d56a0586d0a437b541ea2b92a54.tar.bz2 vcxsrv-8d07c58314685d56a0586d0a437b541ea2b92a54.zip | |
Solved compile errors due to merge
5 files changed, 10 insertions, 0 deletions
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj index 88b4b12a9..4a130e5ac 100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj @@ -128,6 +128,7 @@ <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\link_uniforms.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\link_varyings.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" />
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters index 966868349..71ef129f4 100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters @@ -255,6 +255,9 @@ <ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\link_varyings.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index fc5b324ba..2ec888270 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -150,6 +150,7 @@ <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\link_uniforms.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\link_varyings.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index ae174213d..d4a3c74ea 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -713,6 +713,9 @@ <ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\link_varyings.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">
diff --git a/mkfontscale/mkfontscale.c b/mkfontscale/mkfontscale.c index b27bb6a5d..f7aa709e1 100644 --- a/mkfontscale/mkfontscale.c +++ b/mkfontscale/mkfontscale.c @@ -848,10 +848,12 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo) } else #endif { +#ifndef WIN32 if (lstat(filename, &f_stat)) goto done; if (S_ISLNK(f_stat.st_mode)) tprio = 0; +#endif } if(doBitmaps) rc = bitmapIdentify(filename, &xlfd_name); |