diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 6fccc85..e538b38 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -10,27 +10,25 @@
if(OS_MAC)
# Shared macOS resources (menus, icons, etc).
set(SHARED_RESOURCES_SRCS
- ../shared/resources/mac/English.lproj/InfoPlist.strings
- ../shared/resources/mac/English.lproj/MainMenu.xib
- ../shared/resources/mac/Info.plist
- ../shared/resources/mac/shared.icns
+ ../shared/mac/English.lproj/InfoPlist.strings
+ ../shared/mac/English.lproj/MainMenu.xib
+ ../shared/mac/shared.icns
)
# Info.plist files used for main and helper app bundles.
- set(SHARED_INFO_PLIST ../shared/resources/mac/Info.plist)
- set(SHARED_HELPER_INFO_PLIST ../shared/resources/mac/helper-Info.plist)
+ set(SHARED_INFO_PLIST ../shared/mac/Info.plist.in)
+ set(SHARED_HELPER_INFO_PLIST ../shared/mac/helper-Info.plist.in)
elseif(OS_WINDOWS)
# Shared Windows resources (version information, icons).
set(SHARED_RESOURCES_SRCS
- ../shared/resources/win/big.ico
- ../shared/resources/win/resource.h
- ../shared/resources/win/shared.rc
- ../shared/resources/win/small.ico
+ ../shared/win/big.ico
+ ../shared/win/resource.h
+ ../shared/win/small.ico
)
# Manifest files used for executables.
- set(SHARED_EXE_MANIFEST ../shared/resources/win/shared.exe.manifest)
- set(SHARED_COMPATIBILITY_MANIFEST ../shared/resources/win/compatibility.manifest)
+ set(SHARED_EXE_MANIFEST ../shared/win/shared.exe.manifest)
+ set(SHARED_COMPATIBILITY_MANIFEST ../shared/win/compatibility.manifest)
endif()
diff --git a/examples/message_router/CMakeLists.txt b/examples/message_router/CMakeLists.txt
index 232962c..9b75e93 100644
--- a/examples/message_router/CMakeLists.txt
+++ b/examples/message_router/CMakeLists.txt
@@ -14,6 +14,7 @@ set(EXAMPLE_SRCS
client_impl.h
)
set(EXAMPLE_SRCS_WINDOWS
+ resource.h
resource_util_win_impl.cc
)
APPEND_PLATFORM_SOURCES(EXAMPLE_SRCS)
@@ -40,8 +41,7 @@ set(EXAMPLE_RESOURCES_SRCS
)
set(EXAMPLE_RESOURCES_SRCS_WINDOWS
# Resources that embed "message_router.html" in the executable.
- resources/win/resource.h
- resources/win/resource.rc
+ win/resource.rc
)
APPEND_PLATFORM_SOURCES(EXAMPLE_RESOURCES_SRCS)
@@ -139,7 +139,7 @@ if(OS_MAC)
# manually because the configure_file command (which is executed as part of
# MACOSX_BUNDLE_INFO_PLIST) uses global env variables and would insert the
# wrong values with multiple targets.
- set(_helper_info_plist "${CMAKE_CURRENT_BINARY_DIR}/helper-Info${_target_suffix}.plist")
+ set(_helper_info_plist "${CMAKE_CURRENT_BINARY_DIR}/helper-Info${_target_suffix}.plist.in")
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/${SHARED_HELPER_INFO_PLIST}" _plist_contents)
string(REPLACE "\${EXECUTABLE_NAME}" "${_helper_output_name}" _plist_contents ${_plist_contents})
string(REPLACE "\${PRODUCT_NAME}" "${_helper_output_name}" _plist_contents ${_plist_contents})
@@ -179,7 +179,7 @@ if(OS_MAC)
# directive but that doesn't properly handle nested resource directories.
# Remove these prefixes from input file paths.
set(PREFIXES
- "../shared/resources/mac/"
+ "../shared/mac/"
)
COPY_MAC_RESOURCES("${EXAMPLE_RESOURCES_SRCS}" "${PREFIXES}" "${EXAMPLE_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${EXAMPLE_APP}")
endif()
diff --git a/examples/message_router/README.md b/examples/message_router/README.md
index 5eaa945..acc18b2 100644
--- a/examples/message_router/README.md
+++ b/examples/message_router/README.md
@@ -21,7 +21,7 @@ The "message_router" target is implemented as follows:
* Creates a `CefMessageRouterBrowserSide` instance to handle the browser side of message routing.
* Creates a `CefMessageRouterBrowserSide::Handler` instance to handle messages specific to the test code in [message_router.html](resources/message_router.html).
* Implements the `GetResourceHandler` method to support loading of [message_router.html](resources/message_router.html) via https://example.com/message_router.html.
- * Windows resource loading implementation in [resource_util_win_impl.cc](resource_util_win_impl.cc) and [resource.rc](resources/win/resource.rc).
+ * Windows resource loading implementation in [resource_util_win_impl.cc](resource_util_win_impl.cc) and [resource.rc](win/resource.rc).
* Implements the [shared::GetResourceId](../shared/resource_util.h) method to map resource paths to BINARY ID values.
* Defines a BINARY resource to include [message_router.html](resources/message_router.html) in the executable.
diff --git a/examples/message_router/resources/win/resource.h b/examples/message_router/resource.h
similarity index 100%
rename from examples/message_router/resources/win/resource.h
rename to examples/message_router/resource.h
diff --git a/examples/message_router/resource_util_win_impl.cc b/examples/message_router/resource_util_win_impl.cc
index 8c3e374..a19f704 100644
--- a/examples/message_router/resource_util_win_impl.cc
+++ b/examples/message_router/resource_util_win_impl.cc
@@ -4,7 +4,7 @@
#include "examples/shared/resource_util.h"
-#include "examples/message_router/resources/win/resource.h"
+#include "examples/message_router/resource.h"
namespace shared {
diff --git a/examples/resource_manager/resources/win/resource.rc b/examples/message_router/win/resource.rc
similarity index 88%
rename from examples/resource_manager/resources/win/resource.rc
rename to examples/message_router/win/resource.rc
index 7f5ecfa..7b58908 100644
--- a/examples/resource_manager/resources/win/resource.rc
+++ b/examples/message_router/win/resource.rc
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "examples/message_router/resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -23,14 +23,15 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
+// Include the shared RC file.
+#include "examples/shared/win/shared.rc"
/////////////////////////////////////////////////////////////////////////////
//
// Binary
//
-IDS_LOGO_PNG BINARY "..\\logo.png"
-IDS_RESOURCE_MANAGER_HTML BINARY "..\\resource_manager.html"
+IDS_MESSAGE_ROUTER_HTML BINARY "examples\\message_router\\resources\\message_router.html"
#ifdef APSTUDIO_INVOKED
diff --git a/examples/minimal/CMakeLists.txt b/examples/minimal/CMakeLists.txt
index b3ba562..78027d9 100644
--- a/examples/minimal/CMakeLists.txt
+++ b/examples/minimal/CMakeLists.txt
@@ -13,7 +13,11 @@ set(EXAMPLE_SRCS
client_minimal.h
main_minimal.cc
)
-
+set(EXAMPLE_SRCS_WINDOWS
+ resource.h
+ )
+APPEND_PLATFORM_SOURCES(EXAMPLE_SRCS)
+
if(OS_LINUX OR OS_WINDOWS)
# On Windows and Linux the same executable is used for all processes.
set(EXAMPLE_SRCS
@@ -30,9 +34,19 @@ elseif(OS_MAC)
)
endif()
+# Main executable resources.
+set(EXAMPLE_RESOURCES_SRCS
+ )
+set(EXAMPLE_RESOURCES_SRCS_WINDOWS
+ # Resources that embed the *.html and *.png files in the executable.
+ win/resource.rc
+ )
+APPEND_PLATFORM_SOURCES(EXAMPLE_RESOURCES_SRCS)
+
if(OS_MACOSX OR OS_WINDOWS)
# On macOS and Windows include the shared resources.
set(EXAMPLE_RESOURCES_SRCS
+ ${EXAMPLE_RESOURCES_SRCS}
${SHARED_RESOURCES_SRCS}
)
endif()
@@ -120,7 +134,7 @@ if(OS_MAC)
# manually because the configure_file command (which is executed as part of
# MACOSX_BUNDLE_INFO_PLIST) uses global env variables and would insert the
# wrong values with multiple targets.
- set(_helper_info_plist "${CMAKE_CURRENT_BINARY_DIR}/helper-Info${_target_suffix}.plist")
+ set(_helper_info_plist "${CMAKE_CURRENT_BINARY_DIR}/helper-Info${_target_suffix}.plist.in")
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/${SHARED_HELPER_INFO_PLIST}" _plist_contents)
string(REPLACE "\${EXECUTABLE_NAME}" "${_helper_output_name}" _plist_contents ${_plist_contents})
string(REPLACE "\${PRODUCT_NAME}" "${_helper_output_name}" _plist_contents ${_plist_contents})
@@ -160,7 +174,7 @@ if(OS_MAC)
# directive but that doesn't properly handle nested resource directories.
# Remove these prefixes from input file paths.
set(PREFIXES
- "../shared/resources/mac/"
+ "../shared/mac/"
)
COPY_MAC_RESOURCES("${EXAMPLE_RESOURCES_SRCS}" "${PREFIXES}" "${EXAMPLE_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${EXAMPLE_APP}")
endif()
diff --git a/examples/minimal/resource.h b/examples/minimal/resource.h
new file mode 100644
index 0000000..0390c27
--- /dev/null
+++ b/examples/minimal/resource.h
@@ -0,0 +1,23 @@
+// Copyright (c) 2017 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by cefsimple.rc
+//
+
+// Avoid files associated with MacOS
+#define _X86_
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC 1
+#define _APS_NEXT_RESOURCE_VALUE 102
+#define _APS_NEXT_COMMAND_VALUE 32700
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 102
+#endif
+#endif
diff --git a/examples/message_router/resources/win/resource.rc b/examples/minimal/win/resource.rc
similarity index 89%
rename from examples/message_router/resources/win/resource.rc
rename to examples/minimal/win/resource.rc
index e909008..386f294 100644
--- a/examples/message_router/resources/win/resource.rc
+++ b/examples/minimal/win/resource.rc
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "examples/minimal/resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -23,14 +23,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Binary
-//
-
-IDS_MESSAGE_ROUTER_HTML BINARY "..\\message_router.html"
-
+// Include the shared RC file.
+#include "examples/shared/win/shared.rc"
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
diff --git a/examples/resource_manager/CMakeLists.txt b/examples/resource_manager/CMakeLists.txt
index 20a2350..d01b685 100644
--- a/examples/resource_manager/CMakeLists.txt
+++ b/examples/resource_manager/CMakeLists.txt
@@ -14,6 +14,7 @@ set(EXAMPLE_SRCS
client_impl.h
)
set(EXAMPLE_SRCS_WINDOWS
+ resource.h
resource_util_win_impl.cc
)
APPEND_PLATFORM_SOURCES(EXAMPLE_SRCS)
@@ -41,8 +42,7 @@ set(EXAMPLE_RESOURCES_SRCS
)
set(EXAMPLE_RESOURCES_SRCS_WINDOWS
# Resources that embed the *.html and *.png files in the executable.
- resources/win/resource.h
- resources/win/resource.rc
+ win/resource.rc
)
APPEND_PLATFORM_SOURCES(EXAMPLE_RESOURCES_SRCS)
@@ -140,7 +140,7 @@ if(OS_MAC)
# manually because the configure_file command (which is executed as part of
# MACOSX_BUNDLE_INFO_PLIST) uses global env variables and would insert the
# wrong values with multiple targets.
- set(_helper_info_plist "${CMAKE_CURRENT_BINARY_DIR}/helper-Info${_target_suffix}.plist")
+ set(_helper_info_plist "${CMAKE_CURRENT_BINARY_DIR}/helper-Info${_target_suffix}.plist.in")
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/${SHARED_HELPER_INFO_PLIST}" _plist_contents)
string(REPLACE "\${EXECUTABLE_NAME}" "${_helper_output_name}" _plist_contents ${_plist_contents})
string(REPLACE "\${PRODUCT_NAME}" "${_helper_output_name}" _plist_contents ${_plist_contents})
@@ -180,7 +180,7 @@ if(OS_MAC)
# directive but that doesn't properly handle nested resource directories.
# Remove these prefixes from input file paths.
set(PREFIXES
- "../shared/resources/mac/"
+ "../shared/mac/"
)
COPY_MAC_RESOURCES("${EXAMPLE_RESOURCES_SRCS}" "${PREFIXES}" "${EXAMPLE_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${EXAMPLE_APP}")
endif()
diff --git a/examples/resource_manager/README.md b/examples/resource_manager/README.md
index dc24c1b..549f134 100644
--- a/examples/resource_manager/README.md
+++ b/examples/resource_manager/README.md
@@ -18,7 +18,7 @@ The "resource_manager" target is implemented as follows:
* Creates a `CefResourceManager` instance to handle resource requests.
* Defines a `RequestDumpResourceProvider` class to demonstrate custom `CefResourceManager::Provider` handling.
* Registers the `CefResourceManager::Provider` instances with the `CefResourceManager`.
- * Windows resource loading implementation in [resource_util_win_impl.cc](resource_util_win_impl.cc) and [resource.rc](resources/win/resource.rc).
+ * Windows resource loading implementation in [resource_util_win_impl.cc](resource_util_win_impl.cc) and [resource.rc](win/resource.rc).
* Implements the [shared::GetResourceId](../shared/resource_util.h) method to map resource paths to BINARY ID values.
* Defines a BINARY resource to include [logo.png](resources/logo.png) and [resource_manager.html](resources/resource_manager.html) in the executable.
diff --git a/examples/resource_manager/resources/win/resource.h b/examples/resource_manager/resource.h
similarity index 100%
rename from examples/resource_manager/resources/win/resource.h
rename to examples/resource_manager/resource.h
diff --git a/examples/resource_manager/resource_util_win_impl.cc b/examples/resource_manager/resource_util_win_impl.cc
index 68eca56..c849863 100644
--- a/examples/resource_manager/resource_util_win_impl.cc
+++ b/examples/resource_manager/resource_util_win_impl.cc
@@ -4,7 +4,7 @@
#include "examples/shared/resource_util.h"
-#include "examples/resource_manager/resources/win/resource.h"
+#include "examples/resource_manager/resource.h"
namespace shared {
diff --git a/examples/resource_manager/win/resource.rc b/examples/resource_manager/win/resource.rc
new file mode 100644
index 0000000..8f6bf52
--- /dev/null
+++ b/examples/resource_manager/win/resource.rc
@@ -0,0 +1,80 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "examples/resource_manager/resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+// Include the shared RC file.
+#include "examples/shared/win/shared.rc"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Binary
+//
+
+IDS_LOGO_PNG BINARY "examples\\resource_manager\\resources\\logo.png"
+IDS_RESOURCE_MANAGER_HTML BINARY "examples\\resource_manager\\resources\\resource_manager.html"
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+ "#include ""windows.h""\r\n"
+ "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
diff --git a/examples/scheme_handler/CMakeLists.txt b/examples/scheme_handler/CMakeLists.txt
index 969a8e3..b98ed41 100644
--- a/examples/scheme_handler/CMakeLists.txt
+++ b/examples/scheme_handler/CMakeLists.txt
@@ -23,6 +23,7 @@ set(EXAMPLE_SRCS
scheme_handler_impl.h
)
set(EXAMPLE_SRCS_WINDOWS
+ resource.h
resource_util_win_impl.cc
)
APPEND_PLATFORM_SOURCES(EXAMPLE_SRCS)
@@ -49,8 +50,7 @@ set(EXAMPLE_RESOURCES_SRCS
)
set(EXAMPLE_RESOURCES_SRCS_WINDOWS
# Resources that embed the *.html and *.png files in the executable.
- resources/win/resource.h
- resources/win/resource.rc
+ win/resource.rc
)
APPEND_PLATFORM_SOURCES(EXAMPLE_RESOURCES_SRCS)
@@ -148,7 +148,7 @@ if(OS_MAC)
# manually because the configure_file command (which is executed as part of
# MACOSX_BUNDLE_INFO_PLIST) uses global env variables and would insert the
# wrong values with multiple targets.
- set(_helper_info_plist "${CMAKE_CURRENT_BINARY_DIR}/helper-Info${_target_suffix}.plist")
+ set(_helper_info_plist "${CMAKE_CURRENT_BINARY_DIR}/helper-Info${_target_suffix}.plist.in")
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/${SHARED_HELPER_INFO_PLIST}" _plist_contents)
string(REPLACE "\${EXECUTABLE_NAME}" "${_helper_output_name}" _plist_contents ${_plist_contents})
string(REPLACE "\${PRODUCT_NAME}" "${_helper_output_name}" _plist_contents ${_plist_contents})
@@ -188,7 +188,7 @@ if(OS_MAC)
# directive but that doesn't properly handle nested resource directories.
# Remove these prefixes from input file paths.
set(PREFIXES
- "../shared/resources/mac/"
+ "../shared/mac/"
)
COPY_MAC_RESOURCES("${EXAMPLE_RESOURCES_SRCS}" "${PREFIXES}" "${EXAMPLE_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${EXAMPLE_APP}")
endif()
diff --git a/examples/scheme_handler/README.md b/examples/scheme_handler/README.md
index 8478268..d61e4f3 100644
--- a/examples/scheme_handler/README.md
+++ b/examples/scheme_handler/README.md
@@ -20,7 +20,7 @@ The "scheme_handler" target is implemented as follows:
* Register the custom scheme name in [OnRegisterCustomSchemes](https://bitbucket.org/chromiumembedded/cef/wiki/GeneralUsage.md#markdown-header-request-handling).
* Provide a concrete [CefClient](https://bitbucket.org/chromiumembedded/cef/wiki/GeneralUsage.md#markdown-header-cefclient) implementation to handle [CefBrowser](https://bitbucket.org/chromiumembedded/cef/wiki/GeneralUsage.md#markdown-header-cefbrowser-and-cefframe) callbacks.
* Uses the [minimal target](../minimal) implementation.
- * Windows resource loading implementation in [resource_util_win_impl.cc](resource_util_win_impl.cc) and [resource.rc](resources/win/resource.rc).
+ * Windows resource loading implementation in [resource_util_win_impl.cc](resource_util_win_impl.cc) and [resource.rc](win/resource.rc).
* Implements the [shared::GetResourceId](../shared/resource_util.h) method to map resource paths to BINARY ID values.
* Defines a BINARY resource to include [logo.png](resources/logo.png) and [scheme_handler.html](resources/scheme_handler.html) in the executable.
diff --git a/examples/scheme_handler/resources/win/resource.h b/examples/scheme_handler/resource.h
similarity index 100%
rename from examples/scheme_handler/resources/win/resource.h
rename to examples/scheme_handler/resource.h
diff --git a/examples/scheme_handler/resource_util_win_impl.cc b/examples/scheme_handler/resource_util_win_impl.cc
index b033005..f405882 100644
--- a/examples/scheme_handler/resource_util_win_impl.cc
+++ b/examples/scheme_handler/resource_util_win_impl.cc
@@ -4,7 +4,7 @@
#include "examples/shared/resource_util.h"
-#include "examples/scheme_handler/resources/win/resource.h"
+#include "examples/scheme_handler/resource.h"
namespace shared {
diff --git a/examples/scheme_handler/resources/win/resource.rc b/examples/scheme_handler/win/resource.rc
similarity index 84%
rename from examples/scheme_handler/resources/win/resource.rc
rename to examples/scheme_handler/win/resource.rc
index 87c9fe5..298ab88 100644
--- a/examples/scheme_handler/resources/win/resource.rc
+++ b/examples/scheme_handler/win/resource.rc
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "examples/scheme_handler/resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -23,14 +23,16 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
+// Include the shared RC file.
+#include "examples/shared/win/shared.rc"
/////////////////////////////////////////////////////////////////////////////
//
// Binary
//
-IDS_LOGO_PNG BINARY "..\\logo.png"
-IDS_SCHEME_HANDLER_HTML BINARY "..\\scheme_handler.html"
+IDS_LOGO_PNG BINARY "examples\\scheme_handler\\resources\\logo.png"
+IDS_SCHEME_HANDLER_HTML BINARY "examples\\scheme_handler\\resources\\scheme_handler.html"
#ifdef APSTUDIO_INVOKED
diff --git a/examples/shared/resources/mac/English.lproj/InfoPlist.strings b/examples/shared/mac/English.lproj/InfoPlist.strings
similarity index 100%
rename from examples/shared/resources/mac/English.lproj/InfoPlist.strings
rename to examples/shared/mac/English.lproj/InfoPlist.strings
diff --git a/examples/shared/resources/mac/English.lproj/MainMenu.xib b/examples/shared/mac/English.lproj/MainMenu.xib
similarity index 100%
rename from examples/shared/resources/mac/English.lproj/MainMenu.xib
rename to examples/shared/mac/English.lproj/MainMenu.xib
diff --git a/examples/shared/resources/mac/Info.plist b/examples/shared/mac/Info.plist.in
similarity index 93%
rename from examples/shared/resources/mac/Info.plist
rename to examples/shared/mac/Info.plist.in
index 0cfb4b7..1ce9055 100644
--- a/examples/shared/resources/mac/Info.plist
+++ b/examples/shared/mac/Info.plist.in
@@ -16,12 +16,12 @@
${PRODUCT_NAME}
CFBundlePackageType
APPL
+ CFBundleVersion
+ ${VERSION_SHORT}
CFBundleShortVersionString
- 1.0
+ ${VERSION_SHORT}
CFBundleSignature
????
- CFBundleVersion
- 1.0
LSEnvironment
MallocNanoZone
diff --git a/examples/shared/resources/mac/helper-Info.plist b/examples/shared/mac/helper-Info.plist.in
similarity index 91%
rename from examples/shared/resources/mac/helper-Info.plist
rename to examples/shared/mac/helper-Info.plist.in
index 94716b3..6ec2c04 100644
--- a/examples/shared/resources/mac/helper-Info.plist
+++ b/examples/shared/mac/helper-Info.plist.in
@@ -16,8 +16,10 @@
${PRODUCT_NAME}
CFBundlePackageType
APPL
+ CFBundleVersion
+ ${VERSION_SHORT}
CFBundleShortVersionString
- 1.0
+ ${VERSION_SHORT}
CFBundleSignature
????
LSEnvironment
diff --git a/examples/shared/resources/mac/shared.icns b/examples/shared/mac/shared.icns
similarity index 100%
rename from examples/shared/resources/mac/shared.icns
rename to examples/shared/mac/shared.icns
diff --git a/examples/shared/resources/win/big.ico b/examples/shared/win/big.ico
similarity index 100%
rename from examples/shared/resources/win/big.ico
rename to examples/shared/win/big.ico
diff --git a/examples/shared/resources/win/compatibility.manifest b/examples/shared/win/compatibility.manifest
similarity index 100%
rename from examples/shared/resources/win/compatibility.manifest
rename to examples/shared/win/compatibility.manifest
diff --git a/examples/shared/resources/win/resource.h b/examples/shared/win/resource.h
similarity index 100%
rename from examples/shared/resources/win/resource.h
rename to examples/shared/win/resource.h
diff --git a/examples/shared/resources/win/shared.exe.manifest b/examples/shared/win/shared.exe.manifest
similarity index 100%
rename from examples/shared/resources/win/shared.exe.manifest
rename to examples/shared/win/shared.exe.manifest
diff --git a/examples/shared/resources/win/shared.rc b/examples/shared/win/shared.rc
similarity index 92%
rename from examples/shared/resources/win/shared.rc
rename to examples/shared/win/shared.rc
index 7419984..9b4e453 100644
--- a/examples/shared/resources/win/shared.rc
+++ b/examples/shared/win/shared.rc
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "examples/shared/win/resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -31,8 +31,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_BIG ICON "big.ico"
-IDI_SMALL ICON "small.ico"
+IDI_BIG ICON "examples\\shared\\win\\big.ico"
+IDI_SMALL ICON "examples\\shared\\win\\small.ico"
/////////////////////////////////////////////////////////////////////////////
diff --git a/examples/shared/resources/win/small.ico b/examples/shared/win/small.ico
similarity index 100%
rename from examples/shared/resources/win/small.ico
rename to examples/shared/win/small.ico