[json-glib] Visual Studio builds: Copy config.h.win32 to $(srcroot)\json-glib



commit 82438b38ec955057b314126b5a7d044b2675a34d
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Mar 14 13:03:29 2017 +0800

    Visual Studio builds: Copy config.h.win32 to $(srcroot)\json-glib
    
    This follows the autotools builds and Meson builds.

 build/win32/vs10/json-glib-gen-srcs.props  |    2 +-
 build/win32/vs10/json-glib.vcxprojin       |    4 ++--
 build/win32/vs9/json-glib-gen-srcs.vsprops |    2 +-
 build/win32/vs9/json-glib.vcprojin         |    8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/build/win32/vs10/json-glib-gen-srcs.props b/build/win32/vs10/json-glib-gen-srcs.props
index f5629eb..4cdd31b 100644
--- a/build/win32/vs10/json-glib-gen-srcs.props
+++ b/build/win32/vs10/json-glib-gen-srcs.props
@@ -4,7 +4,7 @@
     <Import Project="json-glib-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <CopyConfigH>copy ..\config.h.win32 ..\..\..\config.h</CopyConfigH>
+    <CopyConfigH>copy ..\config.h.win32 ..\..\..\json-glib\config.h</CopyConfigH>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>jsonglibgensrcsprops</_PropertySheetDisplayName>
diff --git a/build/win32/vs10/json-glib.vcxprojin b/build/win32/vs10/json-glib.vcxprojin
index 92fb8c9..23f5f0d 100644
--- a/build/win32/vs10/json-glib.vcxprojin
+++ b/build/win32/vs10/json-glib.vcxprojin
@@ -175,10 +175,10 @@
     <CustomBuild Include="..\config.h.win32">
       <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
       <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Release'">..\..\..\json-glib\config.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/build/win32/vs9/json-glib-gen-srcs.vsprops b/build/win32/vs9/json-glib-gen-srcs.vsprops
index aa4fee6..977f685 100644
--- a/build/win32/vs9/json-glib-gen-srcs.vsprops
+++ b/build/win32/vs9/json-glib-gen-srcs.vsprops
@@ -7,6 +7,6 @@
        >
        <UserMacro
                Name="CopyConfigH"
-               Value="copy ..\config.h.win32 ..\..\..\config.h"
+               Value="copy ..\config.h.win32 ..\..\..\json-glib\config.h"
        />
 </VisualStudioPropertySheet>
diff --git a/build/win32/vs9/json-glib.vcprojin b/build/win32/vs9/json-glib.vcprojin
index 351bcb5..ce380cf 100644
--- a/build/win32/vs9/json-glib.vcprojin
+++ b/build/win32/vs9/json-glib.vcprojin
@@ -163,7 +163,7 @@
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(CopyConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\..\json-glib\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|Win32">
@@ -171,7 +171,7 @@
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(CopyConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\..\json-glib\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Debug|x64">
@@ -179,7 +179,7 @@
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(CopyConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\..\json-glib\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|x64">
@@ -187,7 +187,7 @@
                                                Name="VCCustomBuildTool"
                                                Description="Copying config.h from config.h.win32..."
                                                CommandLine="$(CopyConfigH)"
-                                               Outputs="..\..\..\config.h"
+                                               Outputs="..\..\..\json-glib\config.h"
                                        />
                                </FileConfiguration>
                        </File>


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