diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /JavaScriptCore/shell | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'JavaScriptCore/shell')
| -rw-r--r-- | JavaScriptCore/shell/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | JavaScriptCore/shell/CMakeListsWinCE.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/JavaScriptCore/shell/CMakeLists.txt b/JavaScriptCore/shell/CMakeLists.txt index 1f529a5..a327204 100644 --- a/JavaScriptCore/shell/CMakeLists.txt +++ b/JavaScriptCore/shell/CMakeLists.txt @@ -9,7 +9,7 @@ SET(JSC_LIBRARIES ${JavaScriptCore_LIBRARY_NAME} ) -INCLUDE_IF_EXISTS(${JAVASCRIPTCORE_DIR}/jsc/CMakeLists${PORT}.txt) +INCLUDE_IF_EXISTS(${JAVASCRIPTCORE_DIR}/shell/CMakeLists${PORT}.txt) WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) INCLUDE_DIRECTORIES(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) diff --git a/JavaScriptCore/shell/CMakeListsWinCE.txt b/JavaScriptCore/shell/CMakeListsWinCE.txt new file mode 100644 index 0000000..0b7a3bf --- /dev/null +++ b/JavaScriptCore/shell/CMakeListsWinCE.txt @@ -0,0 +1,3 @@ +LIST(APPEND JSC_SOURCES + ../os-win32/WinMain.cpp +) |