[gtk/msvc.cleanup.224] Visual Studio projects: Clean up generating gtk.def

[Chun-wei Fan <fanchunwei src gnome org>]

commit 61f871404c1ad0e0005281a6534b1cfbbfdbbe5e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Sep 21 12:02:24 2020 +0800

    Visual Studio projects: Clean up generating gtk.def
    
    It turns out that we do not need to have separate command lines for
    running the Visual Studio preprocessor for 32-bit builds and 64-bit
    builds as `_WIN64` is automatically defined by the 64-bit compilers.
    
    This means that we can clean up the project files a bit.

 build/win32/vs10/gtk-gen-srcs.props  |  7 -------
 build/win32/vs10/gtk.vcxprojin       | 20 ++++----------------
 build/win32/vs9/gtk-gen-srcs.vsprops |  7 -------
 build/win32/vs9/gtk.vcprojin         |  4 ++--
 4 files changed, 6 insertions(+), 32 deletions(-)
---
diff --git a/build/win32/vs10/gtk-gen-srcs.props b/build/win32/vs10/gtk-gen-srcs.props
index d565883e3f..2ae94b1888 100644
--- a/build/win32/vs10/gtk-gen-srcs.props
+++ b/build/win32/vs10/gtk-gen-srcs.props
@@ -10,10 +10,6 @@
 echo EXPORTS &gt; $(DefDir)\gdk.def
 cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt; $(DefDir)\gdk.def
     </GtkGenerateGdkDef>
-    <GtkGenerateGtkDefW64>
-echo EXPORTS &gt; $(DefDir)\gtk.def
-cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -D_WIN64 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= 
-DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt; $(DefDir)\gtk.def
-    </GtkGenerateGtkDefW64>
     <GtkGenerateGtkDef>
 echo EXPORTS &gt; $(DefDir)\gtk.def
 cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= 
-DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt; $(DefDir)\gtk.def
@@ -32,9 +28,6 @@ cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CO
     <BuildMacro Include="GtkGenerateGdkDef">
       <Value>$(GtkGenerateGdkDef)</Value>
     </BuildMacro>
-    <BuildMacro Include="GtkGenerateGtkDefW64">
-      <Value>$(GtkGenerateGtkDefW64)</Value>
-    </BuildMacro>
     <BuildMacro Include="GtkGenerateGtkDef">
       <Value>$(GtkGenerateGtkDef)</Value>
     </BuildMacro>
diff --git a/build/win32/vs10/gtk.vcxprojin b/build/win32/vs10/gtk.vcxprojin
index 7611d8b2fd..2c7c894598 100644
--- a/build/win32/vs10/gtk.vcxprojin
+++ b/build/win32/vs10/gtk.vcxprojin
@@ -65,10 +65,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -166,18 +163,9 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\gdk\gtk.symbols">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating gtk.def</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkGenerateGtkDef)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)gtk.def;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating gtk.def</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkGenerateGtkDefW64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)gtk.def;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating gtk.def</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkGenerateGtkDef)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)gtk.def;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating gtk.def</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkGenerateGtkDefW64)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)gtk.def;%(Outputs)</Outputs>
+      <Message>Generating gtk.def</Message>
+      <Command>$(GtkGenerateGtkDef)</Command>
+      <Outputs>$(IntDir)gtk.def;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
diff --git a/build/win32/vs9/gtk-gen-srcs.vsprops b/build/win32/vs9/gtk-gen-srcs.vsprops
index 959aa44ffc..a732925c0e 100644
--- a/build/win32/vs9/gtk-gen-srcs.vsprops
+++ b/build/win32/vs9/gtk-gen-srcs.vsprops
@@ -20,13 +20,6 @@ echo EXPORTS &gt; $(DefDir)\gdk.def&#x0D;&#x0A;
 cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt; 
$(DefDir)\gdk.def&#x0D;&#x0A;
                      "
        />
-       <UserMacro
-               Name="GtkGenerateGtkDefW64"
-               Value="
-echo EXPORTS &gt; $(DefDir)\gtk.def&#x0D;&#x0A;
-cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -D_WIN64 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= 
-DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt; 
$(DefDir)\gtk.def&#x0D;&#x0A;
-                     "
-       />
        <UserMacro
                Name="GtkGenerateGtkDef"
                Value="
diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin
index c22e7a2e5e..03a09e12d7 100644
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -183,7 +183,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating gtk.def"
-                                               CommandLine="$(GtkGenerateGtkDefW64)"
+                                               CommandLine="$(GtkGenerateGtkDef)"
                                                Outputs="$(IntDir)\gtk.def"
                                        />
                                </FileConfiguration>
@@ -203,7 +203,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating gtk.def"
-                                               CommandLine="$(GtkGenerateGtkDefW64)"
+                                               CommandLine="$(GtkGenerateGtkDef)"
                                                Outputs="$(IntDir)\gtk.def"
                                        />
                                </FileConfiguration>