forked from mia/Aegisub
As <aegisub/exception.h> should become widely used soon enough, add it to the precompiled headers.
Protect <omp.h> from inclusion on compilers that don't support OpenMP. Originally committed to SVN as r3528.
This commit is contained in:
parent
d1c70ef6d2
commit
42a293ccca
2 changed files with 11 additions and 0 deletions
|
@ -80,7 +80,10 @@
|
||||||
#include <iconv.h>
|
#include <iconv.h>
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
#ifdef _OPENMP
|
||||||
|
// Not all compilers have <omp.h> (example: MSVC Express)
|
||||||
#include <omp.h>
|
#include <omp.h>
|
||||||
|
#endif
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -232,4 +235,8 @@
|
||||||
#undef _CRT_SECURE_NO_WARNINGS
|
#undef _CRT_SECURE_NO_WARNINGS
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
///////////////////
|
||||||
|
// Aegisub headers
|
||||||
|
#include "include/aegisub/exception.h"
|
||||||
|
|
||||||
#endif // C++
|
#endif // C++
|
||||||
|
|
|
@ -39,6 +39,10 @@
|
||||||
// Headers
|
// Headers
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#ifndef AGI_PRE
|
||||||
|
#include "include/aegisub/exception.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "ass_attachment.h"
|
#include "ass_attachment.h"
|
||||||
#include "ass_dialogue.h"
|
#include "ass_dialogue.h"
|
||||||
#include "ass_entry.h"
|
#include "ass_entry.h"
|
||||||
|
|
Loading…
Reference in a new issue