From 224af9180660f86f6f9b0c5763be12a158405522 Mon Sep 17 00:00:00 2001 From: Akash Mozumdar Date: Sat, 21 Jul 2018 00:51:27 -0400 Subject: [PATCH] add host interoperability project, and add everything to organized build system --- .gitignore | 2 +- CMakeSettings.json | 6 +- GUI.sln | 18 ++- GUI/GUI.csproj | 26 ++++ HostInterop/AssemblyInfo.cpp | Bin 0 -> 1522 bytes HostInterop/HostInterop.cpp | Bin 0 -> 104 bytes HostInterop/HostInterop.h | Bin 0 -> 398 bytes HostInterop/HostInterop.vcxproj | 154 ++++++++++++++++++++++++ HostInterop/HostInterop.vcxproj.filters | 32 +++++ HostInterop/stdafx.cpp | Bin 0 -> 44 bytes HostInterop/stdafx.h | Bin 0 -> 30 bytes 11 files changed, 228 insertions(+), 10 deletions(-) create mode 100644 HostInterop/AssemblyInfo.cpp create mode 100644 HostInterop/HostInterop.cpp create mode 100644 HostInterop/HostInterop.h create mode 100644 HostInterop/HostInterop.vcxproj create mode 100644 HostInterop/HostInterop.vcxproj.filters create mode 100644 HostInterop/stdafx.cpp create mode 100644 HostInterop/stdafx.h diff --git a/.gitignore b/.gitignore index 1647eef..44eddfa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # Build Folders (you can keep bin if you'd like, to store dlls and pdbs) -CMakeBuilds/ +Builds/ [Bb]in/ [Oo]bj/ diff --git a/CMakeSettings.json b/CMakeSettings.json index ad46300..b7b4bdf 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -6,7 +6,7 @@ "generator": "Ninja", "configurationType": "Debug", "inheritEnvironments": [ "msvc_x86" ], - "buildRoot": "${workspaceRoot}\\CMakeBuilds\\build\\${name}", + "buildRoot": "${workspaceRoot}\\Builds\\${configurationType}", "installRoot": "${workspaceRoot}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", "cmakeCommandArgs": "", "buildCommandArgs": "-v", @@ -15,9 +15,9 @@ { "name": "x86-Release", "generator": "Ninja", - "configurationType": "MinSizeRel", + "configurationType": "Release", "inheritEnvironments": [ "msvc_x86" ], - "buildRoot": "${workspaceRoot}\\CMakeBuilds\\build\\${name}", + "buildRoot": "${workspaceRoot}\\Builds\\${configurationType}", "installRoot": "${workspaceRoot}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", "cmakeCommandArgs": "", "buildCommandArgs": "-v", diff --git a/GUI.sln b/GUI.sln index 7e2eba0..1a657a6 100644 --- a/GUI.sln +++ b/GUI.sln @@ -5,16 +5,22 @@ VisualStudioVersion = 15.0.27703.2042 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GUI", "GUI\GUI.csproj", "{D847D0DC-78F5-4722-8E06-1A124B957353}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HostInterop", "HostInterop\HostInterop.vcxproj", "{0DF42D0B-0F87-475E-9E2C-9E32776B2AD5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D847D0DC-78F5-4722-8E06-1A124B957353}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D847D0DC-78F5-4722-8E06-1A124B957353}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D847D0DC-78F5-4722-8E06-1A124B957353}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D847D0DC-78F5-4722-8E06-1A124B957353}.Release|Any CPU.Build.0 = Release|Any CPU + {D847D0DC-78F5-4722-8E06-1A124B957353}.Debug|x86.ActiveCfg = Debug|x86 + {D847D0DC-78F5-4722-8E06-1A124B957353}.Debug|x86.Build.0 = Debug|x86 + {D847D0DC-78F5-4722-8E06-1A124B957353}.Release|x86.ActiveCfg = Release|x86 + {D847D0DC-78F5-4722-8E06-1A124B957353}.Release|x86.Build.0 = Release|x86 + {0DF42D0B-0F87-475E-9E2C-9E32776B2AD5}.Debug|x86.ActiveCfg = Debug|Win32 + {0DF42D0B-0F87-475E-9E2C-9E32776B2AD5}.Debug|x86.Build.0 = Debug|Win32 + {0DF42D0B-0F87-475E-9E2C-9E32776B2AD5}.Release|x86.ActiveCfg = Release|Win32 + {0DF42D0B-0F87-475E-9E2C-9E32776B2AD5}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/GUI/GUI.csproj b/GUI/GUI.csproj index 2acd95c..3a00a0d 100644 --- a/GUI/GUI.csproj +++ b/GUI/GUI.csproj @@ -31,6 +31,26 @@ prompt 4 + + true + ..\Builds\Debug\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + true + + + ..\Builds\Release\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + true + @@ -75,5 +95,11 @@ + + + {0df42d0b-0f87-475e-9e2c-9e32776b2ad5} + HostInterop + + \ No newline at end of file diff --git a/HostInterop/AssemblyInfo.cpp b/HostInterop/AssemblyInfo.cpp new file mode 100644 index 0000000000000000000000000000000000000000..c11d2a380dab0f8e6378793ffd7c02d711668133 GIT binary patch literal 1522 zcmcJPPfNp45X9#!_#H~UsE4ASq@GGWDD+Tl=|w!GF|EO-3Hc-T%d5YAQE1c$jZ{J* z-MpRIo!NcwZ%2x?R;ZOKJt|U1T@@;M546y$dU_&qr~~(__-5yqoLh4uA)`>nTj+8p z+PLh9FITNI`s(WroCVcHAeL~Y@cb32BG)jiO2Zz4mQZc%@N-Rw=X&A4RbT9l=hpEW zb_&~mSPUh^qnv6>RJMM`uKt8b!BcDX)rC2Bk1zJc+?dm|WevVXrVh{a9)Mdq{5d=& zkzFwg@$qus+;&_MWLT5VHC6m!^0;bLvyJHem z%=PT$Z;L!czZLzM^Zq&BM%{HgX5i(_t$$j(XwgHFo=zKz_!#OtXa=I8+E&`0El^}d bB-+x{k1*m+sc|y0VmFh&yJ`DeHBdhQ4(<<7 literal 0 HcmV?d00001 diff --git a/HostInterop/HostInterop.cpp b/HostInterop/HostInterop.cpp new file mode 100644 index 0000000000000000000000000000000000000000..bef4b4090aba63c40346f1a8bc7eae63d4081c00 GIT binary patch literal 104 zcmezWPnjW;A&()MA%~%qA%!88L4iSup_rir$WCNPW2j)zW5@uC@G@|LF*em64EbOk Qo?;WdHyG literal 0 HcmV?d00001 diff --git a/HostInterop/HostInterop.h b/HostInterop/HostInterop.h new file mode 100644 index 0000000000000000000000000000000000000000..57f3e8fd73c5e0ff1445ca581813218ec8687d92 GIT binary patch literal 398 zcma)&yAFat6hx=R#DCbtMoTTFw9#6BU?ECO_R9ECKmg+_s*PweZN+! zRLd$;&TdqyP^znzT7=cA(Vbq#tU!@7Yw*~hGCJ!??dax;C)b?v2-_=9aJ;^zuAus) zF6 + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {0DF42D0B-0F87-475E-9E2C-9E32776B2AD5} + v4.6 + ManagedCProj + HostInterop + 10.0.17134.0 + + + + DynamicLibrary + true + v141 + true + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + true + v141 + true + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)\Builds\$(Configuration)\$(Configuration)\ + + + true + + + false + $(SolutionDir)\Builds\$(Configuration)\$(Configuration)\ + + + false + + + + Level3 + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + Use + + + + + + + + Level3 + Disabled + _DEBUG;%(PreprocessorDefinitions) + Use + + + + + + + + Level3 + WIN32;NDEBUG;%(PreprocessorDefinitions) + Use + + + + + + + + Level3 + NDEBUG;%(PreprocessorDefinitions) + Use + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + \ No newline at end of file diff --git a/HostInterop/HostInterop.vcxproj.filters b/HostInterop/HostInterop.vcxproj.filters new file mode 100644 index 0000000..a76d3b0 --- /dev/null +++ b/HostInterop/HostInterop.vcxproj.filters @@ -0,0 +1,32 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/HostInterop/stdafx.cpp b/HostInterop/stdafx.cpp new file mode 100644 index 0000000000000000000000000000000000000000..08343afdf790eaa4524432ba7b0c3ddc395ee814 GIT binary patch literal 44 xcmezWPnjW;A&()MA%~%qA%!88L4iSup_rir$WCNPW2j)zW5@uC@G@{Q008!y2%rD} literal 0 HcmV?d00001 diff --git a/HostInterop/stdafx.h b/HostInterop/stdafx.h new file mode 100644 index 0000000000000000000000000000000000000000..866b7f5b647af399e28ddfc986dce977754dd671 GIT binary patch literal 30 kcmezWPnn^Bp@<=oA)O%?NGdSoGvqNOGo&)`GH@{f0E5H^bpQYW literal 0 HcmV?d00001