From 0800f813ff49af3c66c2526e49af5f25c94d8bf5 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 10 Feb 2020 14:10:29 +0100 Subject: [PATCH] Rename stdafx.h to pch.h Signed-off-by: Simon Rozman --- MSI/MSICA | 2 +- Updater | 2 +- ZRCola/ZRCola.vcxproj | 4 +- ZRCola/ZRCola.vcxproj.filters | 4 +- ZRCola/{stdafx.cpp => pch.cpp} | 40 +++--- ZRCola/{stdafx.h => pch.h} | 132 +++++++++--------- ZRCola/res/ZRCola.fbp | 2 +- ZRCola/res/zrcolagui.cpp | 2 +- ZRCola/zrcolaabout.cpp | 2 +- ZRCola/zrcolaapp.cpp | 2 +- ZRCola/zrcolachrcatpnl.cpp | 2 +- ZRCola/zrcolachrgrid.cpp | 2 +- ZRCola/zrcolachrreq.cpp | 2 +- ZRCola/zrcolachrslct.cpp | 2 +- ZRCola/zrcolacomppnl.cpp | 2 +- ZRCola/zrcolafrm.cpp | 2 +- ZRCola/zrcolagui.cpp | 2 +- ZRCola/zrcolakeyhndlr.cpp | 2 +- ZRCola/zrcolasettings.cpp | 2 +- ZRCola/zrcolatranseq.cpp | 2 +- ZRCola/zrcolaupdater.cpp | 2 +- ZRColaCompile/ZRColaCompile.vcxproj | 4 +- ZRColaCompile/ZRColaCompile.vcxproj.filters | 4 +- ZRColaCompile/dbsource.cpp | 2 +- ZRColaCompile/main.cpp | 2 +- ZRColaCompile/parse.cpp | 2 +- .../stdafx.cpp => ZRColaCompile/pch.cpp | 40 +++--- ZRColaCompile/{stdafx.h => pch.h} | 112 +++++++-------- ZRColaInstall/ZRColaInstall.props | 4 +- ZRColaInstall/ZRColaInstallDe.vcxproj.filters | 4 +- ZRColaInstall/ZRColaInstallEn.vcxproj.filters | 4 +- ZRColaInstall/ZRColaInstallRu.vcxproj.filters | 4 +- ZRColaInstall/ZRColaInstallSl.vcxproj.filters | 4 +- ZRColaInstall/main.cpp | 2 +- .../stdafx.cpp => ZRColaInstall/pch.cpp | 40 +++--- ZRColaInstall/{stdafx.h => pch.h} | 44 +++--- include/common.props | 2 +- lib/libZRCola/build/libZRCola.vcxproj | 4 +- lib/libZRCola/build/libZRCola.vcxproj.filters | 4 +- lib/libZRCola/src/character.cpp | 2 +- lib/libZRCola/src/common.cpp | 2 +- lib/libZRCola/src/language.cpp | 2 +- lib/libZRCola/src/mapping.cpp | 2 +- lib/libZRCola/src/{stdafx.cpp => pch.cpp} | 40 +++--- lib/libZRCola/src/{stdafx.h => pch.h} | 64 ++++----- lib/libZRCola/src/tag.cpp | 2 +- lib/libZRCola/src/translate.cpp | 2 +- lib/libZRColaUI/build/libZRColaUI.vcxproj | 4 +- .../build/libZRColaUI.vcxproj.filters | 4 +- lib/libZRColaUI/src/keyboard.cpp | 2 +- lib/libZRColaUI/src/pch.cpp | 20 +++ lib/libZRColaUI/src/{stdafx.h => pch.h} | 56 ++++---- lib/libZRColaUI/src/stdafx.cpp | 20 --- lib/stdex | 2 +- 54 files changed, 360 insertions(+), 360 deletions(-) rename ZRCola/{stdafx.cpp => pch.cpp} (94%) rename ZRCola/{stdafx.h => pch.h} (96%) rename ZRColaInstall/stdafx.cpp => ZRColaCompile/pch.cpp (94%) rename ZRColaCompile/{stdafx.h => pch.h} (96%) rename ZRColaCompile/stdafx.cpp => ZRColaInstall/pch.cpp (94%) rename ZRColaInstall/{stdafx.h => pch.h} (97%) rename lib/libZRCola/src/{stdafx.cpp => pch.cpp} (94%) rename lib/libZRCola/src/{stdafx.h => pch.h} (96%) create mode 100644 lib/libZRColaUI/src/pch.cpp rename lib/libZRColaUI/src/{stdafx.h => pch.h} (96%) delete mode 100644 lib/libZRColaUI/src/stdafx.cpp diff --git a/MSI/MSICA b/MSI/MSICA index 830befb..45cbc9a 160000 --- a/MSI/MSICA +++ b/MSI/MSICA @@ -1 +1 @@ -Subproject commit 830befb8da217efacbb69107e247b9ccb633863c +Subproject commit 45cbc9ac150c22798e35fc0a066acaf486644079 diff --git a/Updater b/Updater index 5ae6dd5..62a7d4e 160000 --- a/Updater +++ b/Updater @@ -1 +1 @@ -Subproject commit 5ae6dd56c26ef749e328addd3fdb5e487cea9d43 +Subproject commit 62a7d4e715aad8227c50a783b5eebb7b49dd8001 diff --git a/ZRCola/ZRCola.vcxproj b/ZRCola/ZRCola.vcxproj index 0a4b730..228e372 100644 --- a/ZRCola/ZRCola.vcxproj +++ b/ZRCola/ZRCola.vcxproj @@ -114,7 +114,7 @@ - + Create Create Create @@ -137,7 +137,7 @@ - + diff --git a/ZRCola/ZRCola.vcxproj.filters b/ZRCola/ZRCola.vcxproj.filters index 66efdc9..b8c155a 100644 --- a/ZRCola/ZRCola.vcxproj.filters +++ b/ZRCola/ZRCola.vcxproj.filters @@ -19,7 +19,7 @@ - + Source Files @@ -63,7 +63,7 @@ - + Header Files diff --git a/ZRCola/stdafx.cpp b/ZRCola/pch.cpp similarity index 94% rename from ZRCola/stdafx.cpp rename to ZRCola/pch.cpp index dedf4f6..941cae8 100644 --- a/ZRCola/stdafx.cpp +++ b/ZRCola/pch.cpp @@ -1,20 +1,20 @@ -/* - Copyright 2015-2019 Amebis - - This file is part of ZRCola. - - ZRCola is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ZRCola is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with ZRCola. If not, see . -*/ - -#include "stdafx.h" +/* + Copyright 2015-2019 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#include "pch.h" diff --git a/ZRCola/stdafx.h b/ZRCola/pch.h similarity index 96% rename from ZRCola/stdafx.h rename to ZRCola/pch.h index 47c4b5b..74ed64f 100644 --- a/ZRCola/stdafx.h +++ b/ZRCola/pch.h @@ -1,66 +1,66 @@ -/* - Copyright 2015-2019 Amebis - - This file is part of ZRCola. - - ZRCola is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ZRCola is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with ZRCola. If not, see . -*/ - -#pragma once - -#include "../include/version.h" -#include "zrcolaabout.h" -#include "zrcolaapp.h" -#include "zrcolachrcatpnl.h" -#include "zrcolachrgrid.h" -#include "zrcolachrreq.h" -#include "zrcolacomppnl.h" -#include "zrcolafrm.h" -#include "zrcolakeyhndlr.h" -#include "zrcolasettings.h" -#include "zrcolatranseq.h" -#include "zrcolaupdater.h" - -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include - -#if defined(__WXMSW__) -#include -#include -#include -#endif +/* + Copyright 2015-2019 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#pragma once + +#include "../include/version.h" +#include "zrcolaabout.h" +#include "zrcolaapp.h" +#include "zrcolachrcatpnl.h" +#include "zrcolachrgrid.h" +#include "zrcolachrreq.h" +#include "zrcolacomppnl.h" +#include "zrcolafrm.h" +#include "zrcolakeyhndlr.h" +#include "zrcolasettings.h" +#include "zrcolatranseq.h" +#include "zrcolaupdater.h" + +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include + +#if defined(__WXMSW__) +#include +#include +#include +#endif diff --git a/ZRCola/res/ZRCola.fbp b/ZRCola/res/ZRCola.fbp index c314e98..874b22a 100644 --- a/ZRCola/res/ZRCola.fbp +++ b/ZRCola/res/ZRCola.fbp @@ -19,7 +19,7 @@ ZRCola . - #include "stdafx.h" + #include "pch.h" 1 1 1 diff --git a/ZRCola/res/zrcolagui.cpp b/ZRCola/res/zrcolagui.cpp index 4ee1510..7b1290b 100644 --- a/ZRCola/res/zrcolagui.cpp +++ b/ZRCola/res/zrcolagui.cpp @@ -5,7 +5,7 @@ // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "pch.h" #include "zrcolachrgrid.h" diff --git a/ZRCola/zrcolaabout.cpp b/ZRCola/zrcolaabout.cpp index 1209696..4a4bf21 100644 --- a/ZRCola/zrcolaabout.cpp +++ b/ZRCola/zrcolaabout.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" ////////////////////////////////////////////////////////////////////////// diff --git a/ZRCola/zrcolaapp.cpp b/ZRCola/zrcolaapp.cpp index 7aa9b55..b9798ce 100644 --- a/ZRCola/zrcolaapp.cpp +++ b/ZRCola/zrcolaapp.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" #if defined(__WXMSW__) #pragma comment(lib, "msi.lib") #endif diff --git a/ZRCola/zrcolachrcatpnl.cpp b/ZRCola/zrcolachrcatpnl.cpp index 97d8cfa..1b5d4f5 100644 --- a/ZRCola/zrcolachrcatpnl.cpp +++ b/ZRCola/zrcolachrcatpnl.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" ////////////////////////////////////////////////////////////////////////// diff --git a/ZRCola/zrcolachrgrid.cpp b/ZRCola/zrcolachrgrid.cpp index 5613637..79f4d93 100644 --- a/ZRCola/zrcolachrgrid.cpp +++ b/ZRCola/zrcolachrgrid.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" ////////////////////////////////////////////////////////////////////////// diff --git a/ZRCola/zrcolachrreq.cpp b/ZRCola/zrcolachrreq.cpp index bc72a52..51f8f6e 100644 --- a/ZRCola/zrcolachrreq.cpp +++ b/ZRCola/zrcolachrreq.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" ////////////////////////////////////////////////////////////////////////// diff --git a/ZRCola/zrcolachrslct.cpp b/ZRCola/zrcolachrslct.cpp index 68d0a35..28e44d2 100644 --- a/ZRCola/zrcolachrslct.cpp +++ b/ZRCola/zrcolachrslct.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" ////////////////////////////////////////////////////////////////////// diff --git a/ZRCola/zrcolacomppnl.cpp b/ZRCola/zrcolacomppnl.cpp index 747e685..4725150 100644 --- a/ZRCola/zrcolacomppnl.cpp +++ b/ZRCola/zrcolacomppnl.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" ////////////////////////////////////////////////////////////////////////// diff --git a/ZRCola/zrcolafrm.cpp b/ZRCola/zrcolafrm.cpp index 18b06d7..335484b 100644 --- a/ZRCola/zrcolafrm.cpp +++ b/ZRCola/zrcolafrm.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" ////////////////////////////////////////////////////////////////////////// diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp index c43751d..f02b2d9 100644 --- a/ZRCola/zrcolagui.cpp +++ b/ZRCola/zrcolagui.cpp @@ -5,7 +5,7 @@ // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "pch.h" #include "zrcolachrgrid.h" diff --git a/ZRCola/zrcolakeyhndlr.cpp b/ZRCola/zrcolakeyhndlr.cpp index 0b14e41..2d04c00 100644 --- a/ZRCola/zrcolakeyhndlr.cpp +++ b/ZRCola/zrcolakeyhndlr.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" ////////////////////////////////////////////////////////////////////////// diff --git a/ZRCola/zrcolasettings.cpp b/ZRCola/zrcolasettings.cpp index 1785502..f284964 100644 --- a/ZRCola/zrcolasettings.cpp +++ b/ZRCola/zrcolasettings.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" ////////////////////////////////////////////////////////////////////////// diff --git a/ZRCola/zrcolatranseq.cpp b/ZRCola/zrcolatranseq.cpp index 84f9855..67eb849 100644 --- a/ZRCola/zrcolatranseq.cpp +++ b/ZRCola/zrcolatranseq.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" ////////////////////////////////////////////////////////////////////////// diff --git a/ZRCola/zrcolaupdater.cpp b/ZRCola/zrcolaupdater.cpp index c49026e..ab34b2b 100644 --- a/ZRCola/zrcolaupdater.cpp +++ b/ZRCola/zrcolaupdater.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" ////////////////////////////////////////////////////////////////////////// diff --git a/ZRColaCompile/ZRColaCompile.vcxproj b/ZRColaCompile/ZRColaCompile.vcxproj index 460bec7..fcabcb0 100644 --- a/ZRColaCompile/ZRColaCompile.vcxproj +++ b/ZRColaCompile/ZRColaCompile.vcxproj @@ -49,7 +49,7 @@ - + Create Create @@ -57,7 +57,7 @@ - + diff --git a/ZRColaCompile/ZRColaCompile.vcxproj.filters b/ZRColaCompile/ZRColaCompile.vcxproj.filters index 6ef14e2..e09b487 100644 --- a/ZRColaCompile/ZRColaCompile.vcxproj.filters +++ b/ZRColaCompile/ZRColaCompile.vcxproj.filters @@ -19,7 +19,7 @@ - + Source Files @@ -33,7 +33,7 @@ - + Header Files diff --git a/ZRColaCompile/dbsource.cpp b/ZRColaCompile/dbsource.cpp index f95339b..6a30e06 100644 --- a/ZRColaCompile/dbsource.cpp +++ b/ZRColaCompile/dbsource.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" using namespace std; using namespace stdex; diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp index 47a9006..91b861e 100644 --- a/ZRColaCompile/main.cpp +++ b/ZRColaCompile/main.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" using namespace std; using namespace stdex; diff --git a/ZRColaCompile/parse.cpp b/ZRColaCompile/parse.cpp index 85e98df..111602f 100644 --- a/ZRColaCompile/parse.cpp +++ b/ZRColaCompile/parse.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" using namespace std; using namespace stdex; diff --git a/ZRColaInstall/stdafx.cpp b/ZRColaCompile/pch.cpp similarity index 94% rename from ZRColaInstall/stdafx.cpp rename to ZRColaCompile/pch.cpp index dedf4f6..941cae8 100644 --- a/ZRColaInstall/stdafx.cpp +++ b/ZRColaCompile/pch.cpp @@ -1,20 +1,20 @@ -/* - Copyright 2015-2019 Amebis - - This file is part of ZRCola. - - ZRCola is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ZRCola is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with ZRCola. If not, see . -*/ - -#include "stdafx.h" +/* + Copyright 2015-2019 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#include "pch.h" diff --git a/ZRColaCompile/stdafx.h b/ZRColaCompile/pch.h similarity index 96% rename from ZRColaCompile/stdafx.h rename to ZRColaCompile/pch.h index 43b313d..81ec980 100644 --- a/ZRColaCompile/stdafx.h +++ b/ZRColaCompile/pch.h @@ -1,56 +1,56 @@ -/* - Copyright 2015-2019 Amebis - - This file is part of ZRCola. - - ZRCola is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ZRCola is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with ZRCola. If not, see . -*/ - -#pragma once - -#include "../include/version.h" -#include "dbsource.h" -#include "parse.h" - -#include -#include -#include -#include - -#include -#include - -#include - -#include - -#include // GUID helper to prevent LNK2001 errors (unresolved external symbol IID_IADO...) -#pragma warning(push) -#pragma warning(disable: 4091) -#include -#include -#pragma warning(pop) - -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include +/* + Copyright 2015-2019 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#pragma once + +#include "../include/version.h" +#include "dbsource.h" +#include "parse.h" + +#include +#include +#include +#include + +#include +#include + +#include + +#include + +#include // GUID helper to prevent LNK2001 errors (unresolved external symbol IID_IADO...) +#pragma warning(push) +#pragma warning(disable: 4091) +#include +#include +#pragma warning(pop) + +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include diff --git a/ZRColaInstall/ZRColaInstall.props b/ZRColaInstall/ZRColaInstall.props index 06ca785..a016a6c 100644 --- a/ZRColaInstall/ZRColaInstall.props +++ b/ZRColaInstall/ZRColaInstall.props @@ -32,13 +32,13 @@ - + Create Create - + diff --git a/ZRColaInstall/ZRColaInstallDe.vcxproj.filters b/ZRColaInstall/ZRColaInstallDe.vcxproj.filters index cd37c3b..82069d8 100644 --- a/ZRColaInstall/ZRColaInstallDe.vcxproj.filters +++ b/ZRColaInstall/ZRColaInstallDe.vcxproj.filters @@ -15,7 +15,7 @@ - + Source Files @@ -23,7 +23,7 @@ - + Header Files diff --git a/ZRColaInstall/ZRColaInstallEn.vcxproj.filters b/ZRColaInstall/ZRColaInstallEn.vcxproj.filters index cd37c3b..82069d8 100644 --- a/ZRColaInstall/ZRColaInstallEn.vcxproj.filters +++ b/ZRColaInstall/ZRColaInstallEn.vcxproj.filters @@ -15,7 +15,7 @@ - + Source Files @@ -23,7 +23,7 @@ - + Header Files diff --git a/ZRColaInstall/ZRColaInstallRu.vcxproj.filters b/ZRColaInstall/ZRColaInstallRu.vcxproj.filters index cd37c3b..82069d8 100644 --- a/ZRColaInstall/ZRColaInstallRu.vcxproj.filters +++ b/ZRColaInstall/ZRColaInstallRu.vcxproj.filters @@ -15,7 +15,7 @@ - + Source Files @@ -23,7 +23,7 @@ - + Header Files diff --git a/ZRColaInstall/ZRColaInstallSl.vcxproj.filters b/ZRColaInstall/ZRColaInstallSl.vcxproj.filters index cd37c3b..82069d8 100644 --- a/ZRColaInstall/ZRColaInstallSl.vcxproj.filters +++ b/ZRColaInstall/ZRColaInstallSl.vcxproj.filters @@ -15,7 +15,7 @@ - + Source Files @@ -23,7 +23,7 @@ - + Header Files diff --git a/ZRColaInstall/main.cpp b/ZRColaInstall/main.cpp index 72613b0..bdc3d04 100644 --- a/ZRColaInstall/main.cpp +++ b/ZRColaInstall/main.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" /// diff --git a/ZRColaCompile/stdafx.cpp b/ZRColaInstall/pch.cpp similarity index 94% rename from ZRColaCompile/stdafx.cpp rename to ZRColaInstall/pch.cpp index dedf4f6..941cae8 100644 --- a/ZRColaCompile/stdafx.cpp +++ b/ZRColaInstall/pch.cpp @@ -1,20 +1,20 @@ -/* - Copyright 2015-2019 Amebis - - This file is part of ZRCola. - - ZRCola is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ZRCola is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with ZRCola. If not, see . -*/ - -#include "stdafx.h" +/* + Copyright 2015-2019 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#include "pch.h" diff --git a/ZRColaInstall/stdafx.h b/ZRColaInstall/pch.h similarity index 97% rename from ZRColaInstall/stdafx.h rename to ZRColaInstall/pch.h index 0d2a1b6..0162690 100644 --- a/ZRColaInstall/stdafx.h +++ b/ZRColaInstall/pch.h @@ -1,22 +1,22 @@ -/* - Copyright 2015-2019 Amebis - - This file is part of ZRCola. - - ZRCola is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ZRCola is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with ZRCola. If not, see . -*/ - -#pragma once - -#include +/* + Copyright 2015-2019 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#pragma once + +#include diff --git a/include/common.props b/include/common.props index c467f03..30f2b92 100644 --- a/include/common.props +++ b/include/common.props @@ -37,7 +37,7 @@ Level4 NTDDI_VERSION=NTDDI_WINXP;_WIN32_WINNT=_WIN32_WINNT_WINXP;wxMSVC_VERSION=$(PlatformToolsetVersion);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Use - stdafx.h + pch.h ProgramDatabase true 4100;4505 diff --git a/lib/libZRCola/build/libZRCola.vcxproj b/lib/libZRCola/build/libZRCola.vcxproj index b1507dc..741351a 100644 --- a/lib/libZRCola/build/libZRCola.vcxproj +++ b/lib/libZRCola/build/libZRCola.vcxproj @@ -31,7 +31,7 @@ - + Create Create Create @@ -48,7 +48,7 @@ - + {3C61929E-7289-4101-8D0A-DA22D6E1AEA8} diff --git a/lib/libZRCola/build/libZRCola.vcxproj.filters b/lib/libZRCola/build/libZRCola.vcxproj.filters index dbad8fd..4546b17 100644 --- a/lib/libZRCola/build/libZRCola.vcxproj.filters +++ b/lib/libZRCola/build/libZRCola.vcxproj.filters @@ -11,7 +11,7 @@ - + Source Files @@ -34,7 +34,7 @@ - + Header Files diff --git a/lib/libZRCola/src/character.cpp b/lib/libZRCola/src/character.cpp index b5e54d2..f80d47a 100644 --- a/lib/libZRCola/src/character.cpp +++ b/lib/libZRCola/src/character.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" const ZRCola::chrcatid_t ZRCola::chrcatid_t::blank = {}; diff --git a/lib/libZRCola/src/common.cpp b/lib/libZRCola/src/common.cpp index 9466bd7..47d6a3c 100644 --- a/lib/libZRCola/src/common.cpp +++ b/lib/libZRCola/src/common.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" const ZRCola::langid_t ZRCola::langid_t::blank = {}; diff --git a/lib/libZRCola/src/language.cpp b/lib/libZRCola/src/language.cpp index ece09a5..dacaabf 100644 --- a/lib/libZRCola/src/language.cpp +++ b/lib/libZRCola/src/language.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" #ifdef _WIN32 diff --git a/lib/libZRCola/src/mapping.cpp b/lib/libZRCola/src/mapping.cpp index abadcbc..6de3f8f 100644 --- a/lib/libZRCola/src/mapping.cpp +++ b/lib/libZRCola/src/mapping.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" size_t ZRCola::mapping_vector::to_src(_In_ size_t dst) const diff --git a/lib/libZRCola/src/stdafx.cpp b/lib/libZRCola/src/pch.cpp similarity index 94% rename from lib/libZRCola/src/stdafx.cpp rename to lib/libZRCola/src/pch.cpp index dedf4f6..941cae8 100644 --- a/lib/libZRCola/src/stdafx.cpp +++ b/lib/libZRCola/src/pch.cpp @@ -1,20 +1,20 @@ -/* - Copyright 2015-2019 Amebis - - This file is part of ZRCola. - - ZRCola is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ZRCola is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with ZRCola. If not, see . -*/ - -#include "stdafx.h" +/* + Copyright 2015-2019 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#include "pch.h" diff --git a/lib/libZRCola/src/stdafx.h b/lib/libZRCola/src/pch.h similarity index 96% rename from lib/libZRCola/src/stdafx.h rename to lib/libZRCola/src/pch.h index 5579c4b..3487263 100644 --- a/lib/libZRCola/src/stdafx.h +++ b/lib/libZRCola/src/pch.h @@ -1,32 +1,32 @@ -/* - Copyright 2015-2019 Amebis - - This file is part of ZRCola. - - ZRCola is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ZRCola is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with ZRCola. If not, see . -*/ - -#pragma once - -#include "../../../include/version.h" - -#include "../include/zrcola/character.h" -#include "../include/zrcola/language.h" -#include "../include/zrcola/translate.h" -#include "../include/zrcola/tag.h" - -#include - -#include -#include +/* + Copyright 2015-2019 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#pragma once + +#include "../../../include/version.h" + +#include "../include/zrcola/character.h" +#include "../include/zrcola/language.h" +#include "../include/zrcola/translate.h" +#include "../include/zrcola/tag.h" + +#include + +#include +#include diff --git a/lib/libZRCola/src/tag.cpp b/lib/libZRCola/src/tag.cpp index 691fab1..5446042 100644 --- a/lib/libZRCola/src/tag.cpp +++ b/lib/libZRCola/src/tag.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" bool ZRCola::chrtag_db::Search(_In_ const std::map &tags, _In_ const character_db &ch_db, _In_ const std::set &cats, _Inout_ std::map &hits, _In_opt_ bool (__cdecl *fn_abort)(void *cookie), _In_opt_ void *cookie) const diff --git a/lib/libZRCola/src/translate.cpp b/lib/libZRCola/src/translate.cpp index c41ad59..57cf685 100644 --- a/lib/libZRCola/src/translate.cpp +++ b/lib/libZRCola/src/translate.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" void ZRCola::translation_db::Translate(_In_ transetid_t set, _In_z_count_(inputMax) const wchar_t* input, _In_ size_t inputMax, _Out_ std::wstring &output, _Out_opt_ std::vector* map) const diff --git a/lib/libZRColaUI/build/libZRColaUI.vcxproj b/lib/libZRColaUI/build/libZRColaUI.vcxproj index 3445a5b..9c1b118 100644 --- a/lib/libZRColaUI/build/libZRColaUI.vcxproj +++ b/lib/libZRColaUI/build/libZRColaUI.vcxproj @@ -28,7 +28,7 @@ - + Create Create Create @@ -41,7 +41,7 @@ - + diff --git a/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters b/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters index 0b939fc..d4e9cb8 100644 --- a/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters +++ b/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters @@ -18,7 +18,7 @@ - + Source Files @@ -26,7 +26,7 @@ - + Header Files diff --git a/lib/libZRColaUI/src/keyboard.cpp b/lib/libZRColaUI/src/keyboard.cpp index 26f1b2b..bfff08e 100644 --- a/lib/libZRColaUI/src/keyboard.cpp +++ b/lib/libZRColaUI/src/keyboard.cpp @@ -17,7 +17,7 @@ along with ZRCola. If not, see . */ -#include "stdafx.h" +#include "pch.h" bool ZRCola::keyseq_db::GetSequenceAsText(_In_count_(seq_len) const keyseq::key_t *seq, _In_ size_t seq_len, _Out_ wxString& str) diff --git a/lib/libZRColaUI/src/pch.cpp b/lib/libZRColaUI/src/pch.cpp new file mode 100644 index 0000000..941cae8 --- /dev/null +++ b/lib/libZRColaUI/src/pch.cpp @@ -0,0 +1,20 @@ +/* + Copyright 2015-2019 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#include "pch.h" diff --git a/lib/libZRColaUI/src/stdafx.h b/lib/libZRColaUI/src/pch.h similarity index 96% rename from lib/libZRColaUI/src/stdafx.h rename to lib/libZRColaUI/src/pch.h index 3635364..854d4df 100644 --- a/lib/libZRColaUI/src/stdafx.h +++ b/lib/libZRColaUI/src/pch.h @@ -1,28 +1,28 @@ -/* - Copyright 2015-2019 Amebis - - This file is part of ZRCola. - - ZRCola is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ZRCola is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with ZRCola. If not, see . -*/ - -#pragma once - -#include "../../../include/version.h" -#include "../include/zrcolaui/chargroup.h" -#include "../include/zrcolaui/keyboard.h" - -#include - -#include +/* + Copyright 2015-2019 Amebis + + This file is part of ZRCola. + + ZRCola is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ZRCola is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ZRCola. If not, see . +*/ + +#pragma once + +#include "../../../include/version.h" +#include "../include/zrcolaui/chargroup.h" +#include "../include/zrcolaui/keyboard.h" + +#include + +#include diff --git a/lib/libZRColaUI/src/stdafx.cpp b/lib/libZRColaUI/src/stdafx.cpp deleted file mode 100644 index dedf4f6..0000000 --- a/lib/libZRColaUI/src/stdafx.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/* - Copyright 2015-2019 Amebis - - This file is part of ZRCola. - - ZRCola is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ZRCola is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with ZRCola. If not, see . -*/ - -#include "stdafx.h" diff --git a/lib/stdex b/lib/stdex index 50cdbee..42cb00a 160000 --- a/lib/stdex +++ b/lib/stdex @@ -1 +1 @@ -Subproject commit 50cdbee3aea9928df1b3afa476f0c20b90aee34c +Subproject commit 42cb00a22a7e41a67c7aace1b5c208f157a5a1bf