Skip to content
Permalink
Browse files

Move most of the CEF work in Main out to CefMain.

  • Loading branch information...
andreduvoisin committed Jun 2, 2019
1 parent 3e9c455 commit e65f0772c897dbc6dda60659f3959f381fd7e626
Showing with 640 additions and 508 deletions.
  1. +4 −2 CMakeLists.txt
  2. +8 −506 engine/main/Main.cpp
  3. +569 −0 ui/cef/CefMain.cpp
  4. +59 −0 ui/cef/CefMain.h
@@ -23,16 +23,18 @@ set(UI_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}/ui")
set(CEF_SUBPROCESS_SRC_DIR "${UI_SRC_DIR}/cef/subprocess")
set(ASSET_CONVERTER_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}/asset-converter")

# TODO: Move CefMain.cpp and WindowContentView.mm to better locations.
file(GLOB_RECURSE ENGINE_SRC_FILES
"${ENGINE_SRC_DIR}/*.cpp"
"${UI_SRC_DIR}/cef/browser/*.cpp"
"${UI_SRC_DIR}/cef/client/*.cpp")
"${UI_SRC_DIR}/cef/client/*.cpp"
"${UI_SRC_DIR}/cef/CefMain.cpp")
if (OS_WINDOWS)
set(ENGINE_SRC_FILES ${ENGINE_SRC_FILES} "${ENGINE_SRC_DIR}/CompositeEngine.manifest")
endif()
if (OS_MACOSX)
file(GLOB_RECURSE ENGINE_SRC_FILES_MACOSX
"${UI_SRC_DIR}/cef/*.mm")
"${UI_SRC_DIR}/cef/WindowContentView.mm")
set(ENGINE_SRC_FILES ${ENGINE_SRC_FILES} ${ENGINE_SRC_FILES_MACOSX})
endif()

0 comments on commit e65f077

Please sign in to comment.
You can’t perform that action at this time.