GNOME.org
 

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

commit 303888bfd24698306acf7234dd7484d2f428c5c7
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue May 17 11:59:31 2022 +0800

    Visual Studio projects: Drop another property sheet
    
    We can again use MSBuild trickery to do what was done in the dropped
    property sheet.
    
    Unfortunately, like the last commit, I couldn't figure out a way do to
    something similar in the VS2008 project files... :|

 win32/vs10/Makefile.am                  |  1 -
 win32/vs10/gdk-3.vcxprojin              | 24 +++++++++++++---
 win32/vs10/gtk3-copy-gdk-broadway.props | 50 ---------------------------------
 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, 20 insertions(+), 61 deletions(-)
---
diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
index 06e78a8819..1ed6395d81 100644
--- a/win32/vs10/Makefile.am
+++ b/win32/vs10/Makefile.am
@@ -54,7 +54,6 @@ EXTRA_DIST += \
        gtk3-install.vcxproj                    \
        gtk3-introspect.vcxproj                 \
        gtk3-build-defines.props                \
-       gtk3-copy-gdk-broadway.props            \
        gtk3-version-paths.props.in             \
        $(GENERATED_ITEMS)
 
diff --git a/win32/vs10/gdk-3.vcxprojin b/win32/vs10/gdk-3.vcxprojin
index 92451400c2..19416703a4 100644
--- a/win32/vs10/gdk-3.vcxprojin
+++ b/win32/vs10/gdk-3.vcxprojin
@@ -105,19 +105,19 @@
   </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" />
-    <Import Project="gtk3-copy-gdk-broadway.props" />
+    <Import Project="gtk3-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-copy-gdk-broadway.props" />
+    <Import Project="gtk3-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-copy-gdk-broadway.props" />
+    <Import Project="gtk3-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-copy-gdk-broadway.props" />
+    <Import Project="gtk3-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -181,6 +181,7 @@
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -232,6 +233,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)'=='Debug|x64'">
@@ -285,6 +287,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)'=='Release|x64'">
@@ -336,8 +339,21 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalOptions>/EXPORT:gdk_win32_display_manager_get_type</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <PostBuildEvent>
+      <Command Condition="'$(Configuration)' == 'Debug_Broadway'">
+if not exist $(OutDir)\..\..\..\Debug\$(Platform)\bin\ mkdir $(OutDir)\..\..\..\Debug\$(Platform)\bin
+copy /b "$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll" 
"$(OutDir)\..\..\..\Debug\$(Platform)\bin"
+copy /b "$(TargetDir)$(ProjectName).0.lib" "$(OutDir)\..\..\..\Debug\$(Platform)\bin"</Command>
+      <Command Condition="'$(Configuration)' == 'Release_Broadway'">
+if not exist $(OutDir)\..\..\..\Release\$(Platform)\bin\ mkdir $(OutDir)\..\..\..\Release\$(Platform)\bin
+copy /b "$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll" 
"$(OutDir)\..\..\..\Release\$(Platform)\bin"
+copy /b "$(TargetDir)$(ProjectName).0.lib" "$(OutDir)\..\..\..\Release\$(Platform)\bin"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ResourceCompile Include="$(GdkGenSrcDir)\gdk\gdk.rc" />
   </ItemGroup>
diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
index 94792f4898..4a083d03cd 100644
--- a/win32/vs11/Makefile.am
+++ b/win32/vs11/Makefile.am
@@ -33,7 +33,6 @@ EXTRA_DIST += \
        gdk3-broadway.vcxproj   \
        gdk3-broadway.vcxproj.filters   \
        gtk3-build-defines.props        \
-       gtk3-copy-gdk-broadway.props    \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
index a6a63ded35..7b37d57ae9 100644
--- a/win32/vs12/Makefile.am
+++ b/win32/vs12/Makefile.am
@@ -33,7 +33,6 @@ EXTRA_DIST += \
        gdk3-broadway.vcxproj   \
        gdk3-broadway.vcxproj.filters   \
        gtk3-build-defines.props        \
-       gtk3-copy-gdk-broadway.props    \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
index 6ed9e9a257..72f88d160c 100644
--- a/win32/vs14/Makefile.am
+++ b/win32/vs14/Makefile.am
@@ -33,7 +33,6 @@ EXTRA_DIST += \
        gdk3-broadway.vcxproj   \
        gdk3-broadway.vcxproj.filters   \
        gtk3-build-defines.props        \
-       gtk3-copy-gdk-broadway.props    \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
index ae66589a6a..a1ab89dec3 100644
--- a/win32/vs15/Makefile.am
+++ b/win32/vs15/Makefile.am
@@ -33,7 +33,6 @@ EXTRA_DIST_COPIED =   \
        gdk3-broadway.vcxproj   \
        gdk3-broadway.vcxproj.filters   \
        gtk3-build-defines.props        \
-       gtk3-copy-gdk-broadway.props    \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST_COPIED)
diff --git a/win32/vs16/Makefile.am b/win32/vs16/Makefile.am
index 54b4b6812b..eb567707ec 100644
--- a/win32/vs16/Makefile.am
+++ b/win32/vs16/Makefile.am
@@ -33,7 +33,6 @@ EXTRA_DIST += \
        gdk3-broadway.vcxproj   \
        gdk3-broadway.vcxproj.filters   \
        gtk3-build-defines.props        \
-       gtk3-copy-gdk-broadway.props    \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/win32/vs17/Makefile.am b/win32/vs17/Makefile.am
index 8a324560db..b1ee919f95 100644
--- a/win32/vs17/Makefile.am
+++ b/win32/vs17/Makefile.am
@@ -33,7 +33,6 @@ EXTRA_DIST += \
        gdk3-broadway.vcxproj   \
        gdk3-broadway.vcxproj.filters   \
        gtk3-build-defines.props        \
-       gtk3-copy-gdk-broadway.props    \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]