[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor-browser/tor-browser-17.0.6esr-1] Fix build issues with MinGW.
commit 215b178a0542efaa4954c746de0050488bbc9b27
Author: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
Date: Mon Apr 29 23:52:48 2013 -0700
Fix build issues with MinGW.
Still need to fix WebGL+DirectX.
---
accessible/public/ia2/Makefile.in | 10 +++++-----
accessible/public/msaa/Makefile.in | 8 ++++----
accessible/public/msaa/nsIWinAccessNode.idl | 2 +-
accessible/src/msaa/AccessibleWrap.cpp | 2 +-
accessible/src/msaa/HyperTextAccessibleWrap.h | 2 +-
accessible/src/msaa/nsAccessNodeWrap.h | 4 ++--
browser/installer/package-manifest.in | 6 +++---
configure.in | 1 +
js/src/configure.in | 1 +
.../src/common/windows/guid_string.h | 2 +-
widget/windows/nsWindow.h | 2 +-
11 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/accessible/public/ia2/Makefile.in b/accessible/public/ia2/Makefile.in
index 504c2c0..32e272a 100644
--- a/accessible/public/ia2/Makefile.in
+++ b/accessible/public/ia2/Makefile.in
@@ -73,11 +73,11 @@ EMBED_MANIFEST_AT = 2
include $(topsrcdir)/config/rules.mk
OS_LIBS = \
- kernel32.lib \
- rpcns4.lib \
- rpcrt4.lib \
- ole32.lib \
- oleaut32.lib \
+ -lkernel32 \
+ -lrpcns4 \
+ -lrpcrt4 \
+ -lole32 \
+ -loleaut32 \
$(NULL)
# generate list of to-be-generated files that are missing
diff --git a/accessible/public/msaa/Makefile.in b/accessible/public/msaa/Makefile.in
index 2055ad2..df60e49 100644
--- a/accessible/public/msaa/Makefile.in
+++ b/accessible/public/msaa/Makefile.in
@@ -52,10 +52,10 @@ MIDL_GENERATED_FILES = \
SRCDIR_CSRCS = $(addprefix $(srcdir)/,$(CSRCS))
OS_LIBS = \
- kernel32.lib \
- rpcns4.lib \
- rpcrt4.lib \
- oleaut32.lib \
+ -lkernel32 \
+ -lrpcns4 \
+ -lrpcrt4 \
+ -loleaut32 \
$(NULL)
$(MIDL_GENERATED_FILES): done_gen
diff --git a/accessible/public/msaa/nsIWinAccessNode.idl b/accessible/public/msaa/nsIWinAccessNode.idl
index 133d784..e129030 100644
--- a/accessible/public/msaa/nsIWinAccessNode.idl
+++ b/accessible/public/msaa/nsIWinAccessNode.idl
@@ -7,7 +7,7 @@
#include "nsISupports.idl"
%{C++
-#include "Guiddef.h"
+#include "guiddef.h"
%}
[ref] native MSCOMIIDRef(IID);
diff --git a/accessible/src/msaa/AccessibleWrap.cpp b/accessible/src/msaa/AccessibleWrap.cpp
index 08470c9..a3fad2c 100644
--- a/accessible/src/msaa/AccessibleWrap.cpp
+++ b/accessible/src/msaa/AccessibleWrap.cpp
@@ -40,7 +40,7 @@
#include "Accessible2_i.c"
#include "AccessibleRole.h"
#include "AccessibleStates.h"
-#include "OLEACC.H"
+#include "oleacc.h"
using namespace mozilla;
using namespace mozilla::a11y;
diff --git a/accessible/src/msaa/HyperTextAccessibleWrap.h b/accessible/src/msaa/HyperTextAccessibleWrap.h
index 9e87071..1699f6c 100644
--- a/accessible/src/msaa/HyperTextAccessibleWrap.h
+++ b/accessible/src/msaa/HyperTextAccessibleWrap.h
@@ -10,7 +10,7 @@
#include "HyperTextAccessible.h"
#include "ia2AccessibleEditableText.h"
-#include "ia2AccessibleHyperText.h"
+#include "ia2AccessibleHypertext.h"
class HyperTextAccessibleWrap : public HyperTextAccessible,
public ia2AccessibleHypertext,
diff --git a/accessible/src/msaa/nsAccessNodeWrap.h b/accessible/src/msaa/nsAccessNodeWrap.h
index 33a4ca9..16749a8 100644
--- a/accessible/src/msaa/nsAccessNodeWrap.h
+++ b/accessible/src/msaa/nsAccessNodeWrap.h
@@ -25,8 +25,8 @@
#include "nsIDOMElement.h"
#include "nsIContent.h"
#include "nsAccessNode.h"
-#include "OLEIDL.H"
-#include "OLEACC.H"
+#include "oleidl.h"
+#include "oleacc.h"
#include <winuser.h>
#ifdef MOZ_CRASHREPORTER
#include "nsICrashReporter.h"
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 391e093..7b24967 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -40,9 +40,9 @@
@BINPATH@/hyphenation/*
@BINPATH@/@PREF_DIR@/firefox-l10n.js
@BINPATH@/searchplugins/*
-#ifdef XP_WIN32
-@BINPATH@/uninstall/helper.exe
-#endif
+;#ifdef XP_WIN32
+;@BINPATH@/uninstall/helper.exe
+;#endif
#ifdef MOZ_UPDATER
@BINPATH@/update.locale
@BINPATH@/updater.ini
diff --git a/configure.in b/configure.in
index 63c7bdb..552b8d9 100644
--- a/configure.in
+++ b/configure.in
@@ -2240,6 +2240,7 @@ ia64*-hpux*)
if test -n "$GNU_CC"; then
CFLAGS="$CFLAGS -mstackrealign -fno-keep-inline-dllexport"
CXXFLAGS="$CXXFLAGS -mstackrealign -fno-keep-inline-dllexport"
+ LDFLAGS="$LDFLAGS -Wl,--enable-stdcall-fixup -Wl,--large-address-aware"
else
AC_DEFINE(HAVE_STDCALL)
DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86"
diff --git a/js/src/configure.in b/js/src/configure.in
index e5962d6..bca3ff3 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1871,6 +1871,7 @@ ia64*-hpux*)
if test -n "$GNU_CC"; then
CFLAGS="$CFLAGS -mstackrealign -fno-keep-inline-dllexport"
CXXFLAGS="$CXXFLAGS -mstackrealign -fno-keep-inline-dllexport"
+ LDFLAGS="$LDFLAGS -Wl,--large-address-aware"
else
DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86"
fi
diff --git a/toolkit/crashreporter/google-breakpad/src/common/windows/guid_string.h b/toolkit/crashreporter/google-breakpad/src/common/windows/guid_string.h
index f8aa8a2..57716e5 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/windows/guid_string.h
+++ b/toolkit/crashreporter/google-breakpad/src/common/windows/guid_string.h
@@ -32,7 +32,7 @@
#ifndef COMMON_WINDOWS_GUID_STRING_H__
#define COMMON_WINDOWS_GUID_STRING_H__
-#include <Guiddef.h>
+#include <guiddef.h>
#include <string>
diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
index dde77bf..32af401 100644
--- a/widget/windows/nsWindow.h
+++ b/widget/windows/nsWindow.h
@@ -33,7 +33,7 @@
#include "TaskbarWindowPreview.h"
#ifdef ACCESSIBILITY
-#include "OLEACC.H"
+#include "oleacc.h"
#include "mozilla/a11y/Accessible.h"
#endif
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits