[gdk-pixbuf] Visual Studio 201x builds: Really fix GDI+ builds



commit 819592d42644fe3125084a8d14bd9be1cf90da1c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Apr 5 00:41:01 2017 +0800

    Visual Studio 201x builds: Really fix GDI+ builds
    
    Specify the OutDir properly for GDI+ builds, which was missed from the
    previous fix, and simplify the Custom Build rule for config.h further.
    
    Noted by Ignacio Casal Quiteiro.

 win32/vs10/gdk-pixbuf.vcxprojin |   23 +++++++----------------
 1 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/win32/vs10/gdk-pixbuf.vcxprojin b/win32/vs10/gdk-pixbuf.vcxprojin
index a208967..81934b9 100644
--- a/win32/vs10/gdk-pixbuf.vcxprojin
+++ b/win32/vs10/gdk-pixbuf.vcxprojin
@@ -118,10 +118,10 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug_GDI'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)'=='Debug_GDI'">Debug\$(Platform)\bin\</OutDir>
-    <LinkIncremental Condition="'$(Configuration)'=='Release_GDI'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)'=='Release_GDI'">Release\$(Platform)\bin\</OutDir>
+    <LinkIncremental Condition="'$(Configuration)'=='Debug_GDI+'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)'=='Debug_GDI+'">Debug\$(Platform)\bin\</OutDir>
+    <LinkIncremental Condition="'$(Configuration)'=='Release_GDI+'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)'=='Release_GDI+'">Release\$(Platform)\bin\</OutDir>
     <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">
@@ -390,18 +390,9 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug_GDI+'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug_GDI+'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug_GDI+'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release_GDI+'">Copying config.h from 
config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release_GDI+'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release_GDI+'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
+      <Message>Copying config.h from config.h.win32...</Message>
+      <Command>$(GenConfigH)</Command>
+      <Outputs>..\..\config.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]