Skip to content

Commit bf76059

Browse files
johnhaddonjohnhaddon
committed
Merge branch 'boberfly-exports'
2 parents 2d4aad0 + f40ddc9 commit bf76059

File tree

652 files changed

+2128
-859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

652 files changed

+2128
-859
lines changed

‎contrib/IECoreAlembic/include/IECoreAlembic/AlembicInput.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
#include "IECore/VectorTypedData.h"
4343
#include "IECore/ToCoreConverter.h"
4444

45+
#include "IECoreAlembic/Export.h"
46+
4547
namespace IECoreAlembic
4648
{
4749

@@ -53,7 +55,7 @@ IE_CORE_FORWARDDECLARE( AlembicInput )
5355
/// reading of 3D scene data only. Finer control and lower level
5456
/// access can be obtained by using a combination of the Alembic
5557
/// APIs and the FromAlembicConverters.
56-
class AlembicInput : public IECore::RefCounted
58+
class IECOREALEMBIC_API AlembicInput : public IECore::RefCounted
5759
{
5860

5961
public :

‎contrib/IECoreAlembic/include/IECoreAlembic/Export.h‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
//////////////////////////////////////////////////////////////////////////
2+
//
3+
// Copyright (c) 2012, John Haddon. All rights reserved.
4+
// Copyright (c) 2013, Image Engine Design Inc. All rights reserved.
5+
//
6+
// Redistribution and use in source and binary forms, with or without
7+
// modification, are permitted provided that the following conditions are
8+
// met:
9+
//
10+
// * Redistributions of source code must retain the above copyright
11+
// notice, this list of conditions and the following disclaimer.
12+
//
13+
// * Redistributions in binary form must reproduce the above copyright
14+
// notice, this list of conditions and the following disclaimer in the
15+
// documentation and/or other materials provided with the distribution.
16+
//
17+
// * Neither the name of Image Engine Design nor the names of any
18+
// other contributors to this software may be used to endorse or
19+
// promote products derived from this software without specific prior
20+
// written permission.
21+
//
22+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
23+
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
24+
// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
25+
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
26+
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
27+
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
28+
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
29+
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
30+
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
31+
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
32+
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33+
//
34+
//////////////////////////////////////////////////////////////////////////
35+
36+
#ifndef IECOREALEMBIC_EXPORT_H
37+
#define IECOREALEMBIC_EXPORT_H
38+
39+
#include "IECore/Export.h"
40+
41+
// define IECOREALEMBIC_API macro based on whether or not we are compiling
42+
// IECoreAlembic, or including headers for linking to it. the
43+
// IECOREALEMBIC_API macro is the one that is used in the class definitions.
44+
#ifdef IECOREALEMBIC_EXPORTS
45+
#define IECOREALEMBIC_API IECORE_EXPORT
46+
#else
47+
#define IECOREALEMBIC_API IECORE_IMPORT
48+
#endif
49+
50+
#endif // #ifndef IECOREALEMBIC_EXPORT_H

‎contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicCameraConverter.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@
4040
#include "IECore/Camera.h"
4141

4242
#include "IECoreAlembic/FromAlembicConverter.h"
43+
#include "IECoreAlembic/Export.h"
4344

4445
namespace IECoreAlembic
4546
{
4647

47-
class FromAlembicCameraConverter : public FromAlembicConverter
48+
class IECOREALEMBIC_API FromAlembicCameraConverter : public FromAlembicConverter
4849
{
4950

5051
public :

‎contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicConverter.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,14 @@
4242
#include "IECore/NumericParameter.h"
4343

4444
#include "IECoreAlembic/TypeIds.h"
45+
#include "IECoreAlembic/Export.h"
4546

4647
namespace IECoreAlembic
4748
{
4849

4950
IE_CORE_FORWARDDECLARE( FromAlembicConverter )
5051

51-
class FromAlembicConverter : public IECore::ToCoreConverter
52+
class IECOREALEMBIC_API FromAlembicConverter : public IECore::ToCoreConverter
5253
{
5354

5455
public :

‎contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicGeomBaseConverter.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@
4040
#include "IECore/MeshPrimitive.h"
4141

4242
#include "IECoreAlembic/FromAlembicConverter.h"
43+
#include "IECoreAlembic/Export.h"
4344

4445
namespace IECoreAlembic
4546
{
4647

47-
class FromAlembicGeomBaseConverter : public FromAlembicConverter
48+
class IECOREALEMBIC_API FromAlembicGeomBaseConverter : public FromAlembicConverter
4849
{
4950

5051
public :

‎contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicPolyMeshConverter.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@
4040
#include "IECore/MeshPrimitive.h"
4141

4242
#include "IECoreAlembic/FromAlembicGeomBaseConverter.h"
43+
#include "IECoreAlembic/Export.h"
4344

4445
namespace IECoreAlembic
4546
{
4647

47-
class FromAlembicPolyMeshConverter : public FromAlembicGeomBaseConverter
48+
class IECOREALEMBIC_API FromAlembicPolyMeshConverter : public FromAlembicGeomBaseConverter
4849
{
4950

5051
public :

‎contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicSubDConverter.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@
4040
#include "IECore/MeshPrimitive.h"
4141

4242
#include "IECoreAlembic/FromAlembicGeomBaseConverter.h"
43+
#include "IECoreAlembic/Export.h"
4344

4445
namespace IECoreAlembic
4546
{
4647

47-
class FromAlembicSubDConverter : public FromAlembicGeomBaseConverter
48+
class IECOREALEMBIC_API FromAlembicSubDConverter : public FromAlembicGeomBaseConverter
4849
{
4950

5051
public :

‎contrib/IECoreAlembic/include/IECoreAlembic/FromAlembicXFormConverter.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@
4040
#include "IECore/SimpleTypedData.h"
4141

4242
#include "IECoreAlembic/FromAlembicConverter.h"
43+
#include "IECoreAlembic/Export.h"
4344

4445
namespace IECoreAlembic
4546
{
4647

4748
/// \todo Maybe template this to also be able to return M44d?
48-
class FromAlembicXFormConverter : public FromAlembicConverter
49+
class IECOREALEMBIC_API FromAlembicXFormConverter : public FromAlembicConverter
4950
{
5051

5152
public :

‎contrib/IECoreArnold/include/IECoreArnold/Export.h‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
//////////////////////////////////////////////////////////////////////////
2+
//
3+
// Copyright (c) 2012, John Haddon. All rights reserved.
4+
// Copyright (c) 2013, Image Engine Design Inc. All rights reserved.
5+
//
6+
// Redistribution and use in source and binary forms, with or without
7+
// modification, are permitted provided that the following conditions are
8+
// met:
9+
//
10+
// * Redistributions of source code must retain the above copyright
11+
// notice, this list of conditions and the following disclaimer.
12+
//
13+
// * Redistributions in binary form must reproduce the above copyright
14+
// notice, this list of conditions and the following disclaimer in the
15+
// documentation and/or other materials provided with the distribution.
16+
//
17+
// * Neither the name of Image Engine Design nor the names of any
18+
// other contributors to this software may be used to endorse or
19+
// promote products derived from this software without specific prior
20+
// written permission.
21+
//
22+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
23+
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
24+
// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
25+
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
26+
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
27+
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
28+
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
29+
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
30+
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
31+
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
32+
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33+
//
34+
//////////////////////////////////////////////////////////////////////////
35+
36+
#ifndef IECOREARNOLD_EXPORT_H
37+
#define IECOREARNOLD_EXPORT_H
38+
39+
#include "IECore/Export.h"
40+
41+
// define IECOREARNOLD_API macro based on whether or not we are compiling
42+
// IECoreArnold, or including headers for linking to it. the
43+
// IECOREARNOLD_API macro is the one that is used in the class definitions.
44+
#ifdef IECOREARNOLD_EXPORTS
45+
#define IECOREARNOLD_API IECORE_EXPORT
46+
#else
47+
#define IECOREARNOLD_API IECORE_IMPORT
48+
#endif
49+
50+
#endif // #ifndef IECOREARNOLD_EXPORT_H

‎contrib/IECoreArnold/include/IECoreArnold/InstancingConverter.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,15 @@
3939

4040
#include "IECore/Primitive.h"
4141

42+
#include "IECoreArnold/Export.h"
43+
4244
namespace IECoreArnold
4345
{
4446

4547
/// A class for managing the conversion of a series of IECore::Primitives to
4648
/// AtNodes, automatically returning ginstances when a previously converted
4749
/// primitive is processed again.
48-
class InstancingConverter : public IECore::RefCounted
50+
class IECOREARNOLD_API InstancingConverter : public IECore::RefCounted
4951
{
5052

5153
public :

0 commit comments

Comments
 (0)