From 4aa9b09e4491e6e65d34b935729260052bb31675 Mon Sep 17 00:00:00 2001 From: idhrendur Date: Wed, 27 Nov 2013 12:12:44 -0800 Subject: [PATCH] Add files to build for VS2013 --- CK2ToEU3-VS2013.sln | 46 ++++++++++ CK2ToEU3-VS2013.vcxproj | 173 ++++++++++++++++++++++++++++++++++++++ Data Files/Changelog.txt | 4 +- build-VS2013.bat | 22 +++++ build_and_test-VS2013.bat | 2 + 5 files changed, 246 insertions(+), 1 deletion(-) create mode 100644 CK2ToEU3-VS2013.sln create mode 100644 CK2ToEU3-VS2013.vcxproj create mode 100644 build-VS2013.bat create mode 100644 build_and_test-VS2013.bat diff --git a/CK2ToEU3-VS2013.sln b/CK2ToEU3-VS2013.sln new file mode 100644 index 000000000..de1a85ceb --- /dev/null +++ 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 new file mode 100644 index 000000000..1469e151d --- /dev/null +++ b/CK2ToEU3-VS2013.vcxproj @@ -0,0 +1,173 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {E1CD4114-8CDA-4751-9009-92674B541A94} + Win32Proj + CK2ToEU3 + + + + Application + true + MultiByte + v120 + + + Application + false + true + NotSet + v120 + + + + + + + + + + + + + true + $(SolutionDir)\DebugIntermediate\ + $(OTHER_INCLUDE);$(BOOST_INCLUDE);$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath) + $(VC_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86); + + + false + $(SolutionDir)\ReleaseIntermediate\ + $(OTHER_INCLUDE);$(BOOST_INCLUDE);$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(VC_IncludePath);$(WindowsSDK_IncludePath); + $(MSBuild_ExecutablePath);$(VC_LibraryPath_x86); + CK2ToEU3 + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + 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) + + + Copy_Debug_Files.bat + + + Copying Data Files + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + 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) + $(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) + + + Copy_Files.bat + + + Copying Data Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Data Files/Changelog.txt b/Data Files/Changelog.txt index c5e119cab..9dfa08b2c 100644 --- 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 \ No newline at end of file +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 \ No newline at end of file diff --git a/build-VS2013.bat b/build-VS2013.bat new file mode 100644 index 000000000..62e5c64d9 --- /dev/null +++ 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 .. \ No newline at end of file diff --git a/build_and_test-VS2013.bat b/build_and_test-VS2013.bat new file mode 100644 index 000000000..f5db045e4 --- /dev/null +++ b/build_and_test-VS2013.bat @@ -0,0 +1,2 @@ +call build-VS2013.bat +call test_all_configs.bat \ No newline at end of file