mirror of https://github.com/odrling/Aegisub
* Follow aegisub and rename wx_pre.h to r_pre.h
* Sort headers. * Include missing c/c++ std headers into r_pre.h Originally committed to SVN as r3547.
This commit is contained in:
parent
fcd8f4e04e
commit
dcca1694ce
|
@ -4,9 +4,9 @@ AM_CXXFLAGS =
|
|||
bin_PROGRAMS = reporter
|
||||
|
||||
if PRECOMPILED_HEADER
|
||||
BUILT_SOURCES = wx_pre.h.gch
|
||||
AM_CXXFLAGS += -include wx_pre.h -Winvalid-pch -fpch-deps -fpch-preprocess
|
||||
nodist_reporter_SOURCES = wx_prec.h.gch
|
||||
BUILT_SOURCES = r_pre.h.gch
|
||||
AM_CXXFLAGS += -include r_pre.h -Winvalid-pch -fpch-deps -fpch-preprocess
|
||||
nodist_reporter_SOURCES = r_prec.h.gch
|
||||
endif
|
||||
|
||||
reporter_CPPFLAGS = -Iinclude @LIBCURL_CFLAGS@ @WX_CPPFLAGS@
|
||||
|
@ -14,8 +14,8 @@ reporter_LDFLAGS = @WX_LIBS@ @LIBCURL_LIBS@
|
|||
|
||||
if PRECOMPILED_HEADER
|
||||
# This doesn't depend on Makefile on purpose, you should already know what you're doing when using this.
|
||||
wx_pre.h.gch: wx_pre.h
|
||||
@CXX@ @WX_CPPFLAGS@ @CXXFLAGS@ @DEBUG_FLAGS@ wx_pre.h
|
||||
r_pre.h.gch: r_pre.h
|
||||
@CXX@ @WX_CPPFLAGS@ @CXXFLAGS@ @DEBUG_FLAGS@ r_pre.h
|
||||
endif
|
||||
|
||||
|
||||
|
|
|
@ -18,6 +18,8 @@
|
|||
/// @brief Main loop
|
||||
|
||||
#ifndef R_PRECOMP
|
||||
#include <locale.h>
|
||||
|
||||
#include <wx/app.h>
|
||||
#include <wx/window.h>
|
||||
#include <wx/log.h>
|
||||
|
@ -32,8 +34,6 @@
|
|||
#include <wx/intl.h>
|
||||
#endif
|
||||
|
||||
#include <locale.h>
|
||||
|
||||
#include "main.h"
|
||||
#include "upload.h"
|
||||
|
||||
|
|
|
@ -16,20 +16,22 @@
|
|||
|
||||
/// @@file platform_unix_bsd.cpp
|
||||
/// @brief BSD Platform extensions.
|
||||
|
||||
#ifndef R_PRECOMP
|
||||
#include <wx/string.h>
|
||||
#endif
|
||||
|
||||
#include "include/platform.h"
|
||||
#include "platform_unix.h"
|
||||
#include "platform_unix_bsd.h"
|
||||
|
||||
extern "C" {
|
||||
#include <sys/utsname.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/sysctl.h>
|
||||
}
|
||||
|
||||
#include "include/platform.h"
|
||||
#include "platform_unix.h"
|
||||
#include "platform_unix_bsd.h"
|
||||
|
||||
|
||||
wxString PlatformUnixBSD::CPUId() {
|
||||
char id[300];
|
||||
size_t len = sizeof(id);
|
||||
|
|
|
@ -19,33 +19,45 @@
|
|||
|
||||
#define R_PRECOMP
|
||||
|
||||
#include <wx/wxprec.h>
|
||||
// C + System.
|
||||
#include <locale.h>
|
||||
#include <stdint.h>
|
||||
|
||||
// C++ std
|
||||
#include <map>
|
||||
|
||||
// 3rd party packages.
|
||||
#include <curl/curl.h>
|
||||
|
||||
|
||||
// WX headers
|
||||
#include <wx/wxprec.h>
|
||||
#include <wx/app.h>
|
||||
#include <wx/apptrait.h>
|
||||
#include <wx/button.h>
|
||||
#include <wx/clipbrd.h>
|
||||
#include <wx/cmdline.h>
|
||||
#include <wx/dialog.h>
|
||||
#include <wx/event.h>
|
||||
#include <wx/file.h>
|
||||
#include <wx/fileconf.h>
|
||||
#include <wx/font.h>
|
||||
#include <wx/frame.h>
|
||||
#include <wx/gdicmn.h>
|
||||
#include <wx/intl.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include <wx/log.h>
|
||||
#include <wx/panel.h>
|
||||
#include <wx/progdlg.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/stattext.h>
|
||||
#include <wx/stdpaths.h>
|
||||
#include <wx/string.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/version.h>
|
||||
#include <wx/wfstream.h>
|
||||
#include <wx/window.h>
|
||||
#include <wx/wx.h>
|
||||
#include <wx/wxchar.h>
|
||||
#include <wx/wxprec.h>
|
||||
#include <wx/xml/xml.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include <wx/clipbrd.h>
|
||||
#include <wx/intl.h>
|
||||
#include <wx/file.h>
|
||||
#include <wx/progdlg.h>
|
||||
#include <wx/fileconf.h>
|
||||
#include <wx/wfstream.h>
|
||||
#include <wx/apptrait.h>
|
||||
#include <wx/stdpaths.h>
|
|
@ -18,11 +18,12 @@
|
|||
/// @see report.cpp
|
||||
|
||||
#ifndef R_PRECOMP
|
||||
#include <map>
|
||||
|
||||
#include <wx/xml/xml.h>
|
||||
#include <wx/listctrl.h>
|
||||
#endif
|
||||
|
||||
#include <map>
|
||||
|
||||
class Report {
|
||||
|
||||
|
|
|
@ -30,7 +30,9 @@
|
|||
#ifndef _SHA256_H_
|
||||
#define _SHA256_H_
|
||||
|
||||
#ifndef R_PRECOMP
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
typedef struct SHA256Context {
|
||||
uint32_t state[8];
|
||||
|
|
|
@ -18,9 +18,11 @@
|
|||
/// @see upload.cpp
|
||||
|
||||
#ifndef R_PRECMP
|
||||
#include <curl/curl.h>
|
||||
|
||||
#include <wx/file.h>
|
||||
#endif
|
||||
#include <curl/curl.h>
|
||||
|
||||
#include "progress.h"
|
||||
|
||||
/// @class Upload
|
||||
|
|
Loading…
Reference in New Issue