diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2017-04-05 00:41:01 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2017-04-05 00:43:31 +0800 |
| commit | 819592d42644fe3125084a8d14bd9be1cf90da1c (patch) | |
| tree | 48640590d3781621dead772672d5e226907ef392 | |
| parent | a2c46049a408e120efa4c459ec91e0e26be34474 (diff) | |
| download | gdk-pixbuf-819592d42644fe3125084a8d14bd9be1cf90da1c.tar.gz | |
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.
| -rw-r--r-- | 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 a20896745..81934b9fe 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> |