Merge pull request #9 from kogaki/fix/submodule

follow latest utility
opentoonz · Apr 1, 2016 · cf52fcc · cf52fcc
2 parents 195e0ce + 38bcf08
commit cf52fcc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,15 +19,15 @@ if(WIN32)
 endif(WIN32)
 
 if(APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -stdlib=libc++")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
     set(PLUGIN_UTILITY_LIB "${CMAKE_CURRENT_SOURCE_DIR}/opentoonz_plugin_utility/lib/${CMAKE_CFG_INTDIR}/libopentoonz_plugin_utility.a")
 endif(APPLE)
 
 find_package(OpenCV REQUIRED)
 set(LIBS ${OpenCV_LIBS} ${PLUGIN_UTILITY_LIB})
 
 include_directories(opentoonz_plugin_utility/include
-                    opentoonz_plugin_utility/opentoonz_plugin_headers
+                    opentoonz_plugin_utility/plugin_sdk/core
                     "${OpenCV_INCLUDE_DIRS}")
 link_directories("${OpenCV_LIBS}")
 

diff --git a/opentoonz_plugin_utility b/opentoonz_plugin_utility
+3 −3		.gitmodules
+1 −1		CMakeLists.txt
+0 −1		opentoonz_plugin_headers
+1 −0		plugin_sdk
+1 −1		samples/CMakeLists.txt