[gtk+] MSVC Builds: Create libgtk3.manifest



commit 285f1cc30fc03f385d1a48d86ec13f2f450981bd
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Aug 6 15:42:23 2014 +0800

    MSVC Builds: Create libgtk3.manifest
    
    Use the Python script that was used to create gtk-win32.rc from
    gtk-win32.rc.in to similarly create libgtk3.manifest.  As the wildcard
    character can be used for all architectures, use that.
    
    The libgtk3.manifest file needs to be specified explicitly in the projects,
    so that it will be recognized and built into the GTK dll, so update the
    project files as well on this part.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=733773

 build/win32/process-in-win32.py        |   13 ++++++-------
 build/win32/vs10/gtk-gen-srcs.props    |    2 +-
 build/win32/vs10/gtk.vcxproj.filtersin |    5 ++++-
 build/win32/vs10/gtk.vcxprojin         |    3 +++
 build/win32/vs9/gtk-gen-srcs.vsprops   |    2 +-
 build/win32/vs9/gtk.vcprojin           |    9 +++++----
 6 files changed, 20 insertions(+), 14 deletions(-)
---
diff --git a/build/win32/process-in-win32.py b/build/win32/process-in-win32.py
index 00c4c01..ca5c80a 100644
--- a/build/win32/process-in-win32.py
+++ b/build/win32/process-in-win32.py
@@ -69,7 +69,7 @@ def main(argv):
 
     parser.add_argument('--gtk3manifest', dest='gtk3manifest', action='store_const',
                    const=1,
-                   help='Generate libgtk3.manifest (Not used now)')
+                   help='Generate libgtk3.manifest')
 
     args = parser.parse_args()
     no_args = True
@@ -85,12 +85,11 @@ def main(argv):
         no_args = False
 
     if args.gtk3manifest is not None:
-        print('Not Used... Will add once gtk/libgtk3.manifest.in is added')
-        #manifest = {}
-        #manifest['EXE_MANIFEST_ARCHITECTURE'] = '*'
-        #process_in(os.path.join(srcroot, 'gtk', 'libgtk3.manifest.in',
-        #           os.path.join(srcroot, 'gtk', 'libgtk3.manifest',
-        #           manifest)
+        manifest = {}
+        manifest['EXE_MANIFEST_ARCHITECTURE'] = '*'
+        process_in(os.path.join(srcroot, 'gtk', 'libgtk3.manifest.in'),
+                   os.path.join(srcroot, 'gtk', 'libgtk3.manifest'),
+                   manifest)
         no_args = False
 
     if no_args is True:
diff --git a/build/win32/vs10/gtk-gen-srcs.props b/build/win32/vs10/gtk-gen-srcs.props
index c86b6b0..d1f24f3 100644
--- a/build/win32/vs10/gtk-gen-srcs.props
+++ b/build/win32/vs10/gtk-gen-srcs.props
@@ -64,7 +64,7 @@ $(PythonPath)\python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix
 
 cd $(SolutionDir)
     </GenerateGtkDbusBuiltSources>
-    <GenerateGtkWin32RC>$(PythonPath)\python ..\process-in-win32.py --gtkwin32rc</GenerateGtkWin32RC>
+    <GenerateGtkWin32RC>$(PythonPath)\python ..\process-in-win32.py --gtkwin32rc 
--gtk3manifest</GenerateGtkWin32RC>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtkgensrcsprops</_PropertySheetDisplayName>
diff --git a/build/win32/vs10/gtk.vcxproj.filtersin b/build/win32/vs10/gtk.vcxproj.filtersin
index da93511..654f4dd 100644
--- a/build/win32/vs10/gtk.vcxproj.filtersin
+++ b/build/win32/vs10/gtk.vcxproj.filtersin
@@ -39,4 +39,7 @@
     <ClCompile Include="..\..\..\modules\input\imviqr.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\modules\input\thai-charprop.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <ItemGroup>
+    <Manifest Include="..\..\..\gtk\libgtk3.manifest"><Filter>Resource Files</Filter></Manifest>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs10/gtk.vcxprojin b/build/win32/vs10/gtk.vcxprojin
index 80af761..dd4213b 100644
--- a/build/win32/vs10/gtk.vcxprojin
+++ b/build/win32/vs10/gtk.vcxprojin
@@ -219,6 +219,9 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="..\..\..\gtk\libgtk3.manifest" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/build/win32/vs9/gtk-gen-srcs.vsprops b/build/win32/vs9/gtk-gen-srcs.vsprops
index 24ac945..f1833da 100644
--- a/build/win32/vs9/gtk-gen-srcs.vsprops
+++ b/build/win32/vs9/gtk-gen-srcs.vsprops
@@ -64,6 +64,6 @@ cd $(SolutionDir)&#x0D;&#x0A;
        />
        <UserMacro
                Name="GenerateGtkWin32RC"
-               Value="$(PythonPath)\python ..\process-in-win32.py --gtkwin32rc"
+               Value="$(PythonPath)\python ..\process-in-win32.py --gtkwin32rc --gtk3manifest"
        />
 </VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin
index 3dc5477..5e574a2 100644
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -197,32 +197,33 @@
                                <Tool Name="VCCustomBuildTool"
                                                Description="Generating GTK+ Win32 Version Resource..."
                                                CommandLine="$(GenerateGtkWin32RC)"
-                                               Outputs="..\..\..\gtk\gtk-win32.rc"
+                                               
Outputs="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|Win32">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Generating GTK+ Win32 Version Resource..."
                                                CommandLine="$(GenerateGtkWin32RC)"
-                                               Outputs="..\..\..\gtk\gtk-win32.rc"
+                                               
Outputs="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Debug|x64">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Generating GTK+ Win32 Version Resource..."
                                                CommandLine="$(GenerateGtkWin32RC)"
-                                               Outputs="..\..\..\gtk\gtk-win32.rc"
+                                               
Outputs="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|x64">
                                        <Tool Name="VCCustomBuildTool"
                                                Description="Generating GTK+ Win32 Version Resource..."
                                                CommandLine="$(GenerateGtkWin32RC)"
-                                               Outputs="..\..\..\gtk\gtk-win32.rc"
+                                               
Outputs="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest"
                                        />
                                </FileConfiguration>
                        </File>
                        <File RelativePath="..\..\..\gtk\gtk-win32.rc" />
+                       <File RelativePath="..\..\..\gtk\libgtk3.manifest"/>
                </Filter>
                <Filter
                        Name="Source Files"


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