Workaround to fix a link error in MS Windows 12/238312/3
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 10 Jul 2020 14:41:12 +0000 (15:41 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 10 Jul 2020 14:54:54 +0000 (15:54 +0100)
* The patch "Support a frame rendered / presented callback" uses the
  FileDescriptorMonitor which is not implemented in MS Windows, and
  it fails to link.
  A stub implementation for MS Windows has been added.

Change-Id: Ide5f97f13a827f454d171ac9d08804f20de2fd0f
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
dali/internal/system/file.list
dali/internal/system/windows/file-descriptor-monitor-windows.cpp [new file with mode: 0644]

index 42bef31..e898d17 100644 (file)
@@ -82,6 +82,7 @@ SET( adaptor_system_android_src_files
 # module: system, backend: windows
 SET( adaptor_system_windows_src_files
     ${adaptor_system_dir}/windows/callback-manager-win.cpp
+    ${adaptor_system_dir}/windows/file-descriptor-monitor-windows.cpp
     ${adaptor_system_dir}/windows/system-settings-win.cpp
     ${adaptor_system_dir}/windows/timer-impl-win.cpp
     ${adaptor_system_dir}/windows/trigger-event.cpp
diff --git a/dali/internal/system/windows/file-descriptor-monitor-windows.cpp b/dali/internal/system/windows/file-descriptor-monitor-windows.cpp
new file mode 100644 (file)
index 0000000..09e0eea
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali/internal/system/common/file-descriptor-monitor.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+
+namespace Dali
+{
+
+namespace Internal
+{
+
+namespace Adaptor
+{
+
+FileDescriptorMonitor::FileDescriptorMonitor(int fileDescriptor, CallbackBase* callback, int eventBitmask)
+{
+  DALI_LOG_WARNING("Implementation missing for MS Windows");
+}
+
+FileDescriptorMonitor::~FileDescriptorMonitor()
+{}
+
+} // Adaptor
+
+} // Internal
+
+} // Dali