Bug 413596 - "XULRunner Stub is not built with a visual styles manifest on Windows" [p=mark.finkle@gmail.com (Mark Finkle) r=bsmedberg a1.9=beltzner]
authorreed@reedloden.com
Sat, 26 Jan 2008 19:50:52 -0800
changeset 10742 3313d0f7865e534c189ef612b1a2c52d033398ac
parent 10741 15ef01dd707718feeca8fb9248086d0e70af9825
child 10743 c78d9ebb0142ca3db29866f6d7517252d91172d7
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs413596
milestone1.9b3pre
Bug 413596 - "XULRunner Stub is not built with a visual styles manifest on Windows" [p=mark.finkle@gmail.com (Mark Finkle) r=bsmedberg a1.9=beltzner]
xulrunner/stub/Makefile.in
xulrunner/stub/xulrunner-stub.exe.manifest
xulrunner/stub/xulrunner-stub.rc
--- a/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
@@ -15,16 +15,17 @@
 #
 # The Initial Developer of the Original Code is
 # Benjamin Smedberg <benjamin@smedbergs.us>.
 #
 # Portions created by the Initial Developer are Copyright (C) 2005
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
+# Mark Finkle <mfinkle@mozilla.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead
 # of those above. If you wish to allow use of your version of this file only
 # under the terms of either the GPL or the LGPL, and not to allow others to
 # use your version of this file under the terms of the MPL, indicate your
@@ -68,16 +69,22 @@ LIBS = \
 # Need to link with CoreFoundation on Mac
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 LIBS            += \
 		$(TK_LIBS) \
 		$(NULL)
 endif
 
 ifeq (WINNT,$(OS_ARCH))
+RCINCLUDE = xulrunner-stub.rc
+ifndef GNU_CC
+RCFLAGS += -DMOZ_XULRUNNER -I$(srcdir)
+else
+RCFLAGS += -DMOZ_XULRUNNER --include-dir $(srcdir)
+endif
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 endif
 
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG
 MOZ_WINCONSOLE = 1
 else
 MOZ_WINCONSOLE = 0
new file mode 100644
--- /dev/null
+++ b/xulrunner/stub/xulrunner-stub.exe.manifest
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+        version="1.0.0.0"
+        processorArchitecture="X86"
+        name="Mozilla.XULRunner.Stub"
+        type="win32"
+/>
+<description>Mozilla XULRunner Stub</description>
+<dependency>
+        <dependentAssembly>
+                <assemblyIdentity
+                        type="win32"
+                        name="Microsoft.Windows.Common-Controls"
+                        version="6.0.0.0"
+                        processorArchitecture="X86"
+                        publicKeyToken="6595b64144ccf1df"
+                        language="*"
+                />
+        </dependentAssembly>
+</dependency>
+</assembly>
new file mode 100644
--- /dev/null
+++ b/xulrunner/stub/xulrunner-stub.rc
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla XULRunner.
+ *
+ * The Initial Developer of the Original Code is
+ * Mark Finkle <mfinkle@mozilla.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+1 24 "xulrunner-stub.exe.manifest"