From 3ea29453f78489ade515243f0c129f68d95e8899 Mon Sep 17 00:00:00 2001 From: "minho.sun" Date: Fri, 22 Jun 2018 10:07:54 +0900 Subject: [PATCH] Revert "[Tizen] Add codes for Dali Windows Backend" This reverts commit 51963d8d4a83693b3958c605f461d8df8d907b8a. Change-Id: I7483291145ad459ef6b286f7f751063d435e138b --- CMakeLists.txt | 87 --------------------------- dali-demo.vcxproj.filters | 149 ---------------------------------------------- main/main-example.cpp | 5 -- prebuild.bat | 31 ---------- setenv.bat | 11 ---- 5 files changed, 283 deletions(-) delete mode 100755 CMakeLists.txt delete mode 100755 dali-demo.vcxproj.filters delete mode 100755 main/main-example.cpp delete mode 100755 prebuild.bat delete mode 100755 setenv.bat diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100755 index 0b4e628..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,87 +0,0 @@ -cmake_minimum_required(VERSION 3.11) - -if (WIN32) - -PROJECT (dali) - -add_subdirectory(dali-core) -add_subdirectory(dali-adaptor) -add_subdirectory(dali-toolkit) - -SET( SOURCES ${SOURCES} -dali-demo/main/main-example.cpp -) - -ADD_DEFINITIONS( -#-D _CRT_SECURE_NO_WARNINGS --DAPP_DATA_RES_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res" --DIMAGES_DIR=APP_DATA_RES_DIR"/images/" --DSTYLE_DIR=APP_DATA_RES_DIR"/style/" --DDEMO_THEME_PATH=STYLE_DIR"demo-theme.json" --DDEMO_IMAGE_DIR=IMAGES_DIR --DdataReadOnlyDir="${dali_SOURCE_DIR}/dali-env/opt/share/dali/" --Ddaliimagedir=dataReadOnlyDir"toolkit/images/" --DDALI_IMAGE_DIR=daliimagedir --DDEMO_STYLE_DIR=APP_DATA_RES_DIR"/style/" --DAPPLICATION_RESOURCE_PATH="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res" --DDEMO_VIDEO_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res/videos/" --DDEMO_MODEL_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res/models/" --DDEMO_SHADER_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res/shaders/" --DDEMO_SCRIPT_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res/scripts/" --DDEMO_GAME_DIR="${dali_SOURCE_DIR}/dali-env/opt/share/com.samsung.dali-demo/res/game" -/vmg -/FI"${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude/PreprocessorDefinitions.h" -) -#head file path -INCLUDE_DIRECTORIES( -${dali_SOURCE_DIR}/dali-demo -${dali_SOURCE_DIR}/dali-env/opt/include -${dali_SOURCE_DIR}/dali-demo/examples/text-label-emojis -${dali_SOURCE_DIR}/dali-core -${dali_SOURCE_DIR}/dali-adaptor -${dali_SOURCE_DIR}/dali-toolkit -${dali_SOURCE_DIR}/dali-adaptor/dali-windows-backend/ExInclude -) - -link_directories( -bin/Debug -dali-adaptor/dali-windows-backend/ExLib -dali-adaptor/dali-windows-backend/ExLib/Debug -) - -set(EXECUTABLE_OUTPUT_PATH bin) - -add_executable(dali-demo ${SOURCES}) - -target_link_libraries(dali-demo dali-core.lib) -target_link_libraries(dali-demo dali-adaptor.lib) -target_link_libraries(dali-demo dali-toolkit.lib) -target_link_libraries(dali-demo Win32File.lib) -target_link_libraries(dali-demo WindowsPlatform.lib) -target_link_libraries(dali-demo libjpeg.lib) -target_link_libraries(dali-demo libcurl_a.lib) -target_link_libraries(dali-demo turbojpeg.lib) -target_link_libraries(dali-demo getopt.lib) -target_link_libraries(dali-demo giflib.lib) -target_link_libraries(dali-demo libEGL.lib) -target_link_libraries(dali-demo libexif.lib) -target_link_libraries(dali-demo libGLESv2.lib) -target_link_libraries(dali-demo pthread.lib) -target_link_libraries(dali-demo libpng.lib) -target_link_libraries(dali-demo zlibstat.lib) -target_link_libraries(dali-demo legacy_stdio_definitions.lib) -target_link_libraries(dali-demo freetype.lib) -target_link_libraries(dali-demo FontConfig.lib) -target_link_libraries(dali-demo libexpat.lib) -target_link_libraries(dali-demo fribidi.lib) -target_link_libraries(dali-demo harfbuzz-1.4.7.lib) -target_link_libraries(dali-demo dlfcn.lib) -target_link_libraries(dali-demo Iphlpapi.lib) -target_link_libraries(dali-demo Psapi.lib) -target_link_libraries(dali-demo Userenv.lib) - -add_dependencies(dali-demo dali-core) -add_dependencies(dali-demo dali-adaptor) -add_dependencies(dali-demo dali-toolkit) - -endif() diff --git a/dali-demo.vcxproj.filters b/dali-demo.vcxproj.filters deleted file mode 100755 index 9e70a6d..0000000 --- a/dali-demo.vcxproj.filters +++ /dev/null @@ -1,149 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - - - Source Files - - - \ No newline at end of file diff --git a/main/main-example.cpp b/main/main-example.cpp deleted file mode 100755 index 03818c6..0000000 --- a/main/main-example.cpp +++ /dev/null @@ -1,5 +0,0 @@ -//#include "examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp" -//#include "examples/image-view/image-view-example.cpp" -//#include "examples/image-view-url/image-view-url-example.cpp" -#include "examples/remote-image-loading/remote-image-loading-example.cpp" -//#include "examples/video-view/video-view-example.cpp" diff --git a/prebuild.bat b/prebuild.bat deleted file mode 100755 index cab182f..0000000 --- a/prebuild.bat +++ /dev/null @@ -1,31 +0,0 @@ -xcopy /s/y/i/f/d "..\dali-adaptor\dali\integration-api\*.h" "..\dali-env\opt\include\dali\integration-api\adaptors" -xcopy /s/y/i/f/d "..\dali-env\opt\include\dali\integration-api\adaptors\windows\*.*" "..\dali-env\opt\include\dali\integration-api\adaptors" -copy /d "..\dali-adaptor\dali\public-api\dali.h" "..\dali-env\opt\include\dali\dali.h" - -xcopy /s/y/i/f/d "..\dali-toolkit\dali-toolkit\styles\*.json" "..\dali-env\opt\share\dali\toolkit\styles" -xcopy /s/y/i/f/d "..\dali-toolkit\dali-toolkit\styles\480x800\*.json" "..\dali-env\opt\share\dali\toolkit\styles" -xcopy /s/y/i/f/d "..\dali-toolkit\dali-toolkit\styles\480x800\images\*.png" "..\dali-env\opt\share\dali\toolkit\styles\images" -xcopy /s/y/i/f/d "..\dali-toolkit\dali-toolkit\styles\images-common\*.png" "..\dali-env\opt\share\dali\toolkit\images" -xcopy /s/y/i/f/d "..\dali-toolkit\dali-toolkit\sounds\*.ogg" "..\dali-env\opt\share\dali\toolkit\sounds" - -xcopy /s/y/i/f/d "resources\game\*.*" "..\dali-env\opt\share\com.samsung.dali-demo\res\game" -xcopy /s/y/i/f/d "resources\images\*.*" "..\dali-env\opt\share\com.samsung.dali-demo\res\images" -xcopy /s/y/i/f/d "resources\models\*.*" "..\dali-env\opt\share\com.samsung.dali-demo\res\models" -xcopy /s/y/i/f/d "resources\scripts\*.json" "..\dali-env\opt\share\com.samsung.dali-demo\res\scripts" -xcopy /s/y/i/f/d "resources\shaders\*.*" "..\dali-env\opt\share\com.samsung.dali-demo\res\shaders" -xcopy /s/y/i/f/d "resources\style\*.json" "..\dali-env\opt\share\com.samsung.dali-demo\res\style" -xcopy /s/y/i/f/d "resources\style\images\*.png" "..\dali-env\opt\share\com.samsung.dali-demo\res\style\images" -xcopy /s/y/i/f/d "resources\videos\*.*" "..\dali-env\opt\share\com.samsung.dali-demo\res\videos" -xcopy /s/y/i/f/d "..\dali-adaptor\dali-windows-backend\ExDll\*.dll" "..\bin\Debug" - -copy "CMakeLists.txt" "../CMakeLists.txt" - -cd .. -set appPackage=%envDir%"/opt/share/com.samsung.dali-demo/res" -set csharpDemoDir=%cd%\"dali-windows-backend\csharp-demo" - -setx dali_csharp-demo %csharpDemoDir:\=/% -setx DALI_APPLICATION_PACKAGE %appPackage:\=/% -setx DALI_WINDOW_WIDTH 1920 -setx DALI_WINDOW_HEIGHT 1080 -@pause \ No newline at end of file diff --git a/setenv.bat b/setenv.bat deleted file mode 100755 index 8ef1525..0000000 --- a/setenv.bat +++ /dev/null @@ -1,11 +0,0 @@ -cd .. -set envDir=%cd%\dali-env -set appPackage=%envDir%"/opt/share/com.samsung.dali-demo/res" -set csharpDemoDir=%cd%\"dali-windows-backend\csharp-demo" - -setx Dali_env %envDir:\=/% -setx dali_csharp-demo %csharpDemoDir:\=/% -setx DALI_APPLICATION_PACKAGE %appPackage:\=/% -setx DALI_WINDOW_WIDTH 1920 -setx DALI_WINDOW_HEIGHT 1080 -@pause -- 2.7.4