Commit graph

350 commits

Author SHA1 Message Date
Adam Roben
37d847c416 Fix linker errors about __imp___CrtDbgReportW
We were linking against the release CRT but defining _DEBUG, which should only
be defined when using the debug CRT.
2013-05-28 11:55:25 -04:00
Adam Roben
51cb56e604 Get libchromiumcontent back on master 2013-05-22 16:58:59 -04:00
Adam Roben
cf14f09228 Stub out InspectableWebContentsViewWin
This class doesn't implement any devtools behavior yet. Right now it's just a
glorified wrapper around a content::WebContents. But it's enough to show web
content on screen on Windows!
2013-05-22 16:57:32 -04:00
Adam Roben
b970e9d5c3 Only compile HandleKeyboardEvent on Mac 2013-05-22 16:08:40 -04:00
Adam Roben
f2ff1fb406 Merge pull request #17 from brightray/windows-brightray_example
Changes needed for building brightray_example on Windows
2013-05-22 12:08:13 -07:00
Adam Roben
d54f4e2bdd Update libchromiumcontent to get icudt.dll
* vendor/libchromiumcontent 31efc77...e436974 (2):
  > Export icudt.dll for Windows clients
  > Export libGLESv2.dll on Windows
2013-05-22 14:04:28 -04:00
Adam Roben
f2909b0d90 Set up the resource bundle on Windows 2013-05-22 14:00:43 -04:00
Adam Roben
3713ea6403 Exclude platform-specific files from other platforms 2013-05-22 14:00:43 -04:00
Adam Roben
1ec7280663 Link against the DLL version of the CRT
* vendor/libchromiumcontent 04ccdd8...31efc77 (3):
  > Use the DLL version of the CRT
  > Generate libchromiumcontent-symbols.zip on Windows
  > Fix exporting of WebKit symbols
2013-05-22 14:00:31 -04:00
Adam Roben
18b64f375c Link client apps against base_static.lib
This is required to get base::win::PEImage, which is required by sandboxing
code.

* vendor/libchromiumcontent c973a7c...04ccdd8 (1):
  > Export base_static.lib for Windows clients
2013-05-22 13:55:56 -04:00
Adam Roben
6a8ee865f4 Fix linker errors about missing Win32 APIs 2013-05-22 13:55:56 -04:00
Adam Roben
7e03f93dcd Add a stub application_info_win.cc 2013-05-22 13:55:56 -04:00
Adam Roben
12d01e4fd5 ifdef out a bunch of Mac-specific code
This is a hacky solution but helps us deal with other compiler/linker errors.
2013-05-22 13:55:56 -04:00
Adam Roben
12773cff6e Fix linker errors about missing registry APIs 2013-05-22 13:55:54 -04:00
Adam Roben
2813bef741 Link against sandbox_static.lib
* vendor/libchromiumcontent 15ada44...c973a7c (3):
  > Create and export sandbox_static.lib for Windows clients
  > Export content/app/startup_helper_win.cc to clients
  > Rename dist/include to dist/src
2013-05-22 13:55:12 -04:00
Adam Roben
7f463b8962 Give clients access to libchromiumcontent's src directory
* vendor/libchromiumcontent 15ada44...65b85bf (2):
  > Export content/app/startup_helper_win.cc to clients
  > Rename dist/include to dist/src
2013-05-22 13:55:12 -04:00
Adam Roben
4c0765b413 Use __declspec(dllimport) for functions from chromiumcontent.dll 2013-05-22 13:55:11 -04:00
Adam Roben
7b65fe4948 Link against chromiumcontent.dll
* vendor/libchromiumcontent 4aae27b...15ada44 (3):
  > Include chromiumcontent.dll's import library
  > Export sandbox/ headers
  > Mention that Python is required to build
2013-05-22 13:55:11 -04:00
Adam Roben
35f4dfe4b0 Add some more default build settings for Windows 2013-05-22 13:55:02 -04:00
Adam Roben
3cf6e5eda2 Make sure dependents can #include "brightray/foo.h" 2013-05-22 13:54:07 -04:00
Adam Roben
f387535eae Beef up .gitignore 2013-05-22 13:54:07 -04:00
Adam Roben
d6b4e430f8 Update links after move to brightray org 2013-05-21 14:57:52 -04:00
Adam Roben
df24a0a816 Merge pull request #16 from brightray/windows-build
Get a basic Windows build working
2013-05-16 06:22:23 -07:00
Adam Roben
e531f46a4b Ignore files created by Visual Studio 2013-05-16 09:16:29 -04:00
Adam Roben
d07c45080d Don't use range-based for loops
VS2010 doesn't support them :-(
2013-05-16 09:15:57 -04:00
Adam Roben
5fa005d5da Fix Windows build error about passing std::string to base::FilePath::Append 2013-05-16 09:15:56 -04:00
Adam Roben
a6c5cb04f7 Use FILE_PATH_LITERAL to fix build errors 2013-05-16 09:15:56 -04:00
Adam Roben
35199ba31f MSVC doesn't allow override on destructors 2013-05-16 09:15:55 -04:00
Adam Roben
ae7331da82 Add some build defaults for Windows
These came from Chromium's build/common.gypi file.
2013-05-16 09:15:55 -04:00
Adam Roben
689496afb8 Make sure sk_stdint.h is in the include path 2013-05-16 09:15:54 -04:00
Adam Roben
a5b118ce34 Use MSBuild to build on Windows 2013-05-16 09:15:54 -04:00
Adam Roben
3d83416c04 Ignore .sln/.vcxproj files created by gyp 2013-05-16 09:15:47 -04:00
Adam Roben
fd6e43baf9 Make script/build actually run gyp on Windows
We don't yet build, but we're getting closer.
2013-05-16 09:15:05 -04:00
Adam Roben
0dfd5ec320 Ensure consistent line endings in all files 2013-05-16 09:15:05 -04:00
Adam Roben
39f0694cce Add prerequisites to the README 2013-05-16 09:15:04 -04:00
Adam Roben
90e1370d7f Update libchromiumcontent for Windows support
* vendor/libchromiumcontent e70a88f...4aae27b (2):
  > Merge pull request #11 from brightray/windows-build
  > Merge pull request #10 from brightray/windows-scripts
2013-05-16 08:54:01 -04:00
Adam Roben
586141f51f Merge pull request #15 from brightray/cibuild
Get brightray building in CI
2013-05-14 09:24:56 -07:00
Adam Roben
33d4b7398a Add script/cibuild
This just ensures that we can bootstrap and build.
2013-05-14 12:20:50 -04:00
Adam Roben
a922d8a529 Update for libchromiumcontent repo transfer 2013-05-14 09:26:40 -04:00
Adam Roben
de9b0a008b Fix script/bootstrap
* vendor/libchromiumcontent 588f368...e70a88f (1):
  > Make script/download work when we're a submodule
2013-05-14 08:31:10 -04:00
Adam Roben
ebabb0aef2 Merge pull request #12 from aroben/python
Rewrite scripts in Python
2013-05-14 05:04:47 -07:00
Adam Roben
46c887b62d Rewrite script/build in Python
The script is still Mac-specific, but this will make it easier to add
Windows support later.
2013-05-13 18:59:03 -04:00
Adam Roben
c29074ff94 Rewrite script/boostrap in Python
This is the first step toward supporting Windows.
2013-05-13 18:59:03 -04:00
Adam Roben
0526aa45e7 Update libchromiumcontent to get its Python scripts
* vendor/libchromiumcontent 3f6f01c...588f368 (17):
  > Merge pull request #8 from aroben/menu-controller
  > Merge pull request #6 from aroben/shell_dialogs
  > Fix typo in script/create-dist
  > Merge pull request #5 from aroben/python
  > Add libtest_support_chromiumcontent.a
  > Build and distribute libgtest.a
  > Stop trying to compile SQLitePersistentCookieStore separately
  > Update to latest Chromium trunk revision
  > Merge pull request #4 from aroben/atom
  > Actually compile the base/prefs code
  > Export symbols from base/prefs
  > Compile and export SQLitePersistentCookieStore
  > Export webkit/plugins headers
  > Export skia/ext headers
  > Export ui/surface headers, too
  > Export Skia symbols from libchromiumcontent
  > Update to match chrome/trunk
2013-05-13 18:58:44 -04:00
Adam Roben
57ed898128 Merge pull request #9 from aroben/frontend-host-crash
frontend_host_ should be destructed after devtools_web_contents_.
2013-05-01 07:50:39 -07:00
Cheng Zhao
082f88ed3c frontend_host_ should be destructed after devtools_web_contents_. 2013-05-01 22:00:20 +08:00
Adam Roben
676e92e322 Fix crashes when dragging links
Turns out we needed to implement ContentClient::GetNativeImageNamed, which is
called to get the default drag image.
2013-04-26 22:49:58 -04:00
Adam Roben
73d467d657 Turn off C++ exceptions
We weren't using them anyway, and don't intend to. This matches Chromium.
2013-04-26 14:13:45 -04:00
Adam Roben
6908eecd0c Allow embedders to specify extra .pak files 2013-04-26 11:04:51 -04:00
Adam Roben
3b879a6178 Allow embedders to provide their own ContentClient subclass 2013-04-24 18:30:47 -04:00