diff --git a/Build.html b/Build.html index e106a2c08..0f319dd3b 100644 --- a/Build.html +++ b/Build.html @@ -6,7 +6,7 @@ * v. 2.0. If a copy of the MPL was not distributed with this file, You can * obtain one at http://mozilla.org/MPL/2.0/ * - * Copyright (C) 2009-2013, Peter Johnson (www.delphidabbler.com). + * Copyright (C) 2009-2015, Peter Johnson (www.delphidabbler.com). * * $Rev$ * $Date$ @@ -191,6 +191,13 @@

The Borland resource compiler. Used to compile various resource source (.rc) files. +
+ GenTLB +
+
+ Type library generator. Used to create the ExternalObj.tlb type + library from source code in ExternalObj.ridl. +
TLibImpl
@@ -251,93 +258,6 @@

works.

-

- Microsoft Software Development Kit -

- -

- The MIDL IDL compiler that ships with the MS SDK is required to build - ExternalObj.tlb from ExternalObj.idl. -

- -

- MIDL requires the use of Microsoft's CL.exe C Pre-processor - which in turn requires mspdb**.dll, where ** is a number that - depends on the version of Visual Studio used. I use MIDL v7 and - mspdb80.dll from the Windows 2008 (v6.1) platform SDK. So that - MIDL can find these files you need to update your system PATH to include: -

- - - -

- The MSSDK environment variable must be set and contain the - MS SDK install directory. MIDL.exe must be in the - Bin sub-directory of MSSDK and the required - include files must be in the Include sub-directory. -

- -

- You can use a batch file with contents similar to the following to set the - path and the MSSDK environment variable before building - CodeSnip: -

- -
if not "%PATHSET%" == "" goto end
-set MSSDK=C:\Program Files\Microsoft SDKs\Windows\v7.1
-set PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin
-set PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE
-set PATHSET=1
-:end
- -

- Note: You do not need a copy of Visual Studio for this - – the required directories and files are created when the SDK is - installed. -

- -

- Build Without MIDL or the MS SDK -

- -

- If you don't already have the MS SDK it's a big job to download and install - it just to compile one .tlb file. Therefore there's an - alternative that means you can compile without the SDK. This is described - in the section - Editing and Compiling Without MIDL below. -

- -

- If you take this route, there's no need to set MSSDK or modify - the path. -

-

DelphiDabbler Version Information Editor (VIEd)

@@ -474,9 +394,6 @@

  • INDY10
    • -
  • - MSSDK (if using MIDL - see step 2) -

    • @@ -484,17 +401,16 @@

    - Update the PATH environment variable to include the paths that - MIDL needs (explained above). + Update the PATH environment variable to include + %DELPHIROOT%\Bin as its first path, i.e. do:

    +
    > set PATH=%DELPHIROOT%\Bin;%PATH%
    +

    - If you are not using MIDL then there is no need to modify the - PATH variable or set MSSDK. Instead you can - define IGNOREMIDL by setting it to some value, e.g. - set IGNOREMIDL=1. + You do not have to do this but it means you can run the preferred version of + Make from the command line without having to specify its path + every time.

    @@ -554,7 +470,11 @@

    Check out the source using the following command:
    - 
    > svn checkout http://codesnip.googlecode.com/svn/trunk/ PATH
    + 
    > svn checkout https://svn.code.sf.net/p/codesnip/code/trunk PATH
    +
    + or +
    + 
    > svn checkout svn://svn.code.sf.net/p/codesnip/code/trunk PATH
    Where PATH is the directory where you want to place the working copy. You will not be able to commit changes unless you join @@ -565,7 +485,11 @@

    Export the code using this command:
    - 
    > svn export http://codesnip.googlecode.com/svn/trunk/ PATH
    + 
    > svn export https://svn.code.sf.net/p/codesnip/code/trunk PATH
    +
    + or +
    + 
    > svn export svn://svn.code.sf.net/p/codesnip/code/trunk PATH
    where PATH is the directory where you wish to store the code. @@ -746,96 +670,6 @@

    steps automatically.

    -

    - Editing and Compiling without MIDL -

    - -

    - If you don't have the MIDL compiler you need to get hold of a pre-compiled - copy of the ExternalObj.tlb type library and tell Make to skip - the MIDL compiling stage. -

    - -

    - Getting The Type Library -

    - -
      -
    1. - If necessary download a resource file editor. XN Resource Editor will - do the job. You can get that from - http://www.wilsonc.demon.co.uk/d10resourceeditor.htm. -
      2. -
    2. - Get a suitable copy of the CodeSnip executable. This must have - been compiled from the same version of ExternalObj.idl as - that included in the source tree. -
      3. -
    3. - Load CodeSnip.exe into the resource file editor (Use - File | Open in XN Resource Editor). You need to - find the TYPELIB resource type. There should only be one, language - neutral, TYPELIB resource. Select this and export it as - ExternalObj.tlb in the Bin folder in your - configured source tree. (Use Resource | Export Resource in XN - Resource Editor). -
      4. -
    - -

    - If you are working on the latest development tree from the code repository - you should get ExternalObj.tlb from the latest release of - CodeSnip, unless ExternalObj.idl - has been changed since the last release. In this case you - must use MIDL to build the .idl file, because - a suitable .tlb file won't be available. -

    - -

    - Editing the Type Library -

    - -

    - You can edit the type library from the Delphi IDE. Start the IDE, select - File | Open, change the file type to Type Library and navigate to - ExternalObj.tlb. This opens the type library. Edit as required - then save the changes. Delete any *_TLB files that appear. -

    - -

    - If you do make changes you should also use the type library editor's - Export to IDL button to save a copy of the IDL in - ExternalObj.idl in the Src folder. The license in - the original code must be restored, so take a copy of the license from - ExternalObj.idl before overwriting it! -

    - -

    - You must regenerate the associated Pascal file. Do this by running: -

    - -
    > Make autogen
    - -

    - Telling Make to Ignore MIDL -

    - -

    - You now need to prevent Make from trying to compile the .idl - file in the absence of MIDL. Do this by defining an environment variable - called IGNOREMIDL. This can be done from the command line or - a batch file by doing: -

    - -
    -> set IGNOREMIDL=1
    - -

    - Alternatively, call Make with the -DIGNOREMIDL switch. -

    -

    Building CodeSnip

    @@ -921,28 +755,6 @@

    it is named CodeSnip-p.exe

    -

    - Building without MIDL -

    - -

    - If you are building without MIDL, and have a suitable copy of - ExternalObj.tlb already in the Bin directory you - must either have defined the IGNOREMIDL environment variable or - you must do: -

    - -
    > Make -DIGNOREMIDL codesnip
    - -

    - This is the same as doing: -

    - -
    > Make -DIGNOREMIDL typelib
-> Make resources
-> Make autogen
-> Make pascal
    -

    Build the Help File

    @@ -968,11 +780,6 @@ 

    > Make exes
    -

    - Make exes will require the use of the -DIGNOREMIDL - switch if MIDL is not available. -

    -

    Once you have built all the required files you build the setup file by doing: @@ -1088,12 +895,6 @@

    > Make setup > Make release -

    - Warning: You should not run this command if MIDL is not - available since Make config will delete any .tlb - file you may have placed in the Bin directory. -

    -

    Portable edition

    diff --git a/Docs/ChangeLogs/ChangeLog-v4.txt b/Docs/ChangeLogs/ChangeLog-v4.txt index aacc606eb..58f1cf514 100644 --- a/Docs/ChangeLogs/ChangeLog-v4.txt +++ b/Docs/ChangeLogs/ChangeLog-v4.txt @@ -11,6 +11,12 @@ ; Change Log for CodeSnip Release 4 ; ------------------------------------------------------------------------------ +Release v4.13.0 of 5 September 2015 ++ Added support for test compilation with, and detection of, Delphi 10 Seattle compiler. ++ Made some minor changes to method used to build required type library to remove dependency on the MS MIDL compiler, greatly simplifying build process. ++ Updated documentation re changes. ++ Updated help file re changes. + Release v4.12.0 of 6 May 2015 + Added support for test compilation with, and detection of, Delphi XE8 compiler. + Updated documentation re changes. diff --git a/Docs/Design/FileFormats/config.html b/Docs/Design/FileFormats/config.html index d95d02a38..8d3a9f12a 100644 --- a/Docs/Design/FileFormats/config.html +++ b/Docs/Design/FileFormats/config.html @@ -291,6 +291,9 @@

  • DXE8 – Delphi XE8
    • +
  • + D10S – Delphi 10 Seattle +
  • FPC – Free Pascal
    • @@ -585,6 +588,12 @@

    Indicates whether Delphi XE8 was included in search.
    +
    + D10S (Boolean) +
    +
    + Indicates whether Delphi 10 Seattle was included in search. +
    FPC (Boolean)
    diff --git a/Docs/Design/FileFormats/export.html b/Docs/Design/FileFormats/export.html index d9aee32e0..0559b76a1 100644 --- a/Docs/Design/FileFormats/export.html +++ b/Docs/Design/FileFormats/export.html @@ -515,6 +515,9 @@

  • dXE8 – Delphi XE8 compiler
    • +
  • + d10s – Delphi 10 Seattle compiler +
  • fpc – Free Pascal compiler
    • diff --git a/Docs/Design/FileFormats/main-db.html b/Docs/Design/FileFormats/main-db.html index 212d7ed57..426c55b28 100644 --- a/Docs/Design/FileFormats/main-db.html +++ b/Docs/Design/FileFormats/main-db.html @@ -156,6 +156,7 @@

    DelphiXE6=<Y|N|Q|W> DelphiXE7=<Y|N|Q|W> DelphiXE8=<Y|N|Q|W> +Delphi10S=<Y|N|Q|W> FPC=<Y|N|Q|W> Extra=<extra-info-REML> StandardFormat=<0|1> @@ -343,6 +344,9 @@

  • DelphiXE8 – Delphi XE8 compiler
    • +
  • + Delphi10S – Delphi 10 Seattle compiler +
  • FPC – Free Pascal compiler
    • diff --git a/Docs/Design/FileFormats/user-db.html b/Docs/Design/FileFormats/user-db.html index 0f84138e7..d4b7cc103 100644 --- a/Docs/Design/FileFormats/user-db.html +++ b/Docs/Design/FileFormats/user-db.html @@ -565,6 +565,9 @@

  • dXE8 – Delphi XE8 compiler
    • +
  • + d10s – Delphi 10 Seattle compiler +
  • fpc – Free Pascal compiler
    • diff --git a/Docs/ReadMe.txt b/Docs/ReadMe.txt index 434f2d6e6..5d2e7948c 100644 --- a/Docs/ReadMe.txt +++ b/Docs/ReadMe.txt @@ -14,8 +14,8 @@ online DelphiDabbler Code Snippets database as well as maintain a database of user-defined snippets. It displays details of each snippet in the database and can test-compile them -with each installed Win32 version of Delphi from v2 to XE8 along with Free -Pascal. +with each installed Win32 version of Delphi from Delphi 2 to Delphi 10 Seattle +along with Free Pascal. Compilable Pascal units can be created that contain selected snippets. @@ -225,9 +225,10 @@ dialogue" in the help file index). Each user can configure compilers differently. -Delphi XE2 to XE8 may need to be configured to search for required units in the -correct namespaces. This is explained in the Add/Edit Snippet Dialogue Box help -topic and in the FAQ at http://delphidabbler.com/url/codesnip-and-xe2. +Delphi XE2 to XE8 and Delphi 10 Seattle may need to be configured to search for +required units in the correct namespaces. This is explained in the Add/Edit +Snippet Dialogue Box help topic and in the FAQ at +http://delphidabbler.com/url/codesnip-and-xe2. Registration diff --git a/Src/Compilers.UBDS.pas b/Src/Compilers.UBDS.pas index 8fdf2ccd4..88f40b8c8 100644 --- a/Src/Compilers.UBDS.pas +++ b/Src/Compilers.UBDS.pas @@ -143,6 +143,8 @@ function TBDSCompiler.GetIDString: string; Result := 'DXE7'; ciDXE8: Result := 'DXE8'; + ciD10S: + Result := 'D10S'; else raise EBug.Create(ClassName + '.GetIDString: Invalid ID'); end; @@ -150,15 +152,16 @@ function TBDSCompiler.GetIDString: string; function TBDSCompiler.GetName: string; resourcestring - sCompilerName = 'Delphi %d'; // template for name of compiler - sDelphiXE = 'Delphi XE'; // name of Delphi XE compiler - sDelphiXE2 = 'Delphi XE2'; // name of Delphi XE2 compiler - sDelphiXE3 = 'Delphi XE3'; // name of Delphi XE3 compiler - sDelphiXE4 = 'Delphi XE4'; // name of Delphi XE4 compiler - sDelphiXE5 = 'Delphi XE5'; // name of Delphi XE5 compiler - sDelphiXE6 = 'Delphi XE6'; // name of Delphi XE6 compiler - sDelphiXE7 = 'Delphi XE7'; // name of Delphi XE7 compiler - sDelphiXE8 = 'Delphi XE8'; // name of Delphi XE8 compiler + sCompilerName = 'Delphi %d'; // template for name of compiler + sDelphiXE = 'Delphi XE'; // name of Delphi XE compiler + sDelphiXE2 = 'Delphi XE2'; // name of Delphi XE2 compiler + sDelphiXE3 = 'Delphi XE3'; // name of Delphi XE3 compiler + sDelphiXE4 = 'Delphi XE4'; // name of Delphi XE4 compiler + sDelphiXE5 = 'Delphi XE5'; // name of Delphi XE5 compiler + sDelphiXE6 = 'Delphi XE6'; // name of Delphi XE6 compiler + sDelphiXE7 = 'Delphi XE7'; // name of Delphi XE7 compiler + sDelphiXE8 = 'Delphi XE8'; // name of Delphi XE8 compiler + sDelphi10S = 'Delphi 10 Seattle'; // name of Delphi 10 compiler begin case GetID of ciDXE: @@ -177,6 +180,8 @@ function TBDSCompiler.GetName: string; Result := sDelphiXE7; ciDXE8: Result := sDelphiXE8; + ciD10S: + Result := sDelphi10S; else Result := Format(sCompilerName, [ProductVersion]); end; @@ -205,6 +210,7 @@ function TBDSCompiler.InstallationRegKey: string; ciDXE6 : Result := '\Software\Embarcadero\BDS\14.0'; ciDXE7 : Result := '\Software\Embarcadero\BDS\15.0'; ciDXE8 : Result := '\Software\Embarcadero\BDS\16.0'; + ciD10S : Result := '\Software\Embarcadero\BDS\17.0'; else raise EBug.Create(ClassName + '.InstallationRegKey: Invalid ID'); end; end; diff --git a/Src/Compilers.UGlobals.pas b/Src/Compilers.UGlobals.pas index a012e7ed9..f21abf1be 100644 --- a/Src/Compilers.UGlobals.pas +++ b/Src/Compilers.UGlobals.pas @@ -41,6 +41,7 @@ interface ciDXE6, // Delphi XE6 ciDXE7, // Delphi XE7 ciDXE8, // Delphi XE8 + ciD10S, // Delphi 10 Seattle ciFPC // Free Pascal ); @@ -53,7 +54,7 @@ interface /// compilers. cBDSCompilers = [ ciD2005w32, ciD2006w32, ciD2007, ciD2009w32, ciD2010, ciDXE, ciDXE2, - ciDXE3, ciDXE4, ciDXE5, ciDXE6, ciDXE7, ciDXE8 + ciDXE3, ciDXE4, ciDXE5, ciDXE6, ciDXE7, ciDXE8, ciD10S ]; const diff --git a/Src/DBIO.UIniDataReader.pas b/Src/DBIO.UIniDataReader.pas index 1b2cad961..bb61b2b39 100644 --- a/Src/DBIO.UIniDataReader.pas +++ b/Src/DBIO.UIniDataReader.pas @@ -237,7 +237,7 @@ implementation 'Delphi2', 'Delphi3', 'Delphi4', 'Delphi5', 'Delphi6', 'Delphi7', 'Delphi2005Win32', 'Delphi2006Win32', 'Delphi2007', 'Delphi2009Win32', 'Delphi2010', 'DelphiXE', 'DelphiXE2', 'DelphiXE3', 'DelphiXE4', - 'DelphiXE5', 'DelphiXE6', 'DelphiXE7', 'DelphiXE8', 'FPC' + 'DelphiXE5', 'DelphiXE6', 'DelphiXE7', 'DelphiXE8', 'Delphi10S', 'FPC' ); { TIniDataReader } diff --git a/Src/ExternalObj.idl b/Src/ExternalObj.ridl similarity index 70% rename from Src/ExternalObj.idl rename to Src/ExternalObj.ridl index f6004feed..5e327b55b 100644 --- a/Src/ExternalObj.idl +++ b/Src/ExternalObj.ridl @@ -3,7 +3,7 @@ * v. 2.0. If a copy of the MPL was not distributed with this file, You can * obtain one at http://mozilla.org/MPL/2.0/ * - * Copyright (C) 2006-2013, Peter Johnson (www.delphidabbler.com). + * Copyright (C) 2006-2015, Peter Johnson (www.delphidabbler.com). * * $Rev$ * $Date$ @@ -17,10 +17,10 @@ uuid(DA95AEFB-3FB5-4A9E-9F9D-A53DD05CA7D4), version(12.0), helpstring("CodeSnip DOM External Object Extender Type Library"), - custom(DE77BA63-517C-11D1-A2DA-0000F8773CE9, 1219706147), - custom(DE77BA64-517C-11D1-A2DA-0000F8773CE9, 117441012) -] + custom(DE77BA64-517C-11D1-A2DA-0000F8773CE9, 117441012), + custom(DE77BA63-517C-11D1-A2DA-0000F8773CE9, 1219706147) +] library ExternalObj { @@ -29,6 +29,9 @@ library ExternalObj /* * V12 interface of extension to browser DOM's "external" object. */ + interface IWBExternal12; + + [ uuid(BA971829-ED4D-4092-BCAE-4B5DB1A2D74A), version(12.0), @@ -41,99 +44,75 @@ library ExternalObj /* * Update database from internet. */ - [ - id(0x00000065) - ] - HRESULT _stdcall UpdateDbase( void ); + [id(0x00000065)] + HRESULT _stdcall UpdateDbase(void); /* * Display named snippet. * @param SnippetName [in] Name of snippet to display. * @param UserDefined [in] Whether snippet is user defined. */ - [ - id(0x00000066) - ] + [id(0x00000066)] HRESULT _stdcall DisplaySnippet([in] BSTR SnippetName, - [in] VARIANT_BOOL UserDefined, [in] VARIANT_BOOL NewTab ); + [in] VARIANT_BOOL UserDefined, [in] VARIANT_BOOL NewTab); /* * Displays configure compilers dialog box. */ - [ - id(0x0000006A) - ] - HRESULT _stdcall ConfigCompilers( void ); + [id(0x0000006A)] + HRESULT _stdcall ConfigCompilers(void); /* * Edits the named snippet. * @param SnippetName [in] Name of snippet to edit. Must be user defined. */ - [ - id(0x0000006C) - ] + [id(0x0000006C)] HRESULT _stdcall EditSnippet([in] BSTR SnippetName); /* * Displays Donate dialog box. */ - [ - id(0x0000006D) - ] - HRESULT _stdcall Donate( void ); + [id(0x0000006D)] + HRESULT _stdcall Donate(void); /* * Display identified category. * @param CatID [in] ID of category to display. */ - [ - id(0x0000006E) - ] + [id(0x0000006E)] HRESULT _stdcall DisplayCategory([in] BSTR CatID, [in] VARIANT_BOOL NewTab); + [id(0x0000006F)] /* * Open Snippets Editor ready to create a new snippet. */ - [ - id(0x0000006F) - ] - HRESULT _stdcall NewSnippet( void ); + HRESULT _stdcall NewSnippet(void); + [id(0x00000070)] /* * Show news items from CodeSnip news feed. */ - [ - id(0x00000070) - ] - HRESULT _stdcall ShowNews( void ); + HRESULT _stdcall ShowNews(void); + [id(0x00000071)] /* * Check for program updates. */ - [ - id(0x00000071) - ] - HRESULT _stdcall CheckForUpdates( void ); + HRESULT _stdcall CheckForUpdates(void); + [id(0x00000072)] /* * Display the program's About box. */ - [ - id(0x00000072) - ] - HRESULT _stdcall ShowAboutBox( void ); + HRESULT _stdcall ShowAboutBox(void); + [id(0x00000073)] /* * Displays a tab in the Preferences dialogue box. * @param TagCls [in] Class name of frame hosting required dialogue box * page. */ - [ - id(0x00000073) - ] HRESULT _stdcall ShowPrefsPage([in] BSTR ClsName); - }; -}; - +}; \ No newline at end of file diff --git a/Src/FirstRun.UConfigFile.pas b/Src/FirstRun.UConfigFile.pas index 9b654f2c4..20e20b308 100644 --- a/Src/FirstRun.UConfigFile.pas +++ b/Src/FirstRun.UConfigFile.pas @@ -482,6 +482,7 @@ procedure TUserConfigFileUpdater.UpdateNamespaces; UpdateForCompiler('DXE6'); UpdateForCompiler('DXE7'); UpdateForCompiler('DXE8'); + UpdateForCompiler('D10S'); end; { TCommonConfigFileUpdater } diff --git a/Src/FrCodeGenPrefs.pas b/Src/FrCodeGenPrefs.pas index 925109994..7f07a64e8 100644 --- a/Src/FrCodeGenPrefs.pas +++ b/Src/FrCodeGenPrefs.pas @@ -680,6 +680,7 @@ procedure TCodeGenPrefsFrame.PopulatePreDefCompilerMenu; AddMenuItem('Delphi XE6', 27.0); AddMenuItem('Delphi XE7', 28.0); AddMenuItem('Delphi XE8', 29.0); + AddMenuItem('Delphi 10 Seattle', 30.0); end; procedure TCodeGenPrefsFrame.PreDefCompilerMenuClick(Sender: TObject); diff --git a/Src/Help/HTML/about_compiler_checks.htm b/Src/Help/HTML/about_compiler_checks.htm index ab52c6cb0..29844b5e9 100644 --- a/Src/Help/HTML/about_compiler_checks.htm +++ b/Src/Help/HTML/about_compiler_checks.htm @@ -37,7 +37,7 @@

    The supported compilers are the Win32 Delphi compilers from Delphi 2 to - Delphi XE8 and Free Pascal. + Delphi 10 Seattle and Free Pascal.

    Configuring CodeSnip diff --git a/Src/Help/HTML/dlg_configcompilers.htm b/Src/Help/HTML/dlg_configcompilers.htm index cc54657f3..f5091354d 100644 --- a/Src/Help/HTML/dlg_configcompilers.htm +++ b/Src/Help/HTML/dlg_configcompilers.htm @@ -278,7 +278,7 @@

    CodeSnip can automatically detect the presence of Win 32 Delphi - compilers from versions 2 to XE8. Click the Detect Delphi + compilers from Delphi 2 to Delphi 10 Seattle. Click the Detect Delphi Compilers button to do this. Any supported installed version of Delphi will be recorded. This can save considerable time and avoid errors. diff --git a/Src/Makefile b/Src/Makefile index 32b047f78..26d7d7c6b 100644 --- a/Src/Makefile +++ b/Src/Makefile @@ -2,7 +2,7 @@ # v. 2.0. If a copy of the MPL was not distributed with this file, You can # obtain one at http://mozilla.org/MPL/2.0/ # -# Copyright (C) 2009-2014, Peter Johnson (www.delphidabbler.com). +# Copyright (C) 2009-2015, Peter Johnson (www.delphidabbler.com). # # $Rev$ # $Date$ @@ -32,6 +32,8 @@ DELPHIROOT = $(DELPHIXE) TLIBIMP = "$(DELPHIROOT)\Bin\TLibImp.exe" +GENTLB = "$(DELPHIROOT)\Bin\GenTLB.exe" + MAKE = "$(MAKEDIR)\Make.exe" -$(MAKEFLAGS) DCC32 = "$(DELPHIROOT)\Bin\DCC32.exe" @@ -71,18 +73,6 @@ ZIP = "$(ZIPROOT)\Zip.exe" ZIP = Zip.exe !endif -!ifndef IGNOREMIDL -!ifdef MSSDK -MIDL = "$(MSSDK)\Bin\MIDL.exe" -!else -# MSSDK is required -!error MSSDK environment variable required. -!endif -!else -# MIDL.exe can be ignored if IGNOREMIDL macro is defined: replace with echo -MIDL = @echo *** IGNORING MIDL -!endif - # Command line options !ifdef PORTABLE DELPHIDEFINES = "-DPORTABLE" @@ -165,7 +155,7 @@ HTML.res: HTML.hrc # Compiles type library from IDL typelib: - @$(MIDL) .\ExternalObj.idl /tlb $(BIN)\ExternalObj.tlb /I "$(MSSDK)\Include" + @$(GENTLB) .\ExternalObj.ridl -D$(BIN) -TExternalObj.tlb # Builds setup program setup: diff --git a/Src/UXMLDocConsts.pas b/Src/UXMLDocConsts.pas index f6f06e1cd..8fc039a68 100644 --- a/Src/UXMLDocConsts.pas +++ b/Src/UXMLDocConsts.pas @@ -74,7 +74,7 @@ interface 'd2', 'd3', 'd4', 'd5', 'd6', 'd7', 'd2005', 'd2006', 'd2007', 'd2009', 'd2010', 'dXE', 'dXE2', 'dXE3', 'dDX4' {error, but in use}, - 'dXE5', 'dXE6', 'dXE7', 'dXE8', + 'dXE5', 'dXE6', 'dXE7', 'dXE8', 'd10s', 'fpc' ); diff --git a/Src/VCodeSnip.vi b/Src/VCodeSnip.vi index dcaa8f364..7a21d0ad7 100644 --- a/Src/VCodeSnip.vi +++ b/Src/VCodeSnip.vi @@ -11,8 +11,8 @@ [Fixed File Info] -File Version #=4, 12, 0, 250 -Product Version #=4, 12, 0, 0 +File Version #=4, 13, 0, 251 +Product Version #=4, 13, 0, 0 File OS=4 File Type=1 File Sub-Type=0 diff --git a/Src/VCodeSnipPortable.vi b/Src/VCodeSnipPortable.vi index af3b371bc..cfe5e2139 100644 --- a/Src/VCodeSnipPortable.vi +++ b/Src/VCodeSnipPortable.vi @@ -11,8 +11,8 @@ [Fixed File Info] -File Version #=4, 12, 0, 250 -Product Version #=4, 12, 0, 0 +File Version #=4, 13, 0, 251 +Product Version #=4, 13, 0, 0 File OS=4 File Type=1 File Sub-Type=0