[Bf-blender-cvs] [a33c9d2] alembic_pointcache: Added boost includes and a thread utility file for mutex and locking.
Lukas Tönne
noreply at git.blender.org
Thu Oct 16 16:52:52 CEST 2014
Commit: a33c9d2a2459f4f9aba4a60a4066ce7ccfb04145
Author: Lukas Tönne
Date: Thu Nov 21 12:19:12 2013 +0100
Branches: alembic_pointcache
https://developer.blender.org/rBa33c9d2a2459f4f9aba4a60a4066ce7ccfb04145
Added boost includes and a thread utility file for mutex and locking.
===================================================================
M source/blender/pointcache/CMakeLists.txt
A source/blender/pointcache/intern/thread.h
===================================================================
diff --git a/source/blender/pointcache/CMakeLists.txt b/source/blender/pointcache/CMakeLists.txt
index c78aebf..32a0bd6 100644
--- a/source/blender/pointcache/CMakeLists.txt
+++ b/source/blender/pointcache/CMakeLists.txt
@@ -32,6 +32,7 @@ set(INC
)
set(INC_SYS
+ ${BOOST_INCLUDE_DIR}
)
set(SRC
@@ -45,7 +46,10 @@ set(SRC
)
if(WITH_ALEMBIC)
- list(APPEND INC_SYS ${ALEMBIC_INCLUDE_DIRS} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
+ list(APPEND INC_SYS
+ ${ALEMBIC_INCLUDE_DIRS}
+ ${OPENEXR_INCLUDE_DIR}/OpenEXR
+ )
list(APPEND SRC
intern/particles.h
@@ -53,6 +57,7 @@ if(WITH_ALEMBIC)
intern/reader.h
intern/reader.cpp
intern/schema.h
+ intern/thread.h
intern/types.h
intern/writer.h
intern/writer.cpp
diff --git a/source/blender/pointcache/intern/thread.h b/source/blender/pointcache/intern/thread.h
new file mode 100644
index 0000000..229c0f5
--- /dev/null
+++ b/source/blender/pointcache/intern/thread.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2013, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef PTC_THREAD_H
+#define PTC_THREAD_H
+
+#include <boost/thread.hpp>
+
+namespace PTC {
+
+typedef boost::mutex thread_mutex;
+typedef boost::mutex::scoped_lock thread_scoped_lock;
+
+} /* namespace PTC */
+
+#endif /* PTC_THREAD_H */
More information about the Bf-blender-cvs
mailing list