Remove universalchardet headers from the precompiled header. For some reason this was causing issues with compliation on FreeBSD, rather than investigate why I removed it since it's used by exactly 1 file (charset_ucd.cpp). If it's going to cause one problem now it may cause another later that we may not notice.
Originally committed to SVN as r4919.
This commit is contained in:
parent
b0eb1dfe7c
commit
944eaa535e
3 changed files with 4 additions and 13 deletions
|
@ -22,12 +22,13 @@
|
||||||
|
|
||||||
#ifndef LAGI_PRE
|
#ifndef LAGI_PRE
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include "../../universalchardet/nsCharSetProber.h"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "libaegisub/io.h"
|
#include "libaegisub/io.h"
|
||||||
|
|
||||||
|
#include "../../universalchardet/nsCharSetProber.h"
|
||||||
|
|
||||||
|
|
||||||
namespace agi {
|
namespace agi {
|
||||||
namespace charset {
|
namespace charset {
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
#ifndef LAGI_PRE
|
#ifndef LAGI_PRE
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#define _X86_ 1
|
#define _X86_ 1
|
||||||
|
@ -30,8 +31,6 @@
|
||||||
#include "../../universalchardet/nscore.h"
|
#include "../../universalchardet/nscore.h"
|
||||||
#include "../../universalchardet/nsUniversalDetector.h"
|
#include "../../universalchardet/nsUniversalDetector.h"
|
||||||
#include "../../universalchardet/nsMBCSGroupProber.h"
|
#include "../../universalchardet/nsMBCSGroupProber.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
namespace agi {
|
namespace agi {
|
||||||
namespace charset {
|
namespace charset {
|
||||||
|
|
|
@ -55,12 +55,3 @@
|
||||||
#include "libaegisub/cajun/visitor.h"
|
#include "libaegisub/cajun/visitor.h"
|
||||||
#include "libaegisub/cajun/writer.h"
|
#include "libaegisub/cajun/writer.h"
|
||||||
|
|
||||||
// Universalchardet
|
|
||||||
#ifndef _WIN32
|
|
||||||
#define _X86_ 1
|
|
||||||
#endif
|
|
||||||
#include "../universalchardet/nscore.h"
|
|
||||||
#include "../universalchardet/nsUniversalDetector.h"
|
|
||||||
#include "../universalchardet/nsMBCSGroupProber.h"
|
|
||||||
#include "../universalchardet/nsCharSetProber.h"
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue