JoshEngebretson 10 жил өмнө
parent
commit
c8dd9b52ba

+ 2 - 2
CMakeLists.txt

@@ -75,8 +75,8 @@ if (ATOMIC_WEBVIEW)
     include_directories (${CMAKE_SOURCE_DIR}/Submodules/CEF/MacOSX/)
     add_subdirectory(Submodules/CEF/MacOSX/libcef_dll)
   else()
-    include_directories (${CMAKE_SOURCE_DIR}/Submodules/CEF/Windows/)
-    add_subdirectory(Submodules/CEF/Windows/libcef_dll)
+    include_directories (${CMAKE_SOURCE_DIR}/Submodules/CEF/Windows/64bit)
+    add_subdirectory(Submodules/CEF/Windows/64bit/libcef_dll)
   endif()
 endif()
 

+ 2 - 7
Source/AtomicWebView/CMakeLists.txt

@@ -1,19 +1,14 @@
 
-include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty
-                     ${CMAKE_SOURCE_DIR}/Submodules/CEF/MacOSX/)
+include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty/)
 
 file (GLOB SOURCE_FILES *.cpp *.h)
 
 file (GLOB JAVASCRIPT_BINDINGS_SOURCE ${CMAKE_SOURCE_DIR}/Artifacts/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/Javascript/Packages/WebView/*.cpp)
 
 if (APPLE)
-    if (NOT IOS)
-        set (PLATFORM_SOURCE WebBrowserHost.mm)
-    else()
-    endif()
+    set (PLATFORM_SOURCE WebBrowserHost.mm)
 endif()
 
-
 set (SOURCE_FILES ${SOURCE_FILES} ${JAVASCRIPT_BINDINGS_SOURCE} ${PLATFORM_SOURCE} )
 
 add_library(AtomicWebView ${SOURCE_FILES})

+ 1 - 1
Submodules/CEF

@@ -1 +1 @@
-Subproject commit 1ebe077b48a55ac296b068422ea44e467085c366
+Subproject commit 54f3854f924e37523e1d86c50db472e742f25210