forked from mia/Aegisub
Juggle include order in agi_pre.h around a bit to make things work properly on Windows.
Originally committed to SVN as r3517.
This commit is contained in:
parent
d455a61732
commit
1d80d6514b
1 changed files with 9 additions and 13 deletions
|
@ -49,7 +49,6 @@
|
||||||
|
|
||||||
/////////
|
/////////
|
||||||
// Setup
|
// Setup
|
||||||
#define WIN32_LEAN_AND_MEAN
|
|
||||||
#define AGI_PRE
|
#define AGI_PRE
|
||||||
|
|
||||||
// Block msvc from complaining about not using msvc-specific versions for
|
// Block msvc from complaining about not using msvc-specific versions for
|
||||||
|
@ -86,32 +85,29 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/fcntl.h>
|
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#include <sys/mman.h>
|
|
||||||
#include <sys/param.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <unistd.h>
|
|
||||||
#include <wchar.h>
|
#include <wchar.h>
|
||||||
|
|
||||||
#ifdef __WINDOWS__
|
#ifdef _WIN32
|
||||||
#include <Mmreg.h>
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
#include <windows.h>
|
||||||
|
#include <mmsystem.h>
|
||||||
#include <dsound.h>
|
#include <dsound.h>
|
||||||
#include <process.h>
|
#include <process.h>
|
||||||
#include <mmsystem.h>
|
//#include <objbase.h>
|
||||||
#include <objbase.h>
|
|
||||||
#include <shlobj.h>
|
#include <shlobj.h>
|
||||||
#include <tchar.h>
|
#include <tchar.h>
|
||||||
#include <vfw.h>
|
#include <vfw.h>
|
||||||
#include <windef.h>
|
//#include <windef.h>
|
||||||
#include <windows.h>
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#include <sys/fcntl.h>
|
#include <sys/fcntl.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <sys/param.h>
|
||||||
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/////////////////////
|
/////////////////////
|
||||||
|
|
Loading…
Reference in a new issue