mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

* Rename stdwx.h to agi_pre.h as it doesn't include wx headers only, it's confusing.

Browse source 
* Rename include guard to AGI_PRE.

Originally committed to SVN as r3509.
This commit is contained in:
Amar Takhar 2009-09-10 04:14:28 +00:00
parent 132d8ba3ac
commit 05ae13a8ab
11 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
View file

@ -46,9 +46,9 @@
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdwx.h"
PrecompiledHeaderThrough="agi_pre.h"
DisableSpecificWarnings="4267"
ForcedIncludeFiles="stdwx.h"
ForcedIncludeFiles="agi_pre.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -112,9 +112,9 @@
PreprocessorDefinitions="WIN32;WIN64;_DEBUG;_WINDOWS"
MinimalRebuild="true"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdwx.h"
PrecompiledHeaderThrough="agi_pre.h"
DisableSpecificWarnings="4267"
ForcedIncludeFiles="stdwx.h"
ForcedIncludeFiles="agi_pre.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -178,10 +178,10 @@
AdditionalOptions="/MP"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdwx.h"
PrecompiledHeaderThrough="agi_pre.h"
ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
DisableSpecificWarnings="4267"
ForcedIncludeFiles="stdwx.h"
ForcedIncludeFiles="agi_pre.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -247,9 +247,9 @@
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;WIN64;NDEBUG;_WINDOWS"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdwx.h"
PrecompiledHeaderThrough="agi_pre.h"
DisableSpecificWarnings="4267"
ForcedIncludeFiles="stdwx.h"
ForcedIncludeFiles="agi_pre.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -1316,7 +1316,7 @@
>
</File>
<File
RelativePath="..\..\src\stdwx.cpp"
RelativePath="..\..\src\agi_pre.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@ -1352,7 +1352,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\stdwx.h"
RelativePath="..\..\src\agi_pre.h"
>
</File>
<File

6
aegisub/po/POTFILES.in
View file

@ -6,6 +6,9 @@ aegisub_endian.h
aegisublocale.cpp
aegisublocale.cpp
aegisublocale.h
agi_pre.cpp
agi_pre.cpp
agi_pre.h
ass_attachment.cpp
ass_attachment.cpp
ass_attachment.h
@ -345,9 +348,6 @@ standard_paths.h
static_bmp.cpp
static_bmp.cpp
static_bmp.h
stdwx.cpp
stdwx.cpp
stdwx.h
string_codec.cpp
string_codec.cpp
string_codec.h

13
aegisub/src/Makefile.am
View file

@ -10,10 +10,10 @@ libosxutil_ldflags = -framework CoreFoundation
endif
if PRECOMPILED_HEADER
BUILT_SOURCES = stdwx.h.gch
precompiled_header = stdwx.h
AM_CXXFLAGS += -Winvalid-pch -fpch-deps -fpch-preprocess -include stdwx.h
nodist_aegisub_2_2_SOURCES = stdwx.h.gch
BUILT_SOURCES = agi_pre.h.gch
precompiled_header = agi_pre.h
AM_CXXFLAGS += -Winvalid-pch -fpch-deps -fpch-preprocess -include agi_pre.h
nodist_aegisub_2_2_SOURCES = agi_pre.h.gch
endif
SUBDIRS = \
@ -31,8 +31,8 @@ LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @CCMALLOC_LIBS@
if PRECOMPILED_HEADER
# This doesn't depend on Makefile on purpose, you should already know what you're doing when using this.
stdwx.h.gch: stdwx.h
@CXX@ -include ../acconf.h $(DEFAULT_INCLUDES) @CXXFLAGS@ $(AM_CXXFLAGS) @DEBUG_FLAGS@ @PROFILE_FLAGS@ stdwx.h
agi_pre.h.gch: agi_pre.h
@CXX@ -include ../acconf.h $(DEFAULT_INCLUDES) @CXXFLAGS@ $(AM_CXXFLAGS) @DEBUG_FLAGS@ @PROFILE_FLAGS@ agi_pre.h
endif
if BUILD_DARWIN
@ -169,7 +169,6 @@ EXTRA_aegisub_2_2_SOURCES = \
dialog_associations.cpp \
setup.cpp \
spellchecker_hunspell.cpp \
stdwx.cpp \
subtitle_format_prs.cpp \
subtitles_provider_csri.cpp \
subtitles_provider_libass.cpp \

6
aegisub/src/stdwx.cpp → aegisub/src/agi_pre.cpp
View file

@ -29,7 +29,7 @@
//
// $Id$
/// @file stdwx.cpp
/// @file agi_pre.cpp
/// @brief Precompiled headers control file, including stdwx.h only to generate precompiled header data
/// @ingroup main
///
@ -38,7 +38,7 @@
//
// Precompiled Header Source File
//
// In order to use it, set the project to use stdwx.h as precompiled header and
// In order to use it, set the project to use agi_pre.h as precompiled header and
// insert it in every source file (under C/C++ -> Advanced -> Force Includes),
// then set this file to generate the precompiled header
//
@ -48,5 +48,5 @@
#include "config.h"
#include "stdwx.h"
#include "agi_pre.h"

9
aegisub/src/stdwx.h → aegisub/src/agi_pre.h
View file

@ -29,7 +29,7 @@
//
// $Id$
/// @file stdwx.h
/// @file agi_pre.h
/// @brief Precompiled headers include file, including all headers that should be precompiled
/// @ingroup main
///
@ -49,13 +49,16 @@
/////////
// Setup
#define WIN32_LEAN_AND_MEAN
#define AGI_PRE
// Block msvc from complaining about not using msvc-specific versions for
// insecure C functions.
#ifdef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS_DEFINED
#else
#define _CRT_SECURE_NO_WARNINGS
#endif
#define WIN32_LEAN_AND_MEAN
#define WX_PRE
///////////////
// STD headers

2
aegisub/src/ass_attachment.cpp
View file

@ -39,7 +39,7 @@
// Includes
#include "config.h"
#ifndef WX_PRE
#ifndef AGI_PRE
#include <wx/filename.h>
#include <wx/wfstream.h>
#endif

4
aegisub/src/ass_dialogue.cpp
View file

@ -39,12 +39,12 @@
// Includes
#include "config.h"
#ifndef WX_PRE
#ifndef AGI_PRE
#include <fstream>
#include <wx/regex.h>
#include <wx/tokenzr.h>
#endif
#include <fstream>
#include "ass_dialogue.h"
#include "ass_override.h"
#include "vfr.h"

4
aegisub/src/config.h
View file

@ -1,4 +1,4 @@
#ifndef WX_PRE
#ifndef AGI_PRE
#ifdef _WIN32
@ -15,4 +15,4 @@
#endif // __WINDOWS__
#endif // WX_PRE
#endif // AGI_PRE

2
aegisub/src/config/config_unix.h
View file

@ -16,8 +16,6 @@
#include <inttypes.h>
#endif
#include <stdwx.h>
// These shouldn't be needed any longer, if there are
// any occurrences of __int64 replace them with long long.
//typedef int64_t __int64;

2
aegisub/src/main.cpp
View file

@ -39,7 +39,7 @@
// Includes
#include "config.h"
#ifndef WX_PRE
#ifndef AGI_PRE
#include <wx/config.h>
#include <wx/datetime.h>
#include <wx/filefn.h>

2
aegisub/src/main.h
View file

@ -38,7 +38,7 @@
///////////////////
// Include headers
#ifndef WX_PRE
#ifndef AGI_PRE
#include <wx/app.h>
#include <wx/file.h>
#include <wx/stackwalk.h>