[balti] update example

fstudio · Oct 14, 2018 · edeba88 · edeba88
1 parent 97258ea
commit edeba88
Show file tree

Hide file tree

Showing 8 changed files with 294 additions and 185 deletions.
diff --git a/sources/baltic/.clang-format b/sources/baltic/.clang-format
@@ -0,0 +1,2 @@
+BasedOnStyle: LLVM
+SortIncludes: false
diff --git a/sources/baltic/balti.exe.manifest b/sources/baltic/balti.exe.manifest
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+        <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+            </windowsSettings>
+</application>
+</assembly>
diff --git a/sources/baltic/balti.rc b/sources/baltic/balti.rc
@@ -26,12 +26,12 @@ BEGIN
 BLOCK "000904b0"
 BEGIN
 VALUE "CompanyName", L"Force Charlie"
-VALUE "FileDescription", L"Balti - Clangbuilder UI for April Update"
+VALUE "FileDescription", L"Balti - Clangbuilder UI for October Update"
 VALUE "FileVersion", L"1.0.0"
 VALUE "InternalName", L"Balti.exe"
 VALUE "LegalCopyright", BALTI_COPYRIGHT
 VALUE "OriginalFilename", L"Balti.exe"
-VALUE "ProductName", L"Balti - Clangbuilder UI for April Update"
+VALUE "ProductName", L"Balti - Clangbuilder UI for October Update"
 VALUE "ProductVersion", "1.0.0"
 END
 END

diff --git a/sources/baltic/balti.vcxproj b/sources/baltic/balti.vcxproj
@@ -39,12 +39,15 @@
   <ItemGroup>
     <Image Include="balti.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="balti.exe.manifest" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{F87266B1-CADC-47CE-A0D9-84286D61949E}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Desktop</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -117,7 +120,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>windowsapp.lib;user32.lib;shcore.lib</AdditionalDependencies>
+      <AdditionalDependencies>ole32.lib;windowsapp.lib;user32.lib;shcore.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -132,7 +135,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>windowsapp.lib;user32.lib;shcore.lib</AdditionalDependencies>
+      <AdditionalDependencies>ole32.lib;windowsapp.lib;user32.lib;shcore.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -153,7 +156,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>windowsapp.lib;user32.lib;shcore.lib</AdditionalDependencies>
+      <AdditionalDependencies>ole32.lib;windowsapp.lib;user32.lib;shcore.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -174,7 +177,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>windowsapp.lib;user32.lib;shcore.lib</AdditionalDependencies>
+      <AdditionalDependencies>ole32.lib;windowsapp.lib;user32.lib;shcore.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/sources/baltic/balti.vcxproj.filters b/sources/baltic/balti.vcxproj.filters
@@ -43,4 +43,9 @@
       <Filter>resources</Filter>
     </Image>
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="balti.exe.manifest">
+      <Filter>resources</Filter>
+    </Manifest>
+  </ItemGroup>
 </Project>
diff --git a/sources/baltic/pch.h b/sources/baltic/pch.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <winrt/Windows.System.h>
-#include <winrt/Windows.UI.Composition.Desktop.h>
-#include <windows.ui.composition.interop.h>
 #include <ShellScalingAPI.h>
-#include <DispatcherQueue.h>
-
-extern "C" IMAGE_DOS_HEADER __ImageBase;
+#include <winrt/Windows.System.h>
+#include <winrt/windows.ui.xaml.hosting.h>
+#include <windows.ui.xaml.hosting.desktopwindowxamlsource.h>
+#include <winrt/windows.ui.xaml.controls.h>
+#include <winrt/Windows.UI.Xaml.Media.h>
+#include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
diff --git a/sources/baltic/visualsearch.cc b/sources/baltic/visualsearch.cc
@@ -1,14 +1,2 @@
 #include "pch.h"
 #include <string_view>
-#include <winrt/Windows.Data.Json.h>
-
-using namespace winrt;
-using namespace Windows::Data;
-using namespace Windows::Data::Json;
-
-bool VisualStudioSearch(std::wstring_view root) {
-  auto lockfile = std::wstring(root).append(
-      L"\\bin\\utils\\msvc\\VisualCppTools.lock.json");
-  auto jo = JsonObject::Parse(L"{}");
-  return true;
-}