Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 751541 - Fix for VS11 C++/CX link issues: delay load vccorlib and…
… the winrt standard libraries, and provide a dummy vccorlib on non-win8 platforms so xul lib can load. r=ehsan+khuey, sr=bsmedberg
- Loading branch information
Showing
6 changed files
with
125 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# This Source Code Form is subject to the terms of the Mozilla Public | ||
# License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
# You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
||
DEPTH = ../../.. | ||
topsrcdir = @top_srcdir@ | ||
srcdir = @srcdir@ | ||
VPATH = @srcdir@ | ||
|
||
LIBRARY_NAME = dummyvccorlib | ||
MODULE = dummyvccorlib | ||
GRE_MODULE = 1 | ||
|
||
include $(DEPTH)/config/autoconf.mk | ||
|
||
FORCE_SHARED_LIB=1 | ||
|
||
CPPSRCS = \ | ||
dummyvccorlib.cpp \ | ||
$(NULL) | ||
|
||
include $(topsrcdir)/config/rules.mk | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ | ||
/* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
* You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
||
#include <windows.h> | ||
|
||
// A dummy vccorlib.dll for shunting winrt initialization calls when we are not | ||
// using the winrt library. For a longer explanantion see nsDllMain.cpp. | ||
|
||
extern "C" { | ||
__declspec(dllexport) long __stdcall __InitializeWinRTRuntime(unsigned long data) { return S_OK; } | ||
} | ||
|
||
namespace Platform { | ||
namespace Details { | ||
__declspec(dllexport) HRESULT InitializeData(int __threading_model) { return S_OK; } | ||
__declspec(dllexport) void UninitializeData(int __threading_model) { } | ||
} | ||
} |