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

Link std_image statically.

pull/4478/head
Kim Kulling 2022-04-05 18:48:45 +02:00
parent 75ab2beb06
commit b8658cefe0
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/AssetLib/M3D/M3DWrapper.h
View File

@ -59,6 +59,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// 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
#define STB_IMAGE_STATIC
#include <stb/stb_image.h> #include <stb/stb_image.h>
#include "m3d.h" #include "m3d.h"

1
code/Common/Assimp.cpp
View File

@ -1290,6 +1290,7 @@ ASSIMP_API void aiQuaternionInterpolate(
# endif # endif
# define STB_IMAGE_IMPLEMENTATION # define STB_IMAGE_IMPLEMENTATION
# define STB_IMAGE_STATIC
# include "stb/stb_image.h" # include "stb/stb_image.h"
# if _MSC_VER # if _MSC_VER

9
code/Pbrt/PbrtExporter.cpp
View File

@ -83,7 +83,16 @@ Other:
#include <sstream> #include <sstream>
#include <string> #include <string>
#if _MSC_VER // "unreferenced function has been removed" (SSE2 detection routine in x64 builds)
#pragma warning(push)
#pragma warning(disable : 4505)
#endif
#define STB_IMAGE_STATIC
#define STB_IMAGE_IMPLEMENTATION
#include "stb/stb_image.h" #include "stb/stb_image.h"
#if _MSC_VER
#pragma warning(pop)
#endif
using namespace Assimp; using namespace Assimp;