v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add compiler switgxh for using static linkage for std_image

pull/4478/head
Kim Kulling 2022-05-31 23:24:31 +02:00
parent 05867f4752
commit b7a70ac707
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/Common/Assimp.cpp
View File

@ -1284,7 +1284,9 @@ ASSIMP_API void aiQuaternionInterpolate(
#if ASSIMP_NEEDS_STB_IMAGE #if ASSIMP_NEEDS_STB_IMAGE
// Share stb_image's PNG loader with other importers/exporters instead of bringing our own copy. // Share stb_image's PNG loader with other importers/exporters instead of bringing our own copy.
# define STBI_ONLY_PNG # define STBI_ONLY_PNG
# ifdef ASSIMP_USE_STB_IMAGE_STATIC
# define STB_IMAGE_STATIC # define STB_IMAGE_STATIC
# endif
# define STB_IMAGE_IMPLEMENTATION # define STB_IMAGE_IMPLEMENTATION
# include "Common/StbCommon.h" # include "Common/StbCommon.h"
#endif #endif

2
code/Pbrt/PbrtExporter.cpp
View File

@ -83,9 +83,7 @@ Other:
#include <sstream> #include <sstream>
#include <string> #include <string>
#if ASSIMP_NEEDS_STB_IMAGE
#include "Common/StbCommon.h" #include "Common/StbCommon.h"
#endif
using namespace Assimp; using namespace Assimp;

1
test/unit/Main.cpp
View File

@ -1,6 +1,5 @@
#include "../../include/assimp/DefaultLogger.hpp" #include "../../include/assimp/DefaultLogger.hpp"
#include "UnitTestPCH.h" #include "UnitTestPCH.h"
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>