always include "utf8.h" (instead of contrib/.../utf8.h)
parent
85f64c9131
commit
6f70e220e4
|
@ -42,11 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include "MMDPmxParser.h"
|
#include "MMDPmxParser.h"
|
||||||
#include <assimp/StringUtils.h>
|
#include <assimp/StringUtils.h>
|
||||||
#ifdef ASSIMP_USE_HUNTER
|
#include "utf8.h"
|
||||||
# include <utf8.h>
|
|
||||||
#else
|
|
||||||
# include "../contrib/utf8cpp/source/utf8.h"
|
|
||||||
#endif
|
|
||||||
#include <assimp/Exceptional.h>
|
#include <assimp/Exceptional.h>
|
||||||
|
|
||||||
namespace pmx
|
namespace pmx
|
||||||
|
|
|
@ -56,11 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#include <assimp/ByteSwapper.h>
|
#include <assimp/ByteSwapper.h>
|
||||||
#include <assimp/StreamReader.h>
|
#include <assimp/StreamReader.h>
|
||||||
#include <assimp/TinyFormatter.h>
|
#include <assimp/TinyFormatter.h>
|
||||||
#ifdef ASSIMP_USE_HUNTER
|
#include "utf8.h"
|
||||||
#include <utf8.h>
|
|
||||||
#else
|
|
||||||
#include "../contrib/utf8cpp/source/utf8.h"
|
|
||||||
#endif
|
|
||||||
#include <assimp/importerdesc.h>
|
#include <assimp/importerdesc.h>
|
||||||
#include <assimp/scene.h>
|
#include <assimp/scene.h>
|
||||||
#include <assimp/DefaultLogger.hpp>
|
#include <assimp/DefaultLogger.hpp>
|
||||||
|
|
|
@ -45,11 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
#include "STEPFileEncoding.h"
|
#include "STEPFileEncoding.h"
|
||||||
#include <assimp/fast_atof.h>
|
#include <assimp/fast_atof.h>
|
||||||
#ifdef ASSIMP_USE_HUNTER
|
#include "utf8.h"
|
||||||
# include <utf8.h>
|
|
||||||
#else
|
|
||||||
# include <contrib/utf8cpp/source/utf8.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
|
|
|
@ -357,11 +357,7 @@ std::string BaseImporter::GetExtension(const std::string &pFile) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef ASSIMP_USE_HUNTER
|
#include "utf8.h"
|
||||||
#include <utf8.h>
|
|
||||||
#else
|
|
||||||
#include "../contrib/utf8cpp/source/utf8.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
// Convert to UTF8 data
|
// Convert to UTF8 data
|
||||||
|
|
Loading…
Reference in New Issue