浏览代码

Link std_image statically.

Kim Kulling 3 年之前
父节点
当前提交
b8658cefe0
共有 3 个文件被更改,包括 11 次插入0 次删除
  1. 1 0
      code/AssetLib/M3D/M3DWrapper.h
  2. 1 0
      code/Common/Assimp.cpp
  3. 9 0
      code/Pbrt/PbrtExporter.cpp

+ 1 - 0
code/AssetLib/M3D/M3DWrapper.h

@@ -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 - 0
code/Common/Assimp.cpp

@@ -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 - 0
code/Pbrt/PbrtExporter.cpp

@@ -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;