Link std_image statically.
parent
75ab2beb06
commit
b8658cefe0
|
@ -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.
|
||||
#define STBI_ONLY_PNG
|
||||
#define STB_IMAGE_STATIC
|
||||
#include <stb/stb_image.h>
|
||||
|
||||
#include "m3d.h"
|
||||
|
|
|
@ -1290,6 +1290,7 @@ ASSIMP_API void aiQuaternionInterpolate(
|
|||
# endif
|
||||
|
||||
# define STB_IMAGE_IMPLEMENTATION
|
||||
# define STB_IMAGE_STATIC
|
||||
# include "stb/stb_image.h"
|
||||
|
||||
# if _MSC_VER
|
||||
|
|
|
@ -83,7 +83,16 @@ Other:
|
|||
#include <sstream>
|
||||
#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"
|
||||
#if _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
using namespace Assimp;
|
||||
|
||||
|
|
Loading…
Reference in New Issue