GNOME.org
 

[gtk/msvcproj-nmake-install] Visual Studio projects: Drop unneeded property sheet

commit b895523dfb850d2afee075f66ce03c206fe76752
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue May 17 11:27:57 2022 +0800

    Visual Studio projects: Drop unneeded property sheet
    
    We can use MSBuild trickery to do what the property sheet intends to
    cover

 win32/vs10/Makefile.am                |  1 -
 win32/vs10/gdk-3.vcxprojin            | 14 ++++++++++----
 win32/vs10/gtk3-ignore-broadway.props | 18 ------------------
 win32/vs11/Makefile.am                |  1 -
 win32/vs12/Makefile.am                |  1 -
 win32/vs14/Makefile.am                |  1 -
 win32/vs15/Makefile.am                |  1 -
 win32/vs16/Makefile.am                |  1 -
 win32/vs17/Makefile.am                |  1 -
 9 files changed, 10 insertions(+), 29 deletions(-)
---
diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
index f12a18434f..06e78a8819 100644
--- a/win32/vs10/Makefile.am
+++ b/win32/vs10/Makefile.am
@@ -55,7 +55,6 @@ EXTRA_DIST += \
        gtk3-introspect.vcxproj                 \
        gtk3-build-defines.props                \
        gtk3-copy-gdk-broadway.props            \
-       gtk3-ignore-broadway.props              \
        gtk3-version-paths.props.in             \
        $(GENERATED_ITEMS)
 
diff --git a/win32/vs10/gdk-3.vcxprojin b/win32/vs10/gdk-3.vcxprojin
index fd5e79eb17..92451400c2 100644
--- a/win32/vs10/gdk-3.vcxprojin
+++ b/win32/vs10/gdk-3.vcxprojin
@@ -89,19 +89,19 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-ignore-broadway.props" />
+    <Import Project="gtk3-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-ignore-broadway.props" />
+    <Import Project="gtk3-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-ignore-broadway.props" />
+    <Import Project="gtk3-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-ignore-broadway.props" />
+    <Import Project="gtk3-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -154,6 +154,7 @@
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
@@ -205,6 +206,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
@@ -256,6 +258,7 @@
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
@@ -307,6 +310,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
@@ -348,6 +352,8 @@
     <ProjectReference Include="gdk3-broadway.vcxproj">
       <Project>{1df4c475-4472-4ee4-ac2b-3ab5a4c1a453}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <LinkLibraryDependencies Condition="'$(Configuration)' == 'Debug'">false</LinkLibraryDependencies>
+      <LinkLibraryDependencies Condition="'$(Configuration)' == 'Release'">false</LinkLibraryDependencies>
     </ProjectReference>
     <ProjectReference Include="gdk3-win32.vcxproj">
       <Project>{aba7685a-7cbb-4626-b5e5-6eeea5b489ef}</Project>
diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
index 813badfbb2..94792f4898 100644
--- a/win32/vs11/Makefile.am
+++ b/win32/vs11/Makefile.am
@@ -34,7 +34,6 @@ EXTRA_DIST += \
        gdk3-broadway.vcxproj.filters   \
        gtk3-build-defines.props        \
        gtk3-copy-gdk-broadway.props    \
-       gtk3-ignore-broadway.props      \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
index f9c7f5d814..a6a63ded35 100644
--- a/win32/vs12/Makefile.am
+++ b/win32/vs12/Makefile.am
@@ -34,7 +34,6 @@ EXTRA_DIST += \
        gdk3-broadway.vcxproj.filters   \
        gtk3-build-defines.props        \
        gtk3-copy-gdk-broadway.props    \
-       gtk3-ignore-broadway.props      \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
index 458684cb8e..6ed9e9a257 100644
--- a/win32/vs14/Makefile.am
+++ b/win32/vs14/Makefile.am
@@ -34,7 +34,6 @@ EXTRA_DIST += \
        gdk3-broadway.vcxproj.filters   \
        gtk3-build-defines.props        \
        gtk3-copy-gdk-broadway.props    \
-       gtk3-ignore-broadway.props      \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
index 88cdad3e28..ae66589a6a 100644
--- a/win32/vs15/Makefile.am
+++ b/win32/vs15/Makefile.am
@@ -34,7 +34,6 @@ EXTRA_DIST_COPIED =   \
        gdk3-broadway.vcxproj.filters   \
        gtk3-build-defines.props        \
        gtk3-copy-gdk-broadway.props    \
-       gtk3-ignore-broadway.props      \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST_COPIED)
diff --git a/win32/vs16/Makefile.am b/win32/vs16/Makefile.am
index 0445eda9ec..54b4b6812b 100644
--- a/win32/vs16/Makefile.am
+++ b/win32/vs16/Makefile.am
@@ -34,7 +34,6 @@ EXTRA_DIST += \
        gdk3-broadway.vcxproj.filters   \
        gtk3-build-defines.props        \
        gtk3-copy-gdk-broadway.props    \
-       gtk3-ignore-broadway.props      \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/win32/vs17/Makefile.am b/win32/vs17/Makefile.am
index b2cb3a12e5..8a324560db 100644
--- a/win32/vs17/Makefile.am
+++ b/win32/vs17/Makefile.am
@@ -34,7 +34,6 @@ EXTRA_DIST += \
        gdk3-broadway.vcxproj.filters   \
        gtk3-build-defines.props        \
        gtk3-copy-gdk-broadway.props    \
-       gtk3-ignore-broadway.props      \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]