From dcdbaa64835e90cd9cbf73add0f4fd1d98d68141 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 7 Sep 2018 22:35:35 +0200
Subject: [PATCH] Make Updater static library

---
 UpdCheck/MSIBuild/Makefile       |  7 ------
 UpdCheck/UpdCheck.vcxproj        |  4 ++--
 UpdPublish/UpdPublish.vcxproj    |  4 ++--
 UpdSignXML/UpdSignXML.vcxproj    |  4 ++--
 Updater.sln                      | 28 +++++++++++-----------
 Updater/MSIBuild/Makefile        | 26 ---------------------
 Updater/build/Updater.props      |  2 +-
 Updater/build/Updater.vcxproj    | 40 +++++++++++---------------------
 Updater/include/Updater/common.h | 11 +++++----
 9 files changed, 41 insertions(+), 85 deletions(-)

diff --git a/UpdCheck/MSIBuild/Makefile b/UpdCheck/MSIBuild/Makefile
index 96b7660..54e68e0 100644
--- a/UpdCheck/MSIBuild/Makefile
+++ b/UpdCheck/MSIBuild/Makefile
@@ -77,13 +77,6 @@ Feature_	Component_
 s38	s$(MSIBUILD_LENGTH_ID)
 FeatureComponents	Feature_	Component_
 featUpdCheck	compUpdCheck.exe.$(PLAT)
-featUpdCheck	compwxExtend.dll.$(PLAT)
-featUpdCheck	compUpdater.dll.$(PLAT)
-featUpdCheck	compwxbase.dll.$(PLAT)
-featUpdCheck	compwxbase_net.dll.$(PLAT)
-featUpdCheck	compwxbase_xml.dll.$(PLAT)
-featUpdCheck	compwxmsw_core.dll.$(PLAT)
-featUpdCheck	compwxmsw_aui.dll.$(PLAT)
 <<NOKEEP
 
 
diff --git a/UpdCheck/UpdCheck.vcxproj b/UpdCheck/UpdCheck.vcxproj
index 735b299..e36b5e7 100644
--- a/UpdCheck/UpdCheck.vcxproj
+++ b/UpdCheck/UpdCheck.vcxproj
@@ -140,8 +140,8 @@
     <None Include="locale\UpdCheck.pot" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendDll-15.0.vcxproj">
-      <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
+    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib-15.0.vcxproj">
+      <Project>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</Project>
     </ProjectReference>
     <ProjectReference Include="..\Updater\build\Updater.vcxproj">
       <Project>{990d8cf9-4457-4dc0-aa18-4968ef434741}</Project>
diff --git a/UpdPublish/UpdPublish.vcxproj b/UpdPublish/UpdPublish.vcxproj
index 8fdadcb..89bcc08 100644
--- a/UpdPublish/UpdPublish.vcxproj
+++ b/UpdPublish/UpdPublish.vcxproj
@@ -135,8 +135,8 @@
     <ClInclude Include="UpdPublish.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendDll-15.0.vcxproj">
-      <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
+    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib-15.0.vcxproj">
+      <Project>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/UpdSignXML/UpdSignXML.vcxproj b/UpdSignXML/UpdSignXML.vcxproj
index 0f0ee6e..8a27b00 100644
--- a/UpdSignXML/UpdSignXML.vcxproj
+++ b/UpdSignXML/UpdSignXML.vcxproj
@@ -135,8 +135,8 @@
     <ClInclude Include="UpdSignXML.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendDll-15.0.vcxproj">
-      <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
+    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib-15.0.vcxproj">
+      <Project>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Updater.sln b/Updater.sln
index 2c1e98f..5579de3 100644
--- a/Updater.sln
+++ b/Updater.sln
@@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdCheck", "UpdCheck\UpdCheck.vcxproj", "{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "..\lib\wxExtend\build\wxExtendDll-15.0.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "..\lib\wxExtend\build\wxExtendLib-15.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdSignXML", "UpdSignXML\UpdSignXML.vcxproj", "{2A403460-7834-41B8-9823-199E8FE36FA8}"
 EndProject
@@ -42,18 +42,18 @@ Global
 		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|x64.Build.0 = Release|x64
 		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|x86.ActiveCfg = Release|Win32
 		{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|x86.Build.0 = Release|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|ARM64.Build.0 = Debug|ARM64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.ActiveCfg = Debug|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.Build.0 = Debug|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x86.ActiveCfg = Debug|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x86.Build.0 = Debug|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|ARM64.ActiveCfg = Release|ARM64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|ARM64.Build.0 = Release|ARM64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.ActiveCfg = Release|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.Build.0 = Release|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x86.ActiveCfg = Release|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x86.Build.0 = Release|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.ActiveCfg = Debug|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.Build.0 = Debug|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x86.ActiveCfg = Debug|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x86.Build.0 = Debug|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.Build.0 = Release|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.ActiveCfg = Release|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.Build.0 = Release|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x86.ActiveCfg = Release|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x86.Build.0 = Release|Win32
 		{2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|x64.ActiveCfg = Debug|x64
@@ -95,7 +95,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
 		{990D8CF9-4457-4DC0-AA18-4968EF434741} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/Updater/MSIBuild/Makefile b/Updater/MSIBuild/Makefile
index 0b39995..e733b96 100644
--- a/Updater/MSIBuild/Makefile
+++ b/Updater/MSIBuild/Makefile
@@ -23,10 +23,6 @@
 !ERROR Parameter MSIBUILD_LANGID is undefined.
 !ENDIF
 
-!IFNDEF UPDATER_BIN_DIR
-!ERROR Parameter UPDATER_BIN_DIR is undefined.
-!ENDIF
-
 !IFNDEF UPDATER_LOC_DIR
 !ERROR Parameter UPDATER_LOC_DIR is undefined.
 !ENDIF
@@ -43,12 +39,6 @@ All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
 Component	ComponentId	Directory_	Attributes	Condition	KeyPath
 s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
 Component	Component
-!IF "$(PLAT)" == "Win32"
-compUpdater.dll.Win32	{A2DD60BC-D9D1-4D22-A4BF-C28E007C0765}	$(UPDATER_BIN_DIR)	0		fileUpdater.dll.Win32
-!ENDIF
-!IF "$(PLAT)" == "x64"
-compUpdater.dll.x64	{2D45C321-2118-4ECC-975D-40991E0860C8}	$(UPDATER_BIN_DIR)	256		fileUpdater.dll.x64
-!ENDIF
 !IF "$(LANG)" == "ru_RU"
 compUpdater.mo.ru_RU	{486A9DDF-A43B-4920-BEF9-2907DD8660AD}	UPDATERLOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileUpdater.mo.ru_RU
 !ENDIF
@@ -89,22 +79,6 @@ All :: "$(LANG).$(PLAT).$(CFG).File-1.idt"
 File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
 File	File
-!IF "$(PLAT)" == "Win32"
-!IF "$(CFG)" == "Release"
-fileUpdater.dll.Win32	compUpdater.dll.Win32	UPDATE~1.DLL|Updater$(UPDATER_VERSION)u_vc100.dll	0		0	1536	1
-!ENDIF
-!IF "$(CFG)" == "Debug"
-fileUpdater.dll.Win32	compUpdater.dll.Win32	UPDATE~1.DLL|Updater$(UPDATER_VERSION)ud_vc100.dll	0		0	1536	1
-!ENDIF
-!ENDIF
-!IF "$(PLAT)" == "x64"
-!IF "$(CFG)" == "Release"
-fileUpdater.dll.x64	compUpdater.dll.x64	UPDATE~1.DLL|Updater$(UPDATER_VERSION)u_vc100_x64.dll	0		0	1536	1
-!ENDIF
-!IF "$(CFG)" == "Debug"
-fileUpdater.dll.x64	compUpdater.dll.x64	UPDATE~1.DLL|Updater$(UPDATER_VERSION)ud_vc100_x64.dll	0		0	1536	1
-!ENDIF
-!ENDIF
 !IF "$(LANG)" != "en_US"
 fileUpdater.mo.$(LANG)	compUpdater.mo.$(LANG)	UPDATE~1.MO|Updater$(UPDATER_VERSION).mo	0		$(MSIBUILD_LANGID)	0	1
 !ENDIF
diff --git a/Updater/build/Updater.props b/Updater/build/Updater.props
index fb03480..ee2f28d 100644
--- a/Updater/build/Updater.props
+++ b/Updater/build/Updater.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros"/>
+  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <OutDir>..\..\..\output\$(Platform).$(Configuration)\</OutDir>
   </PropertyGroup>
diff --git a/Updater/build/Updater.vcxproj b/Updater/build/Updater.vcxproj
index 4b710d4..09b73ee 100644
--- a/Updater/build/Updater.vcxproj
+++ b/Updater/build/Updater.vcxproj
@@ -55,8 +55,8 @@
     <ResourceCompile Include="..\res\Updater.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\lib\wxExtend\build\wxExtendDll-15.0.vcxproj">
-      <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
+    <ProjectReference Include="..\..\..\lib\wxExtend\build\wxExtendLib-15.0.vcxproj">
+      <Project>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</Project>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -66,40 +66,40 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
@@ -146,24 +146,12 @@
     <Import Project="Updater.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)$(UpdaterVersion)ud_vc$(PlatformToolsetVersion)</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>$(ProjectName)$(UpdaterVersion)ud_vc$(PlatformToolsetVersion)_x64</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <TargetName>$(ProjectName)$(UpdaterVersion)ud_vc$(PlatformToolsetVersion)_arm64</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>$(ProjectName)$(UpdaterVersion)u_vc$(PlatformToolsetVersion)</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>$(ProjectName)$(UpdaterVersion)u_vc$(PlatformToolsetVersion)_x64</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <TargetName>$(ProjectName)$(UpdaterVersion)u_vc$(PlatformToolsetVersion)_arm64</TargetName>
-  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <PropertyGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Updater/include/Updater/common.h b/Updater/include/Updater/common.h
index 2d9b5d1..a8c6e59 100644
--- a/Updater/include/Updater/common.h
+++ b/Updater/include/Updater/common.h
@@ -33,11 +33,12 @@
 ///
 /// Public function calling convention
 ///
-#ifdef UPDATER
-#define UPDATER_API    __declspec(dllexport)
-#else
-#define UPDATER_API    __declspec(dllimport)
-#endif
+//#ifdef UPDATER
+//#define UPDATER_API    __declspec(dllexport)
+//#else
+//#define UPDATER_API    __declspec(dllimport)
+//#endif
+#define UPDATER_API
 
 #define UPDATER_SIGNATURE_MARK  "SHA1SIGN:"