diff --git a/CHANGELOG.md b/CHANGELOG.md index 975ba46..8045fe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # FictionBook Editor Changelog +## v2.6.9 + +* Fixed bug, introduced in 2.6.9 - FBE cannot find plugins + ## v2.6.8 * Upgade Visual Studio solution and projects to VS2015 version; diff --git a/ExportHTML/ExportHTML.rc b/ExportHTML/ExportHTML.rc index 7c6d5ad..0bd258f 100644 --- a/ExportHTML/ExportHTML.rc +++ b/ExportHTML/ExportHTML.rc @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // #include "resource.h" @@ -13,20 +13,19 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Russian resources +// Russian (Russia) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) -#ifdef _WIN32 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT #pragma code_page(1251) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // // REGISTRY // -IDR_EXPORTHTML REGISTRY DISCARDABLE "ExportHTML.rgs" +IDR_EXPORTHTML REGISTRY "ExportHTML.rgs" + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -34,18 +33,18 @@ IDR_EXPORTHTML REGISTRY DISCARDABLE "ExportHTML.rgs" // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -53,38 +52,60 @@ END #endif // APSTUDIO_INVOKED -#endif // Russian resources +#endif // Russian (Russia) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// English (United States) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // // Dialog // -IDD_CUSTOMSAVEDLG DIALOG DISCARDABLE 0, 0, 330, 32 -STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS +IDD_CUSTOMSAVEDLG DIALOG 0, 0, 330, 32 +STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS FONT 8, "MS Shell Dlg" BEGIN LTEXT "XSL Template:",IDC_STATIC,68,2,53,8 EDITTEXT IDC_TEMPLATE,130,0,164,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_BROWSE,297,0,15,12 - CONTROL "Include document description",IDC_DOCINFO,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,69,19,108,8 + CONTROL "Include document description",IDC_DOCINFO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,69,19,108,8 LTEXT "TOC depth:",IDC_STATIC,186,19,42,8 EDITTEXT IDC_TOCDEPTH,228,17,19,12,ES_NUMBER END -#endif // English (U.S.) resources + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_MAINICON ICON "res\\ExportHTML.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_CUSTOMSAVEDLG, DIALOG + BEGIN + END +END +#endif // APSTUDIO_INVOKED + +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/ExportHTML/ExportHTML.rgs b/ExportHTML/ExportHTML.rgs index 1da62b0..d69dc2c 100644 --- a/ExportHTML/ExportHTML.rgs +++ b/ExportHTML/ExportHTML.rgs @@ -12,13 +12,13 @@ HKCR } } -HKLM +HKCU { NoRemove Software { - NoRemove Haali + NoRemove FBETeam { - NoRemove FBE + NoRemove 'FictionBook Editor' { NoRemove Plugins { diff --git a/ExportHTML/ExportHTML.vcxproj b/ExportHTML/ExportHTML.vcxproj index 7c64ab5..acd3de4 100644 --- a/ExportHTML/ExportHTML.vcxproj +++ b/ExportHTML/ExportHTML.vcxproj @@ -149,9 +149,11 @@ + + + - - + \ No newline at end of file diff --git a/ExportHTML/ExportHTML.vcxproj.filters b/ExportHTML/ExportHTML.vcxproj.filters index 9fb142b..0822c65 100644 --- a/ExportHTML/ExportHTML.vcxproj.filters +++ b/ExportHTML/ExportHTML.vcxproj.filters @@ -56,4 +56,9 @@ Resource Files + + + Resource Files + + \ No newline at end of file diff --git a/ExportHTML/res/ExportHTML.ico b/ExportHTML/res/ExportHTML.ico new file mode 100644 index 0000000..0b18eef Binary files /dev/null and b/ExportHTML/res/ExportHTML.ico differ diff --git a/ExportHTML/resource.h b/ExportHTML/resource.h index f5f0331..5875262 100644 --- a/ExportHTML/resource.h +++ b/ExportHTML/resource.h @@ -1,9 +1,11 @@ //{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. +// Microsoft Visual C++ generated include file. // Used by ExportHTML.rc // #define IDR_EXPORTHTML 101 #define IDD_CUSTOMSAVEDLG 102 +#define IDI_ICON1 104 +#define IDI_MAINICON 104 #define IDC_BROWSE 1001 #define IDC_TEMPLATE 1002 #define IDC_DOCINFO 1003 @@ -13,7 +15,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 104 +#define _APS_NEXT_RESOURCE_VALUE 105 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1005 #define _APS_NEXT_SYMED_VALUE 102 diff --git a/FBE.rc b/FBE.rc index 09bfb49..f366a44 100644 --- a/FBE.rc +++ b/FBE.rc @@ -670,7 +670,7 @@ IDB_TEXT BITMAP "res\\text.bmp" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,6,0,0 + FILEVERSION 2,6,9,0 PRODUCTVERSION 2,6,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -689,7 +689,7 @@ BEGIN VALUE "Comments", "Release" VALUE "CompanyName", "FBE Team" VALUE "FileDescription", "FictionBook Editor" - VALUE "FileVersion", "2.6" + VALUE "FileVersion", "2.6.9.0" VALUE "InternalName", "FBE" VALUE "LegalCopyright", "Copyright 2010 © FBE Team, 2008 © LitRes, 2003 © Mike Matsnev" VALUE "OriginalFilename", "FBE.exe" diff --git a/FBE.vcxproj b/FBE.vcxproj index 108f4af..0b9bce2 100644 --- a/FBE.vcxproj +++ b/FBE.vcxproj @@ -76,8 +76,7 @@ Copying requisite resources... - rd "$(TargetDir)"cmd /S /Q -xcopy "$(ProjectDir)files\*.*" "$(TargetDir)" /E /Q /Y + xcopy "$(ProjectDir)files\*.*" "$(TargetDir)" /E /Q /Y @@ -131,8 +130,7 @@ gdiplus.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) Copying requisite resources... - rd "$(TargetDir)" cmd /S /Q -xcopy "$(ProjectDir)files\*.*" "$(TargetDir)" /E /Q /Y + xcopy "$(ProjectDir)files\*.*" "$(TargetDir)" /E /Q /Y diff --git a/Installer/MakeInstaller.nsi b/Installer/MakeInstaller.nsi index 3354556..c082e63 100644 Binary files a/Installer/MakeInstaller.nsi and b/Installer/MakeInstaller.nsi differ diff --git a/mainfrm.cpp b/mainfrm.cpp index 04597d6..4277f3e 100644 --- a/mainfrm.cpp +++ b/mainfrm.cpp @@ -1139,61 +1139,62 @@ void CMainFrame::AddStaticText(CCustomStatic &st, HWND toolbarHwnd, int id, cons void CMainFrame::InitPluginsType(HMENU hMenu, const TCHAR* type, UINT cmdbase, CSimpleArray& plist) { CRegKey rk; - - if(rk.Open(HKEY_CURRENT_USER, _Settings.GetKeyPath() + L"\\Plugins") != ERROR_SUCCESS) - return; int ncmd = 0; - for(int i = 0; ncmd < 20; ++i) - { - CString name; - DWORD size = 128; // enough for GUIDs - TCHAR* cp = name.GetBuffer(size); - FILETIME ft; - if(::RegEnumKeyEx(rk, i, cp, &size, 0, 0, 0, &ft) != ERROR_SUCCESS) - break; - name.ReleaseBuffer(size); - CRegKey pk; - if(pk.Open(rk, name) != ERROR_SUCCESS) - continue; - CString pt(U::QuerySV(pk, L"Type")); - CString ms(U::QuerySV(pk, L"Menu")); - if(pt.IsEmpty() || ms.IsEmpty() || pt != type) - continue; - CLSID clsid; - if(::CLSIDFromString((TCHAR*)(const TCHAR *)name, &clsid) != NOERROR) - continue; - // all checks pass, add to menu and remember clsid - plist.Add(clsid); - ::AppendMenu(hMenu, MF_STRING, cmdbase + ncmd, ms); - CString hs = ms; - hs.Remove(L'&'); - InitPluginHotkey(name, cmdbase + ncmd, pt + CString(L" | ") + hs); - // check if an icon is available - CString icon(U::QuerySV(pk, L"Icon")); - if(!icon.IsEmpty()) + if (rk.Open(HKEY_CURRENT_USER, _Settings.GetKeyPath() + L"\\Plugins") == ERROR_SUCCESS) + { + for (int i = 0; ncmd < 20; ++i) { - int cp = icon.ReverseFind(L','); - int iconID; - if(cp > 0 && _stscanf((const TCHAR *)icon + cp, L",%d", &iconID) == 1) - icon.Delete(cp, icon.GetLength() - cp); - else - iconID = 0; + CString name; + DWORD size = 128; // enough for GUIDs + TCHAR* cp = name.GetBuffer(size); + FILETIME ft; + if (::RegEnumKeyEx(rk, i, cp, &size, 0, 0, 0, &ft) != ERROR_SUCCESS) + break; + name.ReleaseBuffer(size); + CRegKey pk; + if (pk.Open(rk, name) != ERROR_SUCCESS) + continue; + CString pt(U::QuerySV(pk, L"Type")); + CString ms(U::QuerySV(pk, L"Menu")); + if (pt.IsEmpty() || ms.IsEmpty() || pt != type) + continue; + CLSID clsid; + if (::CLSIDFromString((TCHAR*)(const TCHAR *)name, &clsid) != NOERROR) + continue; - // try load from file first - HICON hIcon; - if(::ExtractIconEx(icon, iconID, NULL, &hIcon, 1) > 0 && hIcon) + // all checks pass, add to menu and remember clsid + plist.Add(clsid); + ::AppendMenu(hMenu, MF_STRING, cmdbase + ncmd, ms); + CString hs = ms; + hs.Remove(L'&'); + InitPluginHotkey(name, cmdbase + ncmd, pt + CString(L" | ") + hs); + // check if an icon is available + CString icon(U::QuerySV(pk, L"Icon")); + if (!icon.IsEmpty()) { - m_MenuBar.AddIcon(hIcon, cmdbase + ncmd); - ::DestroyIcon(hIcon); + int cp = icon.ReverseFind(L','); + int iconID; + if (cp > 0 && _stscanf((const TCHAR *)icon + cp, L",%d", &iconID) == 1) + icon.Delete(cp, icon.GetLength() - cp); + else + iconID = 0; + + // try load from file first + HICON hIcon; + if (::ExtractIconEx(icon, iconID, NULL, &hIcon, 1) > 0 && hIcon) + { + m_MenuBar.AddIcon(hIcon, cmdbase + ncmd); + ::DestroyIcon(hIcon); + } } + ++ncmd; } - ++ncmd; } // Old path to provide searching of old plugins CRegKey oldRk; - if(oldRk.Open(HKEY_LOCAL_MACHINE, L"Software\\Haali\\FBE\\Plugins") != ERROR_SUCCESS) + if(oldRk.Open(HKEY_LOCAL_MACHINE, L"Software\\Haali\\FBE\\Plugins", KEY_READ) != ERROR_SUCCESS) goto skip; else { @@ -1207,7 +1208,7 @@ void CMainFrame::InitPluginsType(HMENU hMenu, const TCHAR* type, UINT cmdbase, C break; name.ReleaseBuffer(size); CRegKey pk; - if(pk.Open(oldRk, name) != ERROR_SUCCESS) + if(pk.Open(oldRk, name, KEY_READ) != ERROR_SUCCESS) continue; CString pt(U::QuerySV(pk, L"Type")); CString ms(U::QuerySV(pk, L"Menu")); diff --git a/pcre/pcre.vcxproj b/pcre/pcre.vcxproj index 4b01ce5..75ce3f7 100644 --- a/pcre/pcre.vcxproj +++ b/pcre/pcre.vcxproj @@ -252,85 +252,29 @@ - - Building Custom Rule D:/Users/evpobr/Documents/GitHubVisualStudio/pcre/CMakeLists.txt - setlocal -"C:\Program Files (x86)\CMake\bin\cmake.exe" -HD:/Users/evpobr/Documents/GitHubVisualStudio/pcre -BD:/Users/evpobr/Documents/GitHubVisualStudio/pcre --check-stamp-file D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\generate.stamp -if %errorlevel% neq 0 goto :cmEnd -:cmEnd -endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone -:cmErrorLevel -exit /b %1 -:cmDone -if %errorlevel% neq 0 goto :VCEnd - D:/Users/evpobr/Documents/GitHubVisualStudio/pcre/CMakeLists.txt;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeLists.txt;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeSystem.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeSystemSpecificInitialize.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeCCompiler.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeCXXCompiler.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeGenericSystem.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\WindowsPaths.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeRCCompiler.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeRCInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCXXInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindBZip2.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\SelectLibraryConfigurations.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageHandleStandardArgs.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageMessage.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeParseArguments.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindZLIB.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageHandleStandardArgs.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageMessage.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeParseArguments.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindReadline.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindEditline.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindPackageHandleStandardArgs.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFile.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFileCXX.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckFunctionExists.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckTypeSize.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFile.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFileCXX.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\config-cmake.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcre.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcre_stringpiece.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcrecpparg.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcre_chartables.c.dist;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeLists.txt;%(AdditionalInputs) - D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\generate.stamp - false - Building Custom Rule D:/Users/evpobr/Documents/GitHubVisualStudio/pcre/CMakeLists.txt - setlocal -"C:\Program Files (x86)\CMake\bin\cmake.exe" -HD:/Users/evpobr/Documents/GitHubVisualStudio/pcre -BD:/Users/evpobr/Documents/GitHubVisualStudio/pcre --check-stamp-file D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\generate.stamp -if %errorlevel% neq 0 goto :cmEnd -:cmEnd -endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone -:cmErrorLevel -exit /b %1 -:cmDone -if %errorlevel% neq 0 goto :VCEnd - D:/Users/evpobr/Documents/GitHubVisualStudio/pcre/CMakeLists.txt;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeLists.txt;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeSystem.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeSystemSpecificInitialize.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeCCompiler.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeCXXCompiler.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeGenericSystem.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\WindowsPaths.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeRCCompiler.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeRCInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCXXInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindBZip2.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\SelectLibraryConfigurations.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageHandleStandardArgs.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageMessage.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeParseArguments.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindZLIB.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageHandleStandardArgs.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageMessage.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeParseArguments.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindReadline.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindEditline.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindPackageHandleStandardArgs.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFile.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFileCXX.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckFunctionExists.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckTypeSize.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFile.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFileCXX.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\config-cmake.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcre.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcre_stringpiece.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcrecpparg.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcre_chartables.c.dist;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeLists.txt;%(AdditionalInputs) - D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\generate.stamp - false - Building Custom Rule D:/Users/evpobr/Documents/GitHubVisualStudio/pcre/CMakeLists.txt - setlocal -"C:\Program Files (x86)\CMake\bin\cmake.exe" -HD:/Users/evpobr/Documents/GitHubVisualStudio/pcre -BD:/Users/evpobr/Documents/GitHubVisualStudio/pcre --check-stamp-file D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\generate.stamp -if %errorlevel% neq 0 goto :cmEnd -:cmEnd -endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone -:cmErrorLevel -exit /b %1 -:cmDone -if %errorlevel% neq 0 goto :VCEnd - D:/Users/evpobr/Documents/GitHubVisualStudio/pcre/CMakeLists.txt;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeLists.txt;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeSystem.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeSystemSpecificInitialize.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeCCompiler.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeCXXCompiler.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeGenericSystem.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\WindowsPaths.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeRCCompiler.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeRCInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCXXInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindBZip2.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\SelectLibraryConfigurations.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageHandleStandardArgs.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageMessage.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeParseArguments.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindZLIB.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageHandleStandardArgs.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageMessage.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeParseArguments.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindReadline.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindEditline.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindPackageHandleStandardArgs.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFile.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFileCXX.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckFunctionExists.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckTypeSize.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFile.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFileCXX.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\config-cmake.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcre.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcre_stringpiece.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcrecpparg.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcre_chartables.c.dist;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeLists.txt;%(AdditionalInputs) - D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\generate.stamp - false - Building Custom Rule D:/Users/evpobr/Documents/GitHubVisualStudio/pcre/CMakeLists.txt - setlocal -"C:\Program Files (x86)\CMake\bin\cmake.exe" -HD:/Users/evpobr/Documents/GitHubVisualStudio/pcre -BD:/Users/evpobr/Documents/GitHubVisualStudio/pcre --check-stamp-file D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\generate.stamp -if %errorlevel% neq 0 goto :cmEnd -:cmEnd -endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone -:cmErrorLevel -exit /b %1 -:cmDone -if %errorlevel% neq 0 goto :VCEnd - D:/Users/evpobr/Documents/GitHubVisualStudio/pcre/CMakeLists.txt;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeLists.txt;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeSystem.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeSystemSpecificInitialize.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeCCompiler.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeCXXCompiler.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeGenericSystem.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\WindowsPaths.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC-C.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\3.3.1\CMakeRCCompiler.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeRCInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCXXInformation.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Compiler\MSVC-CXX.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC-CXX.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\Platform\Windows-MSVC.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeCommonLanguageInclude.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindBZip2.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\SelectLibraryConfigurations.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageHandleStandardArgs.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageMessage.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeParseArguments.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindZLIB.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageHandleStandardArgs.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindPackageMessage.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CMakeParseArguments.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindReadline.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindEditline.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\cmake\FindPackageHandleStandardArgs.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFile.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFileCXX.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckFunctionExists.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckTypeSize.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFile.cmake;C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\CheckIncludeFileCXX.cmake;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\config-cmake.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcre.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcre_stringpiece.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcrecpparg.h.in;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\pcre_chartables.c.dist;D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeLists.txt;%(AdditionalInputs) - D:\Users\evpobr\Documents\GitHubVisualStudio\pcre\CMakeFiles\generate.stamp - false - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcre/pcre.vcxproj.filters b/pcre/pcre.vcxproj.filters index f67d981..e3b83b5 100644 --- a/pcre/pcre.vcxproj.filters +++ b/pcre/pcre.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -66,16 +66,13 @@ - + Header Files - + Header Files - - - {955C7441-65E9-4E06-8454-266B0AF5B032} @@ -84,4 +81,4 @@ {B297E909-B442-48D3-B827-1483CDF9FC22} - + \ No newline at end of file