Add files to build for VS2013

ParadoxGameConverters · Nov 27, 2013 · 4aa9b09 · 4aa9b09
1 parent d9aa885
commit 4aa9b09
Show file tree

Hide file tree

Showing 5 changed files with 246 additions and 1 deletion.
diff --git a/CK2ToEU3-VS2013.sln b/CK2ToEU3-VS2013.sln
@@ -0,0 +1,46 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2013 for Windows Desktop
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UI", "UI\UI.csproj", "{C9DD9F19-3F25-452E-9C1D-EDEB1B57E4B7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CK2ToEU3-VS2013", "CK2ToEU3-VS2013.vcxproj", "{E1CD4114-8CDA-4751-9009-92674B541A94}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|Win32 = Debug|Win32
+		Debug|x86 = Debug|x86
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|Win32 = Release|Win32
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C9DD9F19-3F25-452E-9C1D-EDEB1B57E4B7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{C9DD9F19-3F25-452E-9C1D-EDEB1B57E4B7}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{C9DD9F19-3F25-452E-9C1D-EDEB1B57E4B7}.Debug|Win32.ActiveCfg = Debug|x86
+		{C9DD9F19-3F25-452E-9C1D-EDEB1B57E4B7}.Debug|x86.ActiveCfg = Debug|x86
+		{C9DD9F19-3F25-452E-9C1D-EDEB1B57E4B7}.Debug|x86.Build.0 = Debug|x86
+		{C9DD9F19-3F25-452E-9C1D-EDEB1B57E4B7}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{C9DD9F19-3F25-452E-9C1D-EDEB1B57E4B7}.Release|Mixed Platforms.Build.0 = Release|x86
+		{C9DD9F19-3F25-452E-9C1D-EDEB1B57E4B7}.Release|Win32.ActiveCfg = Release|x86
+		{C9DD9F19-3F25-452E-9C1D-EDEB1B57E4B7}.Release|x86.ActiveCfg = Release|x86
+		{C9DD9F19-3F25-452E-9C1D-EDEB1B57E4B7}.Release|x86.Build.0 = Release|x86
+		{E1CD4114-8CDA-4751-9009-92674B541A94}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{E1CD4114-8CDA-4751-9009-92674B541A94}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{E1CD4114-8CDA-4751-9009-92674B541A94}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E1CD4114-8CDA-4751-9009-92674B541A94}.Debug|Win32.Build.0 = Debug|Win32
+		{E1CD4114-8CDA-4751-9009-92674B541A94}.Debug|x86.ActiveCfg = Debug|Win32
+		{E1CD4114-8CDA-4751-9009-92674B541A94}.Debug|x86.Build.0 = Debug|Win32
+		{E1CD4114-8CDA-4751-9009-92674B541A94}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{E1CD4114-8CDA-4751-9009-92674B541A94}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{E1CD4114-8CDA-4751-9009-92674B541A94}.Release|Win32.ActiveCfg = Release|Win32
+		{E1CD4114-8CDA-4751-9009-92674B541A94}.Release|Win32.Build.0 = Release|Win32
+		{E1CD4114-8CDA-4751-9009-92674B541A94}.Release|x86.ActiveCfg = Release|Win32
+		{E1CD4114-8CDA-4751-9009-92674B541A94}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/CK2ToEU3-VS2013.vcxproj b/CK2ToEU3-VS2013.vcxproj
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E1CD4114-8CDA-4751-9009-92674B541A94}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>CK2ToEU3</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IntDir>$(SolutionDir)\DebugIntermediate\</IntDir>
+    <IncludePath>$(OTHER_INCLUDE);$(BOOST_INCLUDE);$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+    <ExcludePath>$(VC_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);</ExcludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <IntDir>$(SolutionDir)\ReleaseIntermediate\</IntDir>
+    <IncludePath>$(OTHER_INCLUDE);$(BOOST_INCLUDE);$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <ExcludePath>$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);</ExcludePath>
+    <TargetName>CK2ToEU3</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;libboost_filesystem-vc100-mt-1_46_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>Copy_Debug_Files.bat</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>Copying Data Files</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(BOOST_LIB)\system\build\msvc-12.0\release\link-static\threading-multi;$(BOOST_LIB)\filesystem\build\msvc-12.0\release\link-static\threading-multi;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>Copy_Files.bat</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>Copying Data Files</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="Source\CK2World\CK2Army.cpp" />
+    <ClCompile Include="Source\CK2World\CK2Barony.cpp" />
+    <ClCompile Include="Source\CK2World\CK2Building.cpp" />
+    <ClCompile Include="Source\CK2World\CK2Character.cpp" />
+    <ClCompile Include="Source\CK2World\CK2Dynasty.cpp" />
+    <ClCompile Include="Source\CK2World\Ck2History.cpp" />
+    <ClCompile Include="Source\CK2World\CK2Opinion.cpp" />
+    <ClCompile Include="Source\CK2World\CK2Province.cpp" />
+    <ClCompile Include="Source\CK2World\CK2Religion.cpp" />
+    <ClCompile Include="Source\CK2World\CK2Title.cpp" />
+    <ClCompile Include="Source\CK2World\CK2Trait.cpp" />
+    <ClCompile Include="Source\CK2World\CK2Version.cpp" />
+    <ClCompile Include="Source\CK2World\CK2War.cpp" />
+    <ClCompile Include="Source\CK2World\CK2World.cpp" />
+    <ClCompile Include="Source\Configuration.cpp" />
+    <ClCompile Include="Source\Convert.cpp" />
+    <ClCompile Include="Source\Date.cpp" />
+    <ClCompile Include="Source\EU3World\EU3Advisor.cpp" />
+    <ClCompile Include="Source\EU3World\EU3Army.cpp" />
+    <ClCompile Include="Source\EU3World\EU3Country.cpp" />
+    <ClCompile Include="Source\EU3World\EU3Diplomacy.cpp" />
+    <ClCompile Include="Source\EU3World\EU3History.cpp" />
+    <ClCompile Include="Source\EU3World\EU3Navy.cpp" />
+    <ClCompile Include="Source\EU3World\EU3Province.cpp" />
+    <ClCompile Include="Source\EU3World\EU3Ruler.cpp" />
+    <ClCompile Include="Source\EU3World\EU3Tech.cpp" />
+    <ClCompile Include="Source\EU3World\EU3World.cpp" />
+    <ClCompile Include="Source\Log.cpp" />
+    <ClCompile Include="Source\mappers.cpp" />
+    <ClCompile Include="Source\ModWorld\ModCultureRule.cpp" />
+    <ClCompile Include="Source\Parsers\Object.cpp" />
+    <ClCompile Include="Source\Parsers\Parser.cpp" />
+    <ClCompile Include="Source\Temp.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Source\CK2World\CK2Army.h" />
+    <ClInclude Include="Source\CK2World\CK2Barony.h" />
+    <ClInclude Include="Source\CK2World\CK2Building.h" />
+    <ClInclude Include="Source\CK2World\CK2Character.h" />
+    <ClInclude Include="Source\CK2World\CK2Dynasty.h" />
+    <ClInclude Include="Source\CK2World\CK2History.h" />
+    <ClInclude Include="Source\CK2World\CK2Opinion.h" />
+    <ClInclude Include="Source\CK2World\CK2Province.h" />
+    <ClInclude Include="Source\CK2World\CK2Religion.h" />
+    <ClInclude Include="Source\CK2World\CK2Techs.h" />
+    <ClInclude Include="Source\CK2World\CK2Title.h" />
+    <ClInclude Include="Source\CK2World\CK2Trait.h" />
+    <ClInclude Include="Source\CK2World\CK2Version.h" />
+    <ClInclude Include="Source\CK2World\CK2War.h" />
+    <ClInclude Include="Source\CK2World\CK2World.h" />
+    <ClInclude Include="Source\Configuration.h" />
+    <ClInclude Include="Source\Date.h" />
+    <ClInclude Include="Source\EU3World\EU3Advisor.h" />
+    <ClInclude Include="Source\EU3World\EU3Army.h" />
+    <ClInclude Include="Source\EU3World\EU3Country.h" />
+    <ClInclude Include="Source\EU3World\EU3Diplomacy.h" />
+    <ClInclude Include="Source\EU3World\EU3History.h" />
+    <ClInclude Include="Source\EU3World\EU3Navy.h" />
+    <ClInclude Include="Source\EU3World\EU3Province.h" />
+    <ClInclude Include="Source\EU3World\EU3Ruler.h" />
+    <ClInclude Include="Source\EU3World\EU3Tech.h" />
+    <ClInclude Include="Source\EU3World\EU3World.h" />
+    <ClInclude Include="Source\Log.h" />
+    <ClInclude Include="Source\mappers.h" />
+    <ClInclude Include="Source\ModWorld\ModCultureRule.h" />
+    <ClInclude Include="Source\Parsers\Object.h" />
+    <ClInclude Include="Source\Parsers\Parser.h" />
+    <ClInclude Include="Source\Temp.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/Data Files/Changelog.txt b/Data Files/Changelog.txt
@@ -546,4 +546,6 @@ Revision	Log Message
 521		Merge mod into main
 522		Update changelog
 523		Don't use an OS-reserved name for tags (http://msdn.microsoft.com/en-us/library/aa365247(VS.85).aspx)
-524		The parser now handles Windows-1252
+524		The parser now handles Windows-1252
+525		Add logic for finding non-Steam installations of games, and fix finding games on 32-bit windows.
+526		Add files to build for VS2013
diff --git a/build-VS2013.bat b/build-VS2013.bat
@@ -0,0 +1,22 @@
+del *.zip /q
+
+call "%VS120COMNTOOLS%\vsvars32.bat"
+
+del Release /s /q
+rmdir Release /s /q
+
+del ReleaseIntermediate /s /q
+rmdir ReleaseIntermediate /s /q
+
+del UI\bin\Release /s /q
+rmdir UI\bin\Release /s /q
+
+msbuild.exe CK2ToEU3-VS2013.sln /p:Configuration=Release /m
+copy "UI\bin\Release\Converter.UI.exe" ".\release\Converter.UI.exe"
+copy "UI\UserPreferences.xml" ".\release\UserPreferences.xml"
+copy "UI\Configuration.xml" ".\release\Configuration.xml"
+
+cd Release
+del *.pdb
+call "%SEVENZIP_LOC%\7z.exe" a -tzip -r "..\CK2ToEU3.zip" "*.*" -mx5
+cd ..
diff --git a/build_and_test-VS2013.bat b/build_and_test-VS2013.bat
@@ -0,0 +1,2 @@
+call build-VS2013.bat
+call test_all_configs.bat
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		call build-VS2013.bat
		call test_all_configs.bat