BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

CEF changes

Browse Source
This commit is contained in:
Scott E. Graves
2017-03-17 22:25:11 -05:00
parent 736cbce819
commit 1f2efbc761
5 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
3rd_party/CEF/create_debug.cmd vendored
View File

@@ -3,10 +3,10 @@ set ROOT=%~dp0%
pushd %ROOT%
set PATH=%ROOT%\depot_tools;%PATH%
call create_common.cmd
REM call create_common.cmd
set CEF_USE_GN=1
set GN_DEFINES=is_win_fastlink=true
set GN_DEFINES=is_win_fastlink=true fatal_linker_warnings=false
set GN_ARGUMENTS=--ide=vs2015 --sln=cef --filters=//cef/*
pushd chromium_git

3
3rd_party/CEF/create_release.cmd vendored
View File

@@ -6,10 +6,11 @@ set PATH=%ROOT%\depot_tools;%PATH%
call create_common.cmd
set CEF_USE_GN=1
set GN_DEFINES=fatal_linker_warnings=false
set GN_ARGUMENTS=--ide=vs2015 --sln=cef --filters=//cef/*
pushd chromium_git
call python ..\automate\automate-git.py --download-dir=%ROOT%\chromium_git --depot-tools-dir=%ROOT%\depot_tools --no-distrib --no-build --branch=2987 || goto :ERROR
call python ..\automate\automate-git.py --download-dir=%ROOT%chromium_git --depot-tools-dir=%ROOT%depot_tools --no-distrib --no-build --branch=2987 || goto :ERROR
popd
pushd chromium_git\chromium\src\cef

31
CMakeLists.txt
View File

@@ -67,7 +67,7 @@ if (MSVC OR MINGW)
target_include_directories(siadrive.dokan.api PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/Dokan\ Library-1.0.2/include/dokan
${CMAKE_CURRENT_SOURCE_DIR}/include/siadrive_dokan_api)
target_link_libraries(siadrive.dokan.api siadrive.api ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/Dokan\ Library-1.0.2/lib/dokan1.lib)
target_link_libraries(siadrive.dokan.api siadrive.api ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/Dokan\ Library-1.0.2/lib/dokan1.lib)
endif()
@@ -93,9 +93,34 @@ if (MSVC OR MINGW)
set_target_properties(siadrive PROPERTIES COMPILE_FLAGS "/MTd")
else()
set_target_properties(siadrive PROPERTIES COMPILE_FLAGS "/MT")
endif()
endif()
endif()
if (MSVC)
set(CEF_LIBS
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libcef.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/chrome_elf.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libEGL.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libGLESv2.dll)
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CEF_LIBS ${CEF_LIBS}
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libcef.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/chrome_elf.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libEGL.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libGLESv2.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/obj/cef/libcef_dll_wrapper_cc.pdb)
endif()
endif()
# Windows installation
if (MSVC OR MINGW)
install(FILES ${CEF_LIBS} DESTINATION ${SIADRIVE_INSTALL_FOLDER})
install(TARGETS siadrive.api siadrive.dokan.api LIBRARY DESTINATION ${SIADRIVE_INSTALL_FOLDER})
install(TARGETS siadrive DESTINATION ${SIADRIVE_INSTALL_FOLDER})
endif()
#Common Configuration Post-setup
include_directories(${3RD_PARTY_INCLUDES} ${COMMON_INCLUDES})

2
build_debug_x64.cmd
View File

@@ -6,7 +6,7 @@ call 3rd_party\CEF\create_debug.cmd
mkdir build
mkdir build\debug
pushd build\debug
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Debug ..\..
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Debug -DSIADRIVE_INSTALL_FOLDER=dist ..\..
cmake --build . --config Debug
popd

2
build_release_x64.cmd
View File

@@ -6,7 +6,7 @@ call 3rd_party\CEF\create_release.cmd
mkdir build
mkdir build\release
pushd build\release
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Release ..\..
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Release -DSIADRIVE_INSTALL_FOLDER=dist ..\..
cmake --build . --config Release
popd