cmake_minimum_required(VERSION 3.11)\r
\r
-if (WIN32)\r
-\r
PROJECT (dali-adaptor)\r
\r
SET(adaptor_devel_api_dir dali/devel-api)\r
${adaptor_devel_api_dir}/adaptor-framework/imf-manager.h\r
${adaptor_devel_api_dir}/adaptor-framework/input-method-devel.h\r
${adaptor_devel_api_dir}/adaptor-framework/input-method-options.h\r
+ ${adaptor_devel_api_dir}/adaptor-framework/keyboard.h\r
${adaptor_devel_api_dir}/adaptor-framework/lifecycle-controller.h\r
${adaptor_devel_api_dir}/adaptor-framework/orientation.h\r
${adaptor_devel_api_dir}/adaptor-framework/performance-logger.h\r
${adaptor_integration_api_dir}/trigger-event-factory.h)\r
\r
SET (adaptor_integration_win_api_header_files\r
- ${adaptor_integration_api_dir}/windows/ecore-win-types.h\r
- ${adaptor_integration_api_dir}/windows/ecore-win-render-surface.h\r
+ ${adaptor_integration_api_dir}/windows/win-render-surface.h\r
${adaptor_integration_api_dir}/windows/pixmap-render-surface.h\r
${adaptor_integration_api_dir}/windows/imf-manager-impl.h\r
${adaptor_integration_api_dir}/pixmap-render-surface-factory.h)\r
${adaptor_internal_dir}/imaging/common/loader-wbmp.cpp\r
${adaptor_internal_dir}/imaging/common/pixel-manipulation.cpp\r
${adaptor_internal_dir}/imaging/windows/file-download-win.cpp\r
- ${adaptor_internal_dir}/imaging/windows/CurlEnvironment-win.cpp\r
+ ${adaptor_internal_dir}/imaging/windows/curl-environment-win.cpp\r
${adaptor_internal_dir}/input/common/drag-and-drop-detector-impl.cpp\r
${adaptor_internal_dir}/input/common/gesture-manager.cpp\r
${adaptor_internal_dir}/input/common/input-method-context-impl.cpp\r
${adaptor_internal_dir}/input/common/key-grab.cpp\r
${adaptor_internal_dir}/input/common/key-impl.cpp\r
+ ${adaptor_internal_dir}/input/common/keyboard.cpp\r
${adaptor_internal_dir}/input/common/long-press-gesture-detector.cpp\r
${adaptor_internal_dir}/input/common/pan-gesture-detector-base.cpp\r
${adaptor_internal_dir}/input/common/pan-gesture-detector.cpp\r
\r
#window-system\r
${adaptor_internal_dir}/window-system/common/display-connection.cpp\r
+ ${adaptor_internal_dir}/window-system/common/event-handler.cpp\r
${adaptor_internal_dir}/window-system/common/indicator-buffer.cpp\r
${adaptor_internal_dir}/window-system/common/native-render-surface-factory.cpp\r
${adaptor_internal_dir}/window-system/common/orientation-impl.cpp\r
+ ${adaptor_internal_dir}/window-system/common/window-base.cpp\r
${adaptor_internal_dir}/window-system/common/window-impl.cpp\r
+ ${adaptor_internal_dir}/window-system/common/window-render-surface.cpp\r
${adaptor_internal_dir}/window-system/windows/display-connection-factory-win.cpp\r
${adaptor_internal_dir}/window-system/windows/display-connection-impl-win.cpp\r
- ${adaptor_internal_dir}/window-system/windows/event-handler-ecore-win.cpp\r
- ${adaptor_internal_dir}/window-system/windows/pixmap-render-surface-ecore-win.cpp\r
- ${adaptor_internal_dir}/window-system/windows/render-surface-factory-ecore-win.cpp\r
- ${adaptor_internal_dir}/window-system/windows/window-base-ecore-win.cpp\r
- ${adaptor_internal_dir}/window-system/windows/window-factory-ecore-win.cpp\r
- ${adaptor_internal_dir}/window-system/windows/window-render-surface-ecore-win.cpp\r
+ ${adaptor_internal_dir}/window-system/windows/pixmap-render-surface-win.cpp\r
+ ${adaptor_internal_dir}/window-system/windows/render-surface-factory-win.cpp\r
+ ${adaptor_internal_dir}/window-system/windows/event-system-win.cpp\r
+ ${adaptor_internal_dir}/window-system/windows/platform-implement-win.cpp\r
+ ${adaptor_internal_dir}/window-system/windows/window-base-win.cpp\r
+ ${adaptor_internal_dir}/window-system/windows/window-factory-win.cpp\r
+ ${adaptor_internal_dir}/window-system/windows/window-system-win.cpp\r
)\r
\r
SET( adaptor_public_api_dir dali/public-api )\r
-D "CURL_STATICLIB=0"\r
-D "LC_MESSAGES=0"\r
/DBUILDING_DALI_ADAPTOR\r
-/FI"${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude/PreprocessorDefinitions.h"\r
-/FI"${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude/AdaptorPreDefine.h"\r
+/FI"../windows-dependencies/ExInclude/PreprocessorDefinitions.h"\r
+/FI"../windows-dependencies/ExInclude/AdaptorPreDefine.h"\r
/NODEFAULTLIB:"libcmt.lib"\r
/vmg\r
/MP\r
+/Gz\r
)\r
\r
link_directories(\r
-${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExLib\r
-${dali_SOURCE_DIR}/bin\r
+../windows-dependencies/ExLib\r
+../bin\r
)\r
\r
#head file path \r
INCLUDE_DIRECTORIES( \r
./\r
-${dali_SOURCE_DIR}/dali-core\r
-${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude\r
-${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude/OpenGL/Include\r
+../dali-core\r
+../windows-dependencies/ExInclude\r
+../windows-dependencies/ExInclude/OpenGL/Include\r
)\r
\r
-set(LIBRARY_OUTPUT_PATH ${dali_SOURCE_DIR}/bin)\r
+set(LIBRARY_OUTPUT_PATH ../../../bin)\r
\r
#set(BUILD_SHARED_LIBS "On")\r
\r
target_link_libraries(dali-adaptor Win32File.lib)\r
target_link_libraries(dali-adaptor WindowsPlatform.lib)\r
\r
-endif()
\ No newline at end of file
+add_dependencies(dali-adaptor dali-core)\r