Verzijo sem nastavil na 2.0-pre1.
This commit is contained in:
parent
ff80b94e03
commit
20de2bcba8
12
.gitignore
vendored
12
.gitignore
vendored
@ -1,12 +1,8 @@
|
|||||||
MSICALib/*.user
|
MSICALib/*.user
|
||||||
MSICALib/Debug.Win32
|
MSICALib/MSITSCA.Debug.Win32
|
||||||
MSICALib/Debug.x64
|
MSICALib/MSITSCA.Debug.x64
|
||||||
MSICALib/Release.Win32
|
MSICALib/MSITSCA.Release.Win32
|
||||||
MSICALib/Release.x64
|
MSICALib/MSITSCA.Release.x64
|
||||||
MSICALib/Unicode[!!-~]Debug.Win32
|
|
||||||
MSICALib/Unicode[!!-~]Debug.x64
|
|
||||||
MSICALib/Unicode[!!-~]Release.Win32
|
|
||||||
MSICALib/Unicode[!!-~]Release.x64
|
|
||||||
MSICALib/msm/*-1.idt
|
MSICALib/msm/*-1.idt
|
||||||
MSICALib/msm/*-2.idt
|
MSICALib/msm/*-2.idt
|
||||||
MSICALib/msm/*-2.idtx
|
MSICALib/msm/*-2.idtx
|
||||||
|
@ -10,10 +10,10 @@
|
|||||||
|
|
||||||
#define MSITSCA_VERSION_MAJ 1
|
#define MSITSCA_VERSION_MAJ 1
|
||||||
#define MSITSCA_VERSION_MIN 255
|
#define MSITSCA_VERSION_MIN 255
|
||||||
#define MSITSCA_VERSION_REV 0
|
#define MSITSCA_VERSION_REV 1
|
||||||
|
|
||||||
#define MSITSCA_VERSION_STR "2.0-pre"
|
#define MSITSCA_VERSION_STR "2.0-pre1"
|
||||||
#define MSITSCA_VERSION_INST "1.255.0.0"
|
#define MSITSCA_VERSION_INST "1.255.1.0"
|
||||||
|
|
||||||
|
|
||||||
#if !defined(RC_INVOKED) && !defined(MIDL_PASS)
|
#if !defined(RC_INVOKED) && !defined(MIDL_PASS)
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<UseOfAtl>Static</UseOfAtl>
|
<UseOfAtl>Static</UseOfAtl>
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
@ -37,6 +38,7 @@
|
|||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<UseOfAtl>Static</UseOfAtl>
|
<UseOfAtl>Static</UseOfAtl>
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
@ -47,11 +49,29 @@
|
|||||||
<ImportGroup Label="ExtensionSettings">
|
<ImportGroup Label="ExtensionSettings">
|
||||||
<Import Project="$(VCTargetsPath)\BuildCustomizations\rcxgettext.props" />
|
<Import Project="$(VCTargetsPath)\BuildCustomizations\rcxgettext.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<ImportGroup Label="PropertySheets">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
|
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
|
||||||
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis $(Configuration).props" Condition="exists('$(VCInstallDir)VCProjectDefaults\Amebis $(Configuration).props')" />
|
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisDebug.props" />
|
||||||
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis $(Platform).props" Condition="exists('$(VCInstallDir)VCProjectDefaults\Amebis $(Platform).props')" />
|
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisWin32.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
|
||||||
|
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisDebug.props" />
|
||||||
|
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebisx64.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
|
||||||
|
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisRelease.props" />
|
||||||
|
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisWin32.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
|
||||||
|
<Import Project="$(VCInstallDir)VCProjectDefaults\AmebisRelease.props" />
|
||||||
|
<Import Project="$(VCInstallDir)VCProjectDefaults\Amebisx64.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
@ -148,13 +168,8 @@
|
|||||||
<None Include="res\en_GB.po" />
|
<None Include="res\en_GB.po" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\AMSICA\AMSICALib\AMSICALib.vcxproj">
|
<ProjectReference Include="..\AMSICA\build\AMSICALib.vcxproj">
|
||||||
<Project>{8552ee55-177e-4f51-b51b-baf7d6462cde}</Project>
|
<Project>{8552ee55-177e-4f51-b51b-baf7d6462cde}</Project>
|
||||||
<Private>true</Private>
|
|
||||||
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
|
|
||||||
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
|
|
||||||
<LinkLibraryDependencies>true</LinkLibraryDependencies>
|
|
||||||
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
|
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
Loading…
x
Reference in New Issue
Block a user