diff options
| author | Steve Block <steveblock@google.com> | 2011-05-06 11:45:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-12 13:44:10 +0100 |
| commit | cad810f21b803229eb11403f9209855525a25d57 (patch) | |
| tree | 29a6fd0279be608e0fe9ffe9841f722f0f4e4269 /JavaScriptCore/shell | |
| parent | 121b0cf4517156d0ac5111caf9830c51b69bae8f (diff) | |
| download | external_webkit-cad810f21b803229eb11403f9209855525a25d57.zip external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.gz external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.bz2 | |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Diffstat (limited to 'JavaScriptCore/shell')
| -rw-r--r-- | JavaScriptCore/shell/CMakeLists.txt | 25 | ||||
| -rw-r--r-- | JavaScriptCore/shell/CMakeListsEfl.txt | 8 | ||||
| -rw-r--r-- | JavaScriptCore/shell/CMakeListsWinCE.txt | 3 |
3 files changed, 0 insertions, 36 deletions
diff --git a/JavaScriptCore/shell/CMakeLists.txt b/JavaScriptCore/shell/CMakeLists.txt deleted file mode 100644 index a327204..0000000 --- a/JavaScriptCore/shell/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -SET(JSC_HEADERS -) - -SET(JSC_SOURCES - ../jsc.cpp -) - -SET(JSC_LIBRARIES - ${JavaScriptCore_LIBRARY_NAME} -) - -INCLUDE_IF_EXISTS(${JAVASCRIPTCORE_DIR}/shell/CMakeLists${PORT}.txt) - -WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) -INCLUDE_DIRECTORIES(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) -ADD_EXECUTABLE(${JSC_EXECUTABLE_NAME} ${JSC_HEADERS} ${JSC_SOURCES}) -TARGET_LINK_LIBRARIES(${JSC_EXECUTABLE_NAME} ${JSC_LIBRARIES}) - -IF (JSC_LINK_FLAGS) - ADD_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} LINK_FLAGS "${JSC_LINK_FLAGS}") -ENDIF () - -IF (SHARED_CORE) - SET_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} PROPERTIES VERSION ${PROJECT_VERSION}) -ENDIF () diff --git a/JavaScriptCore/shell/CMakeListsEfl.txt b/JavaScriptCore/shell/CMakeListsEfl.txt deleted file mode 100644 index 58d44f4..0000000 --- a/JavaScriptCore/shell/CMakeListsEfl.txt +++ /dev/null @@ -1,8 +0,0 @@ -LIST(APPEND JSC_LIBRARIES - ${Glib_LIBRARIES} - ${ECORE_LIBRARIES} -) - -LIST(APPEND JSC_LINK_FLAGS - ${ECORE_LDFLAGS} -) diff --git a/JavaScriptCore/shell/CMakeListsWinCE.txt b/JavaScriptCore/shell/CMakeListsWinCE.txt deleted file mode 100644 index 0b7a3bf..0000000 --- a/JavaScriptCore/shell/CMakeListsWinCE.txt +++ /dev/null @@ -1,3 +0,0 @@ -LIST(APPEND JSC_SOURCES - ../os-win32/WinMain.cpp -) |