|
@@ -7,8 +7,7 @@
|
|
|
|
|
|
|
|
#ifdef ATOMIC_PLATFORM_WINDOWS
|
|
#ifdef ATOMIC_PLATFORM_WINDOWS
|
|
|
#ifdef ATOMIC_WEBVIEW
|
|
#ifdef ATOMIC_WEBVIEW
|
|
|
-#include <include/cef_app.h>
|
|
|
|
|
-#include <include/cef_client.h>
|
|
|
|
|
|
|
+#include <AtomicWebView/AtomicWebView.h>
|
|
|
#endif
|
|
#endif
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
@@ -117,18 +116,13 @@ int main(int argc, char** argv)
|
|
|
#ifdef ATOMIC_PLATFORM_WINDOWS
|
|
#ifdef ATOMIC_PLATFORM_WINDOWS
|
|
|
#ifdef ATOMIC_WEBVIEW
|
|
#ifdef ATOMIC_WEBVIEW
|
|
|
|
|
|
|
|
- // Provide CEF with command-line arguments.
|
|
|
|
|
- CefMainArgs main_args;
|
|
|
|
|
|
|
+ int exit_code = Atomic::WebMain(argc, argv);
|
|
|
|
|
|
|
|
- // CEF applications have multiple sub-processes (render, plugin, GPU, etc)
|
|
|
|
|
- // that share the same executable. This function checks the command-line and,
|
|
|
|
|
- // if this is a sub-process, executes the appropriate logic.
|
|
|
|
|
- int exit_code = CefExecuteProcess(main_args, nullptr, nullptr);
|
|
|
|
|
-
|
|
|
|
|
- if (exit_code >= 0) {
|
|
|
|
|
|
|
+ if (exit_code >= 0)
|
|
|
|
|
+ {
|
|
|
// The sub-process has completed so return here.
|
|
// The sub-process has completed so return here.
|
|
|
return exit_code;
|
|
return exit_code;
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
#endif
|
|
#endif
|
|
|
#endif
|
|
#endif
|