From af8261e9090bffed3cc94452af90c8fa00173cde Mon Sep 17 00:00:00 2001
From: Syoyo Fujita <syoyo@lighttransport.com>
Date: Thu, 20 Aug 2020 00:22:35 +0900
Subject: [PATCH] Build fix on MSVC.

---
 examples/sdlviewer/CMakeLists.txt   | 26 +++++++++++++++++++++++---
 examples/sdlviewer/simple-render.cc |  2 ++
 examples/sdlviewer/vcsetup-2019.bat |  4 ++++
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 examples/sdlviewer/vcsetup-2019.bat

diff --git a/examples/sdlviewer/CMakeLists.txt b/examples/sdlviewer/CMakeLists.txt
index 4f1d8ca3..54749328 100644
--- a/examples/sdlviewer/CMakeLists.txt
+++ b/examples/sdlviewer/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Assume this project is a root project
 cmake_minimum_required(VERSION 3.5.1)
 
-project(${BUILD_TARGET} CXX)
-
 set(BUILD_TARGET "usdz_view")
 
+project(${BUILD_TARGET} CXX)
+
 option(TINYUSDZ_USE_CCACHE "Use ccache for faster recompile." ON)
 option(TINYUSDZ_WITH_OPENSUBDIV "Build with OpenSubdiv(osdCPU. if required, set `osd_DIR` to specify the path to your own OpenSubdiv)" ON)
 
@@ -52,6 +52,10 @@ function ( ADD_SDL2_LIB )
   set(VIDEO_OPENGL OFF CACHE INTERNAL "" FORCE)
   set(VIDEO_OPENGLES OFF CACHE INTERNAL "" FORCE)
   set(VIDEO_WAYLAND OFF CACHE INTERNAL "" FORCE)
+
+  # Enable static lib only
+  set(SDL_SAHARED OFF CACHE INTERNAL "" FORCE)
+  set(SDL_STATIC ON CACHE INTERNAL "" FORCE)
   add_subdirectory(../common/SDL2-2.0.12/ SDL2)
 endfunction ()
 ADD_SDL2_LIB()
@@ -191,7 +195,8 @@ target_include_directories(${BUILD_TARGET} PRIVATE "${PROJECT_SOURCE_DIR}/../../
 
 target_link_libraries(
     ${BUILD_TARGET}
-    SDL2
+    SDL2-static
+    SDL2main
     ${EXT_LIBRARIES}
     ${CMAKE_DL_LIBS}
 )
@@ -211,3 +216,18 @@ else()
 endif()
 
 source_group("Source Files" FILES ${SOURCES})
+
+# [VisualStudio]
+if(WIN32)
+  # Set ${LIDIA_BUILD_TARGET} as a startup project for VS IDE
+  set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT ${BUILD_TARGET})
+
+  # For easier debugging in VS IDE(cmake 3.8.0 or later required) Set working
+  # directory to ${LIDIA_BUILD_TARGET} git repo root.
+  if(CMAKE_VERSION VERSION_GREATER 3.8.0)
+    set_target_properties(${BUILD_TARGET}
+                          PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY
+                                     "${CMAKE_CURRENT_SOURCE_DIR}")
+  endif()
+endif()
+
diff --git a/examples/sdlviewer/simple-render.cc b/examples/sdlviewer/simple-render.cc
index cee9aeae..ec87ad47 100644
--- a/examples/sdlviewer/simple-render.cc
+++ b/examples/sdlviewer/simple-render.cc
@@ -234,6 +234,8 @@ bool Render(const RenderScene& scene, const Camera& cam, AOV* output) {
   }
 
   // auto endT = std::chrono::system_clock::now();
+
+  return true;
 }
 
 }  // namespace example
diff --git a/examples/sdlviewer/vcsetup-2019.bat b/examples/sdlviewer/vcsetup-2019.bat
new file mode 100644
index 00000000..568a75fe
--- /dev/null
+++ b/examples/sdlviewer/vcsetup-2019.bat
@@ -0,0 +1,4 @@
+rmdir /s /q build
+mkdir build
+
+cmake -G "Visual Studio 16 2019" -A x64 -DTINYUSDZ_WITH_OPENSUBDIV=On -Bbuild -H.