Fix to the CEF external that broke for Win32 after merging 7.0

livecodefraser · livecodefraser · commit 385c14fa71b5 · 2015-02-26T10:35:59.000Z
diff --git a/revbrowser/revbrowser-cefprocess.vcproj b/revbrowser/revbrowser-cefprocess.vcproj
@@ -178,6 +178,10 @@
 				RelativePath=".\src\cefprocess_w32.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\cefshared_w32.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/revbrowser/revbrowser.vcproj b/revbrowser/revbrowser.vcproj
@@ -212,6 +212,10 @@
 				RelativePath=".\src\cefbrowser_w32.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\cefshared_w32.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\src\osxbrowser.cpp"
 				>
diff --git a/revbrowser/src/cefbrowser_w32.cpp b/revbrowser/src/cefbrowser_w32.cpp
@@ -526,17 +526,3 @@ const char* MCCefPlatformGetResourcesDirPath()
 #include <stdio.h>
 #include <cstring>
 
-void *MCU_loadmodule(const char *p_source)
-{
-    return LoadLibraryA(p_source);
-}
-
-void MCU_unloadmodule(void *p_module)
-{
-    
-}
-
-void *MCU_resolvemodulesymbol(void *p_module, const char *p_name)
-{
-    return GetProcAddress((HMODULE)p_module, p_name);
-}
diff --git a/revbrowser/src/cefshared_w32.cpp b/revbrowser/src/cefshared_w32.cpp
@@ -0,0 +1,37 @@
+/* Copyright (C) 2015 Runtime Revolution Ltd.
+
+This file is part of LiveCode.
+
+LiveCode is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License v3 as published by the Free
+Software Foundation.
+
+LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
+
+#include <windows.h>
+
+extern "C"
+{
+
+void *MCU_loadmodule(const char *p_source)
+{
+    return LoadLibraryA(p_source);
+}
+
+void MCU_unloadmodule(void *p_module)
+{
+    
+}
+
+void *MCU_resolvemodulesymbol(void *p_module, const char *p_name)
+{
+    return GetProcAddress((HMODULE)p_module, p_name);
+}
+    
+}
diff --git a/thirdparty b/thirdparty
@@ -1 +1 @@
-Subproject commit 754810028fd32c58ed75c866c17ef7606d4e9e8a
+Subproject commit 93d2f8a88d85283493b05d2f103ee763d47b3416

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,10 @@`
`212`	`212`	`RelativePath=".\src\cefbrowser_w32.cpp"`
`213`	`213`	`>`
`214`	`214`	`</File>`
	`215`	`+ <File`
	`216`	`+ RelativePath=".\src\cefshared_w32.cpp"`
	`217`	`+ >`
	`218`	`+ </File>`
`215`	`219`	`<File`
`216`	`220`	`RelativePath=".\src\osxbrowser.cpp"`
`217`	`221`	`>`