diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-19 15:29:34 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-19 15:29:34 +0200 |
| commit | 6c2405764016c018bee10ba98eb5579b2cfd0872 (patch) | |
| tree | 23c388439c0917ebd2ebcd0e0c63f2140229894a | |
| parent | 9b1bf35b905322559e263d3d6b03bff27b27eb82 (diff) | |
| download | vcxsrv-6c2405764016c018bee10ba98eb5579b2cfd0872.tar.gz vcxsrv-6c2405764016c018bee10ba98eb5579b2cfd0872.tar.bz2 vcxsrv-6c2405764016c018bee10ba98eb5579b2cfd0872.zip | |
Solved link problems
| -rw-r--r-- | freetype/freetype.vcxproj | 1 | ||||
| -rw-r--r-- | freetype/freetype.vcxproj.filters | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/program/hash_table.h | 1 | ||||
| -rw-r--r-- | mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj | 4 | ||||
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 4 |
5 files changed, 9 insertions, 4 deletions
diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj index 911c969ae..942f9e9b8 100644 --- a/freetype/freetype.vcxproj +++ b/freetype/freetype.vcxproj @@ -203,6 +203,7 @@ <ClCompile Include="src\autofit\aflatin.c" />
<ClCompile Include="src\autofit\afloader.c" />
<ClCompile Include="src\autofit\afmodule.c" />
+ <ClCompile Include="src\base\ftlcdfil.c" />
<ClCompile Include="src\psaux\afmparse.c" />
<ClCompile Include="src\bdf\bdfdrivr.c" />
<ClCompile Include="src\bdf\bdflib.c" />
diff --git a/freetype/freetype.vcxproj.filters b/freetype/freetype.vcxproj.filters index ff8d2539a..1b940c8c7 100644 --- a/freetype/freetype.vcxproj.filters +++ b/freetype/freetype.vcxproj.filters @@ -188,6 +188,9 @@ <ClCompile Include="src\winfonts\winfnt.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\base\ftlcdfil.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\freetype\freetype.h">
diff --git a/mesalib/src/mesa/program/hash_table.h b/mesalib/src/mesa/program/hash_table.h index 941d28a4c..9ec4e40e8 100644 --- a/mesalib/src/mesa/program/hash_table.h +++ b/mesalib/src/mesa/program/hash_table.h @@ -36,6 +36,7 @@ #include <stdint.h> #include <limits.h> #include <assert.h> +#include <unistd.h> struct hash_table; struct string_to_uint_map; 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 ce31f20b0..e2dacf379 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 @@ -57,7 +57,7 @@ </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -76,7 +76,7 @@ </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index 9597b1303..b6e7f71b0 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -52,7 +52,7 @@ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -77,7 +77,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|