Merge "[Tizen] add vulkan local header" into tizen
authorWonsik, Jung <sidein@samsung.com>
Thu, 22 Dec 2016 12:42:24 +0000 (04:42 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 22 Dec 2016 12:42:24 +0000 (04:42 -0800)
1  2 
src/video/tizen/SDL_ecore_ipc.c
src/video/tizen/SDL_tizenvulkan.c
src/video/tizen/SDL_tizenwindow.c

Simple merge
@@@ -32,8 -30,8 +30,9 @@@
  #include "SDL_tizenwindow.h"
  #include "SDL_tizenvideo.h"
  #include "SDL_tizenvulkan.h"
 +#include "SDL_log.h"
  
+ #if SDL_VIDEO_VULKAN
  #define DEFAULT_VULKAN "libvulkan.so"
  
  #define LOAD_FUNC(NAME) \
Simple merge