Skip to content

Commit

Permalink
Add missing Xcode projects to samples (#1659)
Browse files Browse the repository at this point in the history
* Add missing xcode projects to the sample apps.

* Add relative paths
  • Loading branch information
MSFTFox authored Jan 11, 2017
1 parent 1db8c66 commit f180096
Show file tree
Hide file tree
Showing 53 changed files with 2,212 additions and 1,049 deletions.
37 changes: 16 additions & 21 deletions samples/GLKitComplex/GLKitComplex-WinStore10.sln
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
VisualStudioVersion = 14.0.22823.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GLKitComplex", "GLKitComplex", "{FEDCB98A-0A88-49DB-8615-A60BD4DD02B9}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GLKitComplex", "GLKitComplex", "{45F79AFE-6302-462D-A3E5-8C903EC35E31}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLKitComplex-Headers", "GLKitComplex.vsimporter\GLKitComplex-Headers-WinStore10\GLKitComplex-Headers.vcxitems", "{421E6DD1-BA60-48B0-91A4-7435F30B6599}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLKitComplex", "GLKitComplex.vsimporter\GLKitComplex-WinStore10\GLKitComplex.vcxproj", "{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLKitComplex", "GLKitComplex.vsimporter\GLKitComplex-WinStore10\GLKitComplex.vcxproj", "{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
GLKitComplex.vsimporter\GLKitComplex-Headers-WinStore10\GLKitComplex-Headers.vcxitems*{421e6dd1-ba60-48b0-91a4-7435f30b6599}*SharedItemsImports = 9
GLKitComplex.vsimporter\GLKitComplex-Headers-WinStore10\GLKitComplex-Headers.vcxitems*{c23d3f93-ef0a-4090-9e65-2d2e4e0cdcb6}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Expand All @@ -20,24 +16,23 @@ Global
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6}.Debug|ARM.ActiveCfg = Debug|ARM
{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6}.Debug|ARM.Build.0 = Debug|ARM
{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6}.Debug|ARM.Deploy.0 = Debug|ARM
{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6}.Debug|Win32.ActiveCfg = Debug|Win32
{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6}.Debug|Win32.Build.0 = Debug|Win32
{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6}.Debug|Win32.Deploy.0 = Debug|Win32
{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6}.Release|ARM.ActiveCfg = Release|ARM
{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6}.Release|ARM.Build.0 = Release|ARM
{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6}.Release|ARM.Deploy.0 = Release|ARM
{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6}.Release|Win32.ActiveCfg = Release|Win32
{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6}.Release|Win32.Build.0 = Release|Win32
{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6}.Release|Win32.Deploy.0 = Release|Win32
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|ARM.ActiveCfg = Debug|ARM
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|ARM.Build.0 = Debug|ARM
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|ARM.Deploy.0 = Debug|ARM
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|Win32.ActiveCfg = Debug|Win32
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|Win32.Build.0 = Debug|Win32
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|Win32.Deploy.0 = Debug|Win32
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|ARM.ActiveCfg = Release|ARM
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|ARM.Build.0 = Release|ARM
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|ARM.Deploy.0 = Release|ARM
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|Win32.ActiveCfg = Release|Win32
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|Win32.Build.0 = Release|Win32
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|Win32.Deploy.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{421E6DD1-BA60-48B0-91A4-7435F30B6599} = {FEDCB98A-0A88-49DB-8615-A60BD4DD02B9}
{C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6} = {FEDCB98A-0A88-49DB-8615-A60BD4DD02B9}
{E45BBE1B-1E64-4C3C-9D81-433F9AB81749} = {45F79AFE-6302-462D-A3E5-8C903EC35E31}
EndGlobalSection
EndGlobal

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Application
x:Class="GLKitComplex.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:GLKitComplex"
RequestedTheme="Light">

</Application>
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
//
// App.xaml.cpp
// Implementation of the App class.
//

// clang-format off

#include "pch.h"

using namespace GLKitComplex;

using namespace Platform;
using namespace Windows::ApplicationModel;
using namespace Windows::ApplicationModel::Activation;
using namespace Windows::Foundation;
using namespace Windows::Foundation::Collections;
using namespace Windows::UI::Xaml;
using namespace Windows::UI::Xaml::Controls;
using namespace Windows::UI::Xaml::Controls::Primitives;
using namespace Windows::UI::Xaml::Data;
using namespace Windows::UI::Xaml::Input;
using namespace Windows::UI::Xaml::Interop;
using namespace Windows::UI::Xaml::Media;
using namespace Windows::UI::Xaml::Navigation;

/// <summary>
/// Initializes the singleton application object. This is the first line of authored code
/// executed, and as such is the logical equivalent of main() or WinMain().
/// </summary>
App::App() {
InitializeComponent();
Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending);
}

extern "C" int main(int argc, char* argv[]);
extern "C" void UIApplicationActivated(Windows::ApplicationModel::Activation::IActivatedEventArgs^ e);
extern "C" void UIApplicationLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e);
#ifdef ENABLE_BACKGROUND_TASK
extern "C" void UIApplicationBackgroundActivated(Windows::ApplicationModel::Activation::BackgroundActivatedEventArgs^ e);
#endif

/// <summary>
/// Invoked when the application is launched normally by the end user. Other entry points
/// will be used such as when the application is launched to open a specific file.
/// </summary>
/// <param name="e">Details about the launch request and process.</param>
void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e) {
main(0, NULL);
UIApplicationLaunched(e);
}

void App::OnActivated(Windows::ApplicationModel::Activation::IActivatedEventArgs^ e) {
main(0, NULL);
UIApplicationActivated(e);
}

void App::OnFileActivated(FileActivatedEventArgs^ args)
{
main(0, NULL);
UIApplicationActivated(args);
}

#ifdef ENABLE_BACKGROUND_TASK
void App::OnBackgroundActivated(Windows::ApplicationModel::Activation::BackgroundActivatedEventArgs^ e) {
__super ::OnBackgroundActivated(e);
UIApplicationBackgroundActivated(e);
}
#endif

/// <summary>
/// Invoked when application execution is being suspended. Application state is saved
/// without knowing whether the application will be terminated or resumed with the contents
/// of memory still intact.
/// </summary>
/// <param name="sender">The source of the suspend request.</param>
/// <param name="e">Details about the suspend request.</param>
void App::OnSuspending(Object^ /*sender*/, SuspendingEventArgs^ /*e*/) {
// TODO: Save application state and stop any background activity
}

/// <summary>
/// Invoked when Navigation to a certain page fails
/// </summary>
/// <param name="sender">The Frame which failed navigation</param>
/// <param name="e">Details about the navigation failure</param>
void App::OnNavigationFailed(Platform::Object^ sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs^ e) {
throw ref new FailureException("Failed to load Page " + e->SourcePageType.Name);
}

// clang-format on
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
//
// App.xaml.h
// Declaration of the App class.
//

// clang-format off
#pragma once

#include "App.g.h"

namespace GLKitComplex {
/// <summary>
/// Provides application-specific behavior to supplement the default Application class.
/// </summary>
ref class App sealed {
protected:
virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e) override;
virtual void OnActivated(Windows::ApplicationModel::Activation::IActivatedEventArgs^ e) override;
#ifdef ENABLE_BACKGROUND_TASK
virtual void OnBackgroundActivated(Windows::ApplicationModel::Activation::BackgroundActivatedEventArgs^ e) override;
#endif

void OnFileActivated(Windows::ApplicationModel::Activation::FileActivatedEventArgs^ args) override;

internal : App();

private:
void OnSuspending(Platform::Object ^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e);
void OnNavigationFailed(Platform::Object ^ sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs^ e);
};
}

// clang-format on
Loading

0 comments on commit f180096

Please sign in to comment.