From 66ba65774aa8bd4c5a571c5c595fce9cbbbcf930 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 12 May 2014 17:09:09 -0700 Subject: [PATCH] Add custom build system for wxWidgets --- Aegisub.sln | 59 ++- build/Aegisub/Aegisub.vcxproj | 19 +- build/expat/expat.vcxproj | 53 ++ build/expat/expat.vcxproj.filters | 17 + build/libpng/libpng.vcxproj | 46 ++ build/libpng/libpng.vcxproj.filters | 17 + build/scintilla/catalogue.cpp | 13 + build/scintilla/scintilla.vcxproj | 91 ++++ build/scintilla/scintilla.vcxproj.filters | 17 + build/wx/setup-installed.h | 37 +- build/wx/stc-fi.h | 7 + build/wx/wxWidgets.vcxproj | 560 ++++++++++++++++++++-- src/agi_pre.cpp | 47 +- 13 files changed, 843 insertions(+), 140 deletions(-) create mode 100644 build/expat/expat.vcxproj create mode 100644 build/expat/expat.vcxproj.filters create mode 100644 build/libpng/libpng.vcxproj create mode 100644 build/libpng/libpng.vcxproj.filters create mode 100644 build/scintilla/catalogue.cpp create mode 100644 build/scintilla/scintilla.vcxproj create mode 100644 build/scintilla/scintilla.vcxproj.filters create mode 100644 build/wx/stc-fi.h diff --git a/Aegisub.sln b/Aegisub.sln index 9190df069..fe3e67645 100644 --- a/Aegisub.sln +++ b/Aegisub.sln @@ -128,6 +128,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luajit", "build\luajit\luaj {7CA6A4EB-A11B-4975-8F3A-F633111C6213} = {7CA6A4EB-A11B-4975-8F3A-F633111C6213} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "build\expat\expat.vcxproj", "{D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "build\libpng\libpng.vcxproj", "{5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scintilla", "build\scintilla\scintilla.vcxproj", "{D6EA54FD-F15C-42F6-929B-A83F299A4582}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -230,6 +236,7 @@ Global {BD00D65F-24DA-4784-8860-3B972EA125FC}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32 {BD00D65F-24DA-4784-8860-3B972EA125FC}.Debug-MinDep|Win32.Build.0 = Debug|Win32 {BD00D65F-24DA-4784-8860-3B972EA125FC}.Debug-MinDep|x64.ActiveCfg = Debug|x64 + {BD00D65F-24DA-4784-8860-3B972EA125FC}.Debug-MinDep|x64.Build.0 = Debug|x64 {BD00D65F-24DA-4784-8860-3B972EA125FC}.Debug-Tests|Win32.ActiveCfg = Debug|Win32 {BD00D65F-24DA-4784-8860-3B972EA125FC}.Debug-Tests|x64.ActiveCfg = Debug|x64 {BD00D65F-24DA-4784-8860-3B972EA125FC}.Release|Win32.ActiveCfg = Release|Win32 @@ -246,7 +253,6 @@ Global {A7A30702-8162-4E1A-A010-EF51B590C121}.Debug|x64.Build.0 = Debug|x64 {A7A30702-8162-4E1A-A010-EF51B590C121}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32 {A7A30702-8162-4E1A-A010-EF51B590C121}.Debug-MinDep|x64.ActiveCfg = Debug|x64 - {A7A30702-8162-4E1A-A010-EF51B590C121}.Debug-MinDep|x64.Build.0 = Debug|x64 {A7A30702-8162-4E1A-A010-EF51B590C121}.Debug-Tests|Win32.ActiveCfg = Debug|Win32 {A7A30702-8162-4E1A-A010-EF51B590C121}.Debug-Tests|x64.ActiveCfg = Debug|x64 {A7A30702-8162-4E1A-A010-EF51B590C121}.Debug-Tests|x64.Build.0 = Debug|x64 @@ -426,7 +432,6 @@ Global {F934AB7B-186B-4E96-B20C-A58C38C1B818}.Debug|x64.Build.0 = Debug|x64 {F934AB7B-186B-4E96-B20C-A58C38C1B818}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32 {F934AB7B-186B-4E96-B20C-A58C38C1B818}.Debug-MinDep|x64.ActiveCfg = Debug|x64 - {F934AB7B-186B-4E96-B20C-A58C38C1B818}.Debug-MinDep|x64.Build.0 = Debug|x64 {F934AB7B-186B-4E96-B20C-A58C38C1B818}.Debug-Tests|Win32.ActiveCfg = Debug|Win32 {F934AB7B-186B-4E96-B20C-A58C38C1B818}.Debug-Tests|x64.ActiveCfg = Debug|x64 {F934AB7B-186B-4E96-B20C-A58C38C1B818}.Debug-Tests|x64.Build.0 = Debug|x64 @@ -471,7 +476,6 @@ Global {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}.Debug-Tests|Win32.ActiveCfg = Debug|Any CPU {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}.Debug-Tests|x64.ActiveCfg = Debug|Any CPU {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}.Release|Win32.ActiveCfg = Release|Any CPU - {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}.Release|Win32.Build.0 = Release|Any CPU {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}.Release|x64.ActiveCfg = Release|Any CPU {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}.Release-MinDep|Win32.ActiveCfg = Release|Any CPU {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}.Release-MinDep|x64.ActiveCfg = Release|Any CPU @@ -509,7 +513,6 @@ Global {5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug|x64.Build.0 = Debug|x64 {5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32 {5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-MinDep|x64.ActiveCfg = Debug|x64 - {5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-MinDep|x64.Build.0 = Debug|x64 {5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-Tests|Win32.ActiveCfg = Debug|Win32 {5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-Tests|x64.ActiveCfg = Debug|x64 {5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Debug-Tests|x64.Build.0 = Debug|x64 @@ -519,6 +522,54 @@ Global {5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release|x64.Build.0 = Release|x64 {5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release-MinDep|Win32.ActiveCfg = Release|Win32 {5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}.Release-MinDep|x64.ActiveCfg = Release|x64 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Debug|Win32.ActiveCfg = Debug|Win32 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Debug|Win32.Build.0 = Debug|Win32 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Debug|x64.ActiveCfg = Debug|x64 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Debug|x64.Build.0 = Debug|x64 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Debug-MinDep|x64.ActiveCfg = Debug|x64 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Debug-Tests|Win32.ActiveCfg = Debug|Win32 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Debug-Tests|Win32.Build.0 = Debug|Win32 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Debug-Tests|x64.ActiveCfg = Debug|x64 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Debug-Tests|x64.Build.0 = Debug|x64 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Release|Win32.ActiveCfg = Release|Win32 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Release|Win32.Build.0 = Release|Win32 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Release|x64.ActiveCfg = Release|x64 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Release|x64.Build.0 = Release|x64 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Release-MinDep|Win32.ActiveCfg = Release|Win32 + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A}.Release-MinDep|x64.ActiveCfg = Release|x64 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Debug|Win32.ActiveCfg = Debug|Win32 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Debug|Win32.Build.0 = Debug|Win32 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Debug|x64.ActiveCfg = Debug|x64 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Debug|x64.Build.0 = Debug|x64 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Debug-MinDep|x64.ActiveCfg = Debug|x64 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Debug-Tests|Win32.ActiveCfg = Debug|Win32 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Debug-Tests|Win32.Build.0 = Debug|Win32 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Debug-Tests|x64.ActiveCfg = Debug|x64 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Debug-Tests|x64.Build.0 = Debug|x64 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Release|Win32.ActiveCfg = Release|Win32 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Release|Win32.Build.0 = Release|Win32 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Release|x64.ActiveCfg = Release|x64 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Release|x64.Build.0 = Release|x64 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Release-MinDep|Win32.ActiveCfg = Release|Win32 + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96}.Release-MinDep|x64.ActiveCfg = Release|x64 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Debug|Win32.ActiveCfg = Debug|Win32 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Debug|Win32.Build.0 = Debug|Win32 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Debug|x64.ActiveCfg = Debug|x64 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Debug|x64.Build.0 = Debug|x64 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Debug-MinDep|Win32.ActiveCfg = Debug|Win32 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Debug-MinDep|x64.ActiveCfg = Debug|x64 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Debug-Tests|Win32.ActiveCfg = Debug|Win32 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Debug-Tests|Win32.Build.0 = Debug|Win32 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Debug-Tests|x64.ActiveCfg = Debug|x64 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Debug-Tests|x64.Build.0 = Debug|x64 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Release|Win32.ActiveCfg = Release|Win32 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Release|Win32.Build.0 = Release|Win32 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Release|x64.ActiveCfg = Release|x64 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Release|x64.Build.0 = Release|x64 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Release-MinDep|Win32.ActiveCfg = Release|Win32 + {D6EA54FD-F15C-42F6-929B-A83F299A4582}.Release-MinDep|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/Aegisub/Aegisub.vcxproj b/build/Aegisub/Aegisub.vcxproj index 43b61f846..4241a63c2 100644 --- a/build/Aegisub/Aegisub.vcxproj +++ b/build/Aegisub/Aegisub.vcxproj @@ -83,9 +83,21 @@ {7b56955d-5162-4698-aa5b-47484edc8783} + + {0518d6c0-7bf6-4fd1-91fb-191bd10db2ac} + {10f22a5a-dd9e-44a1-ba2e-2a9a7c78b0ee} + + {d6ba6815-0aac-48fa-8372-d32cde8bf07a} + + + {5cabcbef-e79a-4d27-94a5-cf4eaaf1dd96} + + + {d6ea54fd-f15c-42f6-929b-a83f299a4582} + @@ -252,13 +264,10 @@ Create - agi_pre.h - - - NotUsing - + NotUsing + diff --git a/build/expat/expat.vcxproj b/build/expat/expat.vcxproj new file mode 100644 index 000000000..1745e183d --- /dev/null +++ b/build/expat/expat.vcxproj @@ -0,0 +1,53 @@ + + + + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A} + expat + + + + + lib + ..\..\vendor\wxWidgets\src\expat\lib + $(SrcDir) + + + + + + + + + COMPILED_FROM_DSP;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/expat/expat.vcxproj.filters b/build/expat/expat.vcxproj.filters new file mode 100644 index 000000000..4d6341d74 --- /dev/null +++ b/build/expat/expat.vcxproj.filters @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + \ No newline at end of file diff --git a/build/libpng/libpng.vcxproj b/build/libpng/libpng.vcxproj new file mode 100644 index 000000000..c2cc40a60 --- /dev/null +++ b/build/libpng/libpng.vcxproj @@ -0,0 +1,46 @@ + + + + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96} + libpng + + + + + lib + ..\..\vendor\wxWidgets\src\png\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/libpng/libpng.vcxproj.filters b/build/libpng/libpng.vcxproj.filters new file mode 100644 index 000000000..4d6341d74 --- /dev/null +++ b/build/libpng/libpng.vcxproj.filters @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + \ No newline at end of file diff --git a/build/scintilla/catalogue.cpp b/build/scintilla/catalogue.cpp new file mode 100644 index 000000000..a424dcd50 --- /dev/null +++ b/build/scintilla/catalogue.cpp @@ -0,0 +1,13 @@ +// A dummy replacement for Catalogue.cxx that doesn't support any lexers + +#include + +#include "ILexer.h" +#include "LexerModule.h" +#include "Catalogue.h" + +const LexerModule *Catalogue::Find(int language) { return nullptr; } +const LexerModule *Catalogue::Find(const char *languageName) { return nullptr; } +void Catalogue::AddLexerModule(LexerModule *plm) { } +int Scintilla_LinkLexers() { return 1; } + diff --git a/build/scintilla/scintilla.vcxproj b/build/scintilla/scintilla.vcxproj new file mode 100644 index 000000000..3f894a9ca --- /dev/null +++ b/build/scintilla/scintilla.vcxproj @@ -0,0 +1,91 @@ + + + + {D6EA54FD-F15C-42F6-929B-A83F299A4582} + scintilla + + + + + lib + ..\..\vendor\wxWidgets\src\stc\scintilla + + + + + + + + + $(SrcDir)\include\;$(SrcDir)\lexlib\;$(SrcDir)\src\;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;__WX__;PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/scintilla/scintilla.vcxproj.filters b/build/scintilla/scintilla.vcxproj.filters new file mode 100644 index 000000000..4d6341d74 --- /dev/null +++ b/build/scintilla/scintilla.vcxproj.filters @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + \ No newline at end of file diff --git a/build/wx/setup-installed.h b/build/wx/setup-installed.h index f15419f62..3233b71e2 100644 --- a/build/wx/setup-installed.h +++ b/build/wx/setup-installed.h @@ -1,43 +1,8 @@ #include "wx/version.h" #include "wx/cpp.h" -#ifdef _DEBUG -#define wxSUFFIX_DEBUG "d" -#define wxSUFFIX d -#define wxCONFIGURATION Debug -#else -#define wxSUFFIX_DEBUG "" -#define wxSUFFIX -#define wxCONFIGURATION Release -#endif +#include "wx/msw/setup.h" -#ifndef _M_X64 -#define wxSETUPH_PATH wxCONCAT5(../../lib/Win32/, wxCONFIGURATION, /msw, wxSUFFIX, /wx/setup.h) -#else -#define wxSETUPH_PATH wxCONCAT5(../../lib/x64/, wxCONFIGURATION, /msw, wxSUFFIX, /wx/setup.h) -#endif - -#define wxSETUPH_PATH_STR wxSTRINGIZE(wxSETUPH_PATH) -#include wxSETUPH_PATH_STR - -#define wxSUFFIX_STR wxSTRINGIZE(wxSUFFIX) -#define wxSHORT_VERSION_STRING wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION) -#define wxWX_LIB_NAME(name, subname) "wx" name wxSHORT_VERSION_STRING wxSUFFIX_STR subname -#define wxBASE_LIB_NAME(name) wxWX_LIB_NAME("base", "_" name) -#define wxMSW_LIB_NAME(name) wxWX_LIB_NAME("msw", "_" name) -#define wx3RD_PARTY_LIB_NAME(name) "wx" name wxSUFFIX_DEBUG -#define wx3RD_PARTY_LIB_NAME_U(name) "wx" name wxSUFFIX_STR -#pragma comment(lib, wxWX_LIB_NAME("base", "")) -#pragma comment(lib, wxBASE_LIB_NAME("net")) -#pragma comment(lib, wxBASE_LIB_NAME("xml")) -#pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat")) -#pragma comment(lib, wx3RD_PARTY_LIB_NAME("png")) -#pragma comment(lib, wxMSW_LIB_NAME("core")) -#pragma comment(lib, wxMSW_LIB_NAME("adv")) -#pragma comment(lib, wxMSW_LIB_NAME("gl")) -#pragma comment(lib, wxMSW_LIB_NAME("qa")) -#pragma comment(lib, wxMSW_LIB_NAME("stc")) -#pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla")) #pragma comment(lib, "kernel32") #pragma comment(lib, "user32") #pragma comment(lib, "gdi32") diff --git a/build/wx/stc-fi.h b/build/wx/stc-fi.h new file mode 100644 index 000000000..053e86b0d --- /dev/null +++ b/build/wx/stc-fi.h @@ -0,0 +1,7 @@ +#include + +#include "Platform.h" +#include "SciLexer.h" +#include "ILexer.h" +#include "LexerModule.h" + diff --git a/build/wx/wxWidgets.vcxproj b/build/wx/wxWidgets.vcxproj index 5fd8eb575..7baba2a2b 100644 --- a/build/wx/wxWidgets.vcxproj +++ b/build/wx/wxWidgets.vcxproj @@ -2,60 +2,37 @@ {0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC} - MakeFileProj - Makefile + wxWidgets + + lib + ..\..\vendor\wxWidgets\ + $(SrcDir)include + - - X86 - X64 - debug - release - LIBDIRNAME=$(AegisubLibraryDir) OBJS=$(AegisubObjectDir) SHARED=0 UNICODE=0 USE_OPENGL=1 USE_WEBVIEW=0 USE_HTML=0 USE_MEDIA=0 USE_XRC=0 USE_AUI=0 USE_RIBBON=0 USE_PROPGRID=0 USE_RICHTEXT=0 USE_CAIRO=0 VENDOR=aegisub TARGET_CPU=$(WxTargetCpu) BUILD=$(WxBuild) - d - + + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WX__;WXBUILDING;%(PreprocessorDefinitions) + $(SrcDir)include;%(AdditionalIncludeDirectories) + Use + wx/wxprec.h + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - + + + Create + + + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(SrcDir)src\stc\scintilla\include;$(SrcDir)src\stc\scintilla\src;$(SrcDir)src\stc\scintilla\lexlib;%(AdditionalIncludeDirectories) + + + + $(MSBuildThisFileDirectory)stc-fi.h + NotUsing + $(SrcDir)src\stc\scintilla\include;$(SrcDir)src\stc\scintilla\src;$(SrcDir)src\stc\scintilla\lexlib;%(AdditionalIncludeDirectories) + + + SCI_LEXER;%(PreprocessorDefinitions) + $(SrcDir)src\stc\scintilla\include;$(SrcDir)src\stc\scintilla\src;$(SrcDir)src\stc\scintilla\lexlib;%(AdditionalIncludeDirectories) + + + + + + + + {d6ba6815-0aac-48fa-8372-d32cde8bf07a} + + + {5cabcbef-e79a-4d27-94a5-cf4eaaf1dd96} + + + {d6ea54fd-f15c-42f6-929b-a83f299a4582} + + + {10f22a5a-dd9e-44a1-ba2e-2a9a7c78b0ee} + + diff --git a/src/agi_pre.cpp b/src/agi_pre.cpp index c5bf1a35b..a9486c83e 100644 --- a/src/agi_pre.cpp +++ b/src/agi_pre.cpp @@ -1,46 +1 @@ -// Copyright (c) 2006, Rodrigo Braz Monteiro -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// * Neither the name of the Aegisub Group nor the names of its contributors -// may be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. -// -// Aegisub Project http://www.aegisub.org/ - -/// @file agi_pre.cpp -/// @brief Precompiled headers control file, including stdwx.h only to generate precompiled header data -/// @ingroup main -/// - -// -// Precompiled Header Source File for MSVC -// -// 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 -// -// Note: make sure that you disable use of precompiled headers on md5.c and -// MatroskaParser.c, as well as any possible future .c files. -// - -#include "agi_pre.h" +// A dummy file for compiling the precompiled header with VC++