From 5bda4b6582522d21b15d62c5c76c71104e924cbc Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 30 Oct 2012 15:11:32 +0100
Subject: Now create a seperate installer for the debug exe and dlls

---
 mesalib/src/mesa/main/texcompress_s3tc.c               | 4 ----
 mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'mesalib')

diff --git a/mesalib/src/mesa/main/texcompress_s3tc.c b/mesalib/src/mesa/main/texcompress_s3tc.c
index d4288a6f8..6476f118e 100644
--- a/mesalib/src/mesa/main/texcompress_s3tc.c
+++ b/mesalib/src/mesa/main/texcompress_s3tc.c
@@ -48,11 +48,7 @@
 
 
 #if defined(_WIN32) || defined(WIN32)
-#ifdef _DEBUG
-#define DXTN_LIBNAME "dxtn_dbg.dll"
-#else
 #define DXTN_LIBNAME "dxtn.dll"
-#endif
 #define RTLD_LAZY 0
 #define RTLD_GLOBAL 0
 #elif defined(__DJGPP__)
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
index 19b2ead33..881942744 100644
--- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -72,7 +72,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv_dbg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)swrast_dri.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(TargetDir);..\..\..\..\..\xorg-server\obj\servdebug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -176,4 +176,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
-- 
cgit v1.2.3