From 20de2bcba8ccc67cb4d72759812dcb1822965106 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon.rozman@amebis.si>
Date: Mon, 14 Oct 2013 16:38:56 +0000
Subject: [PATCH] Verzijo sem nastavil na 2.0-pre1.

---
 .gitignore               | 12 ++++--------
 MSICALib/MSITSCA.h       |  6 +++---
 MSICALib/MSITSCA.vcxproj | 33 ++++++++++++++++++++++++---------
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index b4d5153..8664d0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,8 @@
 MSICALib/*.user
-MSICALib/Debug.Win32
-MSICALib/Debug.x64
-MSICALib/Release.Win32
-MSICALib/Release.x64
-MSICALib/Unicode[!!-~]Debug.Win32
-MSICALib/Unicode[!!-~]Debug.x64
-MSICALib/Unicode[!!-~]Release.Win32
-MSICALib/Unicode[!!-~]Release.x64
+MSICALib/MSITSCA.Debug.Win32
+MSICALib/MSITSCA.Debug.x64
+MSICALib/MSITSCA.Release.Win32
+MSICALib/MSITSCA.Release.x64
 MSICALib/msm/*-1.idt
 MSICALib/msm/*-2.idt
 MSICALib/msm/*-2.idtx
diff --git a/MSICALib/MSITSCA.h b/MSICALib/MSITSCA.h
index 6b98149..4538aab 100644
--- a/MSICALib/MSITSCA.h
+++ b/MSICALib/MSITSCA.h
@@ -10,10 +10,10 @@
 
 #define MSITSCA_VERSION_MAJ   1
 #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_INST  "1.255.0.0"
+#define MSITSCA_VERSION_STR   "2.0-pre1"
+#define MSITSCA_VERSION_INST  "1.255.1.0"
 
 
 #if !defined(RC_INVOKED) && !defined(MIDL_PASS)
diff --git a/MSICALib/MSITSCA.vcxproj b/MSICALib/MSITSCA.vcxproj
index 91e435a..445b665 100644
--- a/MSICALib/MSITSCA.vcxproj
+++ b/MSICALib/MSITSCA.vcxproj
@@ -27,6 +27,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -37,6 +38,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -47,11 +49,29 @@
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\rcxgettext.props" />
   </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="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
-    <Import Project="$(VCInstallDir)VCProjectDefaults\Amebis $(Configuration).props" Condition="exists('$(VCInstallDir)VCProjectDefaults\Amebis $(Configuration).props')" />
-    <Import Project="$(VCInstallDir)VCProjectDefaults\Amebis $(Platform).props" Condition="exists('$(VCInstallDir)VCProjectDefaults\Amebis $(Platform).props')" />
+    <Import Project="$(VCInstallDir)VCProjectDefaults\AmebisDebug.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>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -148,13 +168,8 @@
     <None Include="res\en_GB.po" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\AMSICA\AMSICALib\AMSICALib.vcxproj">
+    <ProjectReference Include="..\AMSICA\build\AMSICALib.vcxproj">
       <Project>{8552ee55-177e-4f51-b51b-baf7d6462cde}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />