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

* 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

View file

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

View file

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

View file

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

View file

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

View file

@ -29,7 +29,7 @@
// //
// $Id$ // $Id$
/// @file stdwx.h /// @file agi_pre.h
/// @brief Precompiled headers include file, including all headers that should be precompiled /// @brief Precompiled headers include file, including all headers that should be precompiled
/// @ingroup main /// @ingroup main
/// ///
@ -49,13 +49,16 @@
///////// /////////
// Setup // 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 #ifdef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS_DEFINED #define _CRT_SECURE_NO_WARNINGS_DEFINED
#else #else
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#endif #endif
#define WIN32_LEAN_AND_MEAN
#define WX_PRE
/////////////// ///////////////
// STD headers // STD headers

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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