From be33feba44009f035c409ae563cd34a0a6c04a50 Mon Sep 17 00:00:00 2001 From: Sergio Acereda Date: Mon, 29 Jan 2018 12:39:40 +0100 Subject: [PATCH] Warning LNK4221 when not building exporter. --- code/AssbinExporter.cpp | 8 ++++---- code/AssxmlExporter.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/AssbinExporter.cpp b/code/AssbinExporter.cpp index 398eb5bba..cc404396b 100644 --- a/code/AssbinExporter.cpp +++ b/code/AssbinExporter.cpp @@ -42,6 +42,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file AssbinExporter.cpp * ASSBIN exporter main code */ + +#ifndef ASSIMP_BUILD_NO_EXPORT +#ifndef ASSIMP_BUILD_NO_ASSBIN_EXPORTER + #include "assbin_chunks.h" #include #include @@ -58,10 +62,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include - -#ifndef ASSIMP_BUILD_NO_EXPORT -#ifndef ASSIMP_BUILD_NO_ASSBIN_EXPORTER - using namespace Assimp; namespace Assimp { diff --git a/code/AssxmlExporter.cpp b/code/AssxmlExporter.cpp index 27e77383b..c9e125d0d 100644 --- a/code/AssxmlExporter.cpp +++ b/code/AssxmlExporter.cpp @@ -42,6 +42,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file AssxmlExporter.cpp * ASSXML exporter main code */ + +#ifndef ASSIMP_BUILD_NO_EXPORT +#ifndef ASSIMP_BUILD_NO_ASSXML_EXPORTER + #include #include #include "ProcessHelper.h" @@ -58,9 +62,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#ifndef ASSIMP_BUILD_NO_EXPORT -#ifndef ASSIMP_BUILD_NO_ASSXML_EXPORTER - using namespace Assimp; namespace Assimp {