diff --git a/samples/GLKitComplex/GLKitComplex-WinStore10.sln b/samples/GLKitComplex/GLKitComplex-WinStore10.sln index d48a77f134..57c4e16503 100644 --- a/samples/GLKitComplex/GLKitComplex-WinStore10.sln +++ b/samples/GLKitComplex/GLKitComplex-WinStore10.sln @@ -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 @@ -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 diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-Headers-WinStore10/GLKitComplex-Headers.vcxitems b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-Headers-WinStore10/GLKitComplex-Headers.vcxitems deleted file mode 100644 index 94102762ad..0000000000 --- a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-Headers-WinStore10/GLKitComplex-Headers.vcxitems +++ /dev/null @@ -1,17 +0,0 @@ - - - - true - GLKitComplex_Headers - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - {421E6DD1-BA60-48B0-91A4-7435F30B6599} - {E1DD126A-D6F8-437C-A3F4-BBFBC1E7EDDD} - - - - - - - - - diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-Headers-WinStore10/GLKitComplex-Headers.vcxitems.filters b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-Headers-WinStore10/GLKitComplex-Headers.vcxitems.filters deleted file mode 100644 index 747b2b5655..0000000000 --- a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-Headers-WinStore10/GLKitComplex-Headers.vcxitems.filters +++ /dev/null @@ -1,16 +0,0 @@ - - - - - {A0368538-016E-4EB3-B50F-8E5B7837663B} - - - - - GLKitComplex - - - GLKitComplex - - - diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/App.xaml b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/App.xaml new file mode 100644 index 0000000000..d3863e9923 --- /dev/null +++ b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/App.xaml @@ -0,0 +1,8 @@ + + + diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/App.xaml.cpp b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/App.xaml.cpp new file mode 100644 index 0000000000..c0a4c49b23 --- /dev/null +++ b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/App.xaml.cpp @@ -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; + +/// +/// 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(). +/// +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 + +/// +/// 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. +/// +/// Details about the launch request and process. +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 + +/// +/// 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. +/// +/// The source of the suspend request. +/// Details about the suspend request. +void App::OnSuspending(Object^ /*sender*/, SuspendingEventArgs^ /*e*/) { + // TODO: Save application state and stop any background activity +} + +/// +/// Invoked when Navigation to a certain page fails +/// +/// The Frame which failed navigation +/// Details about the navigation failure +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 diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/App.xaml.h b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/App.xaml.h new file mode 100644 index 0000000000..3e01b9e64e --- /dev/null +++ b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/App.xaml.h @@ -0,0 +1,33 @@ +// +// App.xaml.h +// Declaration of the App class. +// + +// clang-format off +#pragma once + +#include "App.g.h" + +namespace GLKitComplex { +/// +/// Provides application-specific behavior to supplement the default Application class. +/// +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 diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Debug-xcvars.txt b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Debug-xcvars.txt index 887d401abc..320d0a9109 100644 --- a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Debug-xcvars.txt +++ b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Debug-xcvars.txt @@ -1,6 +1,4 @@ -ALLUSERSPROFILE = C:\ProgramData ALWAYS_SEARCH_USER_PATHS = NO -APPDATA = C:\Users\brianker.REDMOND\AppData\Roaming APPFOLDER = sbuild/Debug-iphoneos/GLKitComplex.app ARCHS = msvc ARCHS_STANDARD = armv6 @@ -10,6 +8,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = BUILD_DIR = sbuild BUILT_PRODUCTS_DIR = sbuild/Debug-iphoneos +CLANG_ANALYZER_NONNULL = YES CLANG_CXX_LANGUAGE_STANDARD = gnu++0x CLANG_CXX_LIBRARY = libc++ CLANG_ENABLE_MODULES = YES @@ -17,48 +16,36 @@ CLANG_ENABLE_OBJC_ARC = YES CLANG_WARN_BOOL_CONVERSION = YES CLANG_WARN_CONSTANT_CONVERSION = YES CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN_DOCUMENTATION_COMMENTS = YES CLANG_WARN_EMPTY_BODY = YES CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES CLANG_WARN_INT_CONVERSION = YES CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_SUSPICIOUS_MOVES = YES CLANG_WARN_UNREACHABLE_CODE = YES CLANG_WARN__DUPLICATE_METHOD_MATCH = YES CODESIGNING_FOLDER_PATH = sbuild/Debug-iphoneos/GLKitComplex.app CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer -COMPUTERNAME = TRANQUIL CONFIGURATION = Debug CONFIGURATION_BUILD_DIR = sbuild/Debug-iphoneos CONFIGURATION_TEMP_DIR = sbuild/GLKitComplex.sbuild/Debug-iphoneos COPY_PHASE_STRIP = NO CURRENT_ARCH = msvc -CYGWIN = nodosfilewarning -ComSpec = C:\Windows\system32\cmd.exe -CommonProgramFiles = C:\Program Files (x86)\Common Files -CommonProgramFiles(x86) = C:\Program Files (x86)\Common Files -CommonProgramW6432 = C:\Program Files\Common Files DEAD_CODE_STRIPPING = YES -DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +DEBUG_INFORMATION_FORMAT = dwarf DERIVED_FILES_DIR = sbuild/GLKitComplex.sbuild/Debug-iphoneos/GLKitComplex.sbuild/DerivedSources DERIVED_FILE_DIR = sbuild/GLKitComplex.sbuild/Debug-iphoneos/GLKitComplex.sbuild/DerivedSources DERIVED_SOURCES_DIR = sbuild/GLKitComplex.sbuild/Debug-iphoneos/GLKitComplex.sbuild/DerivedSources -DNX_HOME = %USERPROFILE%\.dnx -DevEnvDir = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\ EFFECTIVE_PLATFORM_NAME = -iphoneos ENABLE_STRICT_OBJC_MSGSEND = YES ENABLE_TESTABILITY = YES -EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = *.nib *.lproj *.framework *.gch (*) .DS_Store CVS .svn .git .hg *.xcodeproj *.xcode *.pbproj *.pbxproj +EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = *.nib *.lproj *.framework *.gch (*) .DS_Store CVS .svn .git .hg *.xcodeproj *.xcode *.pbproj *.pbxproj *.xcassets EXECUTABLE_FOLDER_PATH = GLKitComplex.app EXECUTABLE_NAME = GLKitComplex EXECUTABLE_PATH = GLKitComplex.app/GLKitComplex -ExtensionSdkDir = C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs FRAMEWORK_SEARCH_PATHS = -FSHARPINSTALLDIR = C:\Program Files (x86)\Microsoft SDKs\F#\4.0\Framework\v4.0\ FULL_PRODUCT_NAME = GLKitComplex.app -Framework40Version = v4.0 -FrameworkDIR32 = C:\Windows\Microsoft.NET\Framework\ -FrameworkDir = C:\Windows\Microsoft.NET\Framework\ -FrameworkVersion = v4.0.30319 -FrameworkVersion32 = v4.0.30319 GCC_C_LANGUAGE_STANDARD = gnu99 GCC_DYNAMIC_NO_PIC = NO GCC_NO_COMMON_BLOCKS = YES @@ -78,106 +65,49 @@ HEADERMAP_INCLUDES_FLAT_ENTRIES_FOR_TARGET_BEING_BUILT = YES HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = YES HEADERMAP_INCLUDES_PROJECT_HEADERS = YES HEADER_SEARCH_PATHS = -HOME = C:\Users\brianker.REDMOND -HOMEDRIVE = C: -HOMEPATH = \Users\brianker.REDMOND -INCLUDE = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\ucrt;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\include\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\winrt; INFOPLIST_FILE = GLKitComplex/Info.plist INFOPLIST_PATH = GLKitComplex.app/Info.plist -IPHONEOS_DEPLOYMENT_TARGET = 9.0 +IPHONEOS_DEPLOYMENT_TARGET = 10.0 LD_NO_PIE = NO LD_RUNPATH_SEARCH_PATHS = @executable_path/Frameworks -LIB = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10586.0\ucrt\x86;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\lib\um\x86;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10586.0\um\x86; -LIBPATH = C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\UnionMetadata;C:\Program Files (x86)\Windows Kits\10\References;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.FoundationContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\indows.Networking.Connectivity.WwanContract\1.0.0.0;C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral; LIBRARY_SEARCH_PATHS = LINK_FILE_LIST = sbuild/GLKitComplex.sbuild/Debug-iphoneos/GLKitComplex.sbuild/Objects/msvc/GLKitComplex.LinkFileList LINK_WITH_STANDARD_LIBRARIES = NO -LOCALAPPDATA = C:\Users\brianker.REDMOND\AppData\Local LOCALIZED_RESOURCES_FOLDER_PATH = GLKitComplex.app/English.lproj -LOGONSERVER = \\TK5-RED-DC-08 MTL_ENABLE_DEBUG_INFO = YES -NETFXSDKDir = C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\ -NUMBER_OF_PROCESSORS = 8 OBJECT_FILE_DIR = sbuild/GLKitComplex.sbuild/Debug-iphoneos/GLKitComplex.sbuild/Objects/msvc OBJROOT = sbuild ONLY_ACTIVE_ARCH = YES -OS = Windows_NT OTHER_CFLAGS = OTHER_CPLUSPLUSFLAGS = OTHER_LDFLAGS = -PATHEXT = .COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC PLATFORM_NAME = iphoneos PRIVATE_HEADERS_FOLDER_PATH = GLKitComplex.app/Private -PROCESSOR_ARCHITECTURE = x86 -PROCESSOR_ARCHITEW6432 = AMD64 -PROCESSOR_IDENTIFIER = Intel64 Family 6 Model 45 Stepping 7, GenuineIntel -PROCESSOR_LEVEL = 6 -PROCESSOR_REVISION = 2d07 -PRODUCT_BUNDLE_IDENTIFIER = com.Microsoft.GLKitComplex +PRODUCT_BUNDLE_IDENTIFIER = test.GLKitComplex PRODUCT_NAME = GLKitComplex PRODUCT_TYPE = com.apple.product-type.application PROJECT = GLKitComplex -PROJECT_DIR = D:/WinObjC/samples/GLKitComplex -PROJECT_FILE_PATH = D:\WinObjC\samples\GLKitComplex\GLKitComplex.xcodeproj +PROJECT_DIR = E:/island/github/henryfox/WinObjC/samples/GLKitComplex +PROJECT_FILE_PATH = E:\island\github\henryfox\WinObjC\samples\GLKitComplex\GLKitComplex.xcodeproj PROJECT_NAME = GLKitComplex PROJECT_TEMP_DIR = sbuild/GLKitComplex.sbuild PROJECT_TEMP_ROOT = sbuild -PROMPT = $P$G -PSModulePath = C:\Program Files\WindowsPowerShell\Modules;C:\Windows\system32\WindowsPowerShell\v1.0\Modules -PUBLIC = C:\Users\Public PUBLIC_HEADERS_FOLDER_PATH = GLKitComplex.app/Public -Path = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\4.0\Framework\v4.0\;C:\Program Files (x86)\MSBuild\14.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\ATI Technologies\ATI.ACE\Core-Static;C:\Users\brianker.REDMOND\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\bin;c:\bin\bin;C:\bin\emacs-24.4\bin;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Program Files (x86)\Git\bin;D:\WinObjC\bin;C:\Users\brianker.REDMOND\.dnx\bin -ProgramData = C:\ProgramData -ProgramFiles = C:\Program Files (x86) -ProgramFiles(x86) = C:\Program Files (x86) -ProgramW6432 = C:\Program Files -SDKROOT = D:\WinObjC\bin/.. -SESSIONNAME = Console -SOURCE_ROOT = D:/WinObjC/samples/GLKitComplex -SRCROOT = D:/WinObjC/samples/GLKitComplex +SDKROOT = E:/island/github/henryfox/WinObjC +SOURCE_ROOT = E:/island/github/henryfox/WinObjC/samples/GLKitComplex +SRCROOT = E:/island/github/henryfox/WinObjC/samples/GLKitComplex SYMROOT = sbuild -SYSTEMTYPE = other -SystemDrive = C: -SystemRoot = C:\Windows +TARGETED_DEVICE_FAMILY = 1,2 TARGETNAME = GLKitComplex TARGET_BUILD_DIR = sbuild/Debug-iphoneos TARGET_NAME = GLKitComplex TARGET_SDKVERSION = 5.0 TARGET_TEMP_DIR = sbuild/GLKitComplex.sbuild/Debug-iphoneos/GLKitComplex.sbuild -TEMP = C:\Users\BRIANK~1.RED\AppData\Local\Temp TEMP_DIR = sbuild/GLKitComplex.sbuild/Debug-iphoneos/GLKitComplex.sbuild -TMP = C:\Users\BRIANK~1.RED\AppData\Local\Temp -UATDATA = C:\Windows\CCM\UATData\D9F8C395-CAB8-491d-B8AC-179A1FE1BE77 -UCRTVersion = 10.0.10586.0 UNLOCALIZED_RESOURCES_FOLDER_PATH = GLKitComplex.app -USER = brianker -USERDNSDOMAIN = REDMOND.CORP.MICROSOFT.COM -USERDOMAIN = REDMOND -USERDOMAIN_ROAMINGPROFILE = REDMOND -USERNAME = brianker -USERPROFILE = C:\Users\brianker.REDMOND +USER = henryfox USER_HEADER_SEARCH_PATHS = USE_HEADERMAP = YES -UniversalCRTSdkDir = C:\Program Files (x86)\Windows Kits\10\ -VCINSTALLDIR = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ -VS110COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\ -VS120COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\ -VS140COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\ -VSIMPORTER_BINARY_DIR = D:\WinObjC\bin -VSIMPORTER_INTERACTIVE = NO -VSIMPORTER_OUTPUT_DIR = D:\WinObjC\samples\GLKitComplex//GLKitComplex.vsimporter -VSIMPORTER_OUTPUT_FORMAT = WinStore10 -VSIMPORTER_TEMPLATES_DIR = D:\WinObjC\bin/../msvc/vsimporter-templates -VSINSTALLDIR = C:\Program Files (x86)\Microsoft Visual Studio 14.0\ -VSSDK140Install = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\ -VisualStudioVersion = 14.0 WARNING_CFLAGS = WARNING_LDFLAGS = -WINOBJC_SDK_ROOT = D:\WinObjC\bin/.. -WindowsLibPath = C:\Program Files (x86)\Windows Kits\10\UnionMetadata;C:\Program Files (x86)\Windows Kits\10\References;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.FoundationContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\indows.Networking.Connectivity.WwanContract\1.0.0.0 -WindowsSDKLibVersion = 10.0.10586.0\ -WindowsSDKVersion = 10.0.10586.0\ -WindowsSDK_ExecutablePath_x64 = C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\x64\ -WindowsSDK_ExecutablePath_x86 = C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\ -WindowsSdkDir = C:\Program Files (x86)\Windows Kits\10\ -windir = C:\Windows +WINOBJC_SDK_ROOT = E:/island/github/henryfox/WinObjC diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Release-xcvars.txt b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Release-xcvars.txt index 87582f7aae..7e179b15bc 100644 --- a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Release-xcvars.txt +++ b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex-Release-xcvars.txt @@ -1,6 +1,4 @@ -ALLUSERSPROFILE = C:\ProgramData ALWAYS_SEARCH_USER_PATHS = NO -APPDATA = C:\Users\brianker.REDMOND\AppData\Roaming APPFOLDER = sbuild/Release-iphoneos/GLKitComplex.app ARCHS = msvc ARCHS_STANDARD = armv6 @@ -10,6 +8,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = BUILD_DIR = sbuild BUILT_PRODUCTS_DIR = sbuild/Release-iphoneos +CLANG_ANALYZER_NONNULL = YES CLANG_CXX_LANGUAGE_STANDARD = gnu++0x CLANG_CXX_LIBRARY = libc++ CLANG_ENABLE_MODULES = YES @@ -17,48 +16,36 @@ CLANG_ENABLE_OBJC_ARC = YES CLANG_WARN_BOOL_CONVERSION = YES CLANG_WARN_CONSTANT_CONVERSION = YES CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN_DOCUMENTATION_COMMENTS = YES CLANG_WARN_EMPTY_BODY = YES CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES CLANG_WARN_INT_CONVERSION = YES CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_SUSPICIOUS_MOVES = YES CLANG_WARN_UNREACHABLE_CODE = YES CLANG_WARN__DUPLICATE_METHOD_MATCH = YES CODESIGNING_FOLDER_PATH = sbuild/Release-iphoneos/GLKitComplex.app CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer -COMPUTERNAME = TRANQUIL CONFIGURATION = Release CONFIGURATION_BUILD_DIR = sbuild/Release-iphoneos CONFIGURATION_TEMP_DIR = sbuild/GLKitComplex.sbuild/Release-iphoneos COPY_PHASE_STRIP = NO CURRENT_ARCH = msvc -CYGWIN = nodosfilewarning -ComSpec = C:\Windows\system32\cmd.exe -CommonProgramFiles = C:\Program Files (x86)\Common Files -CommonProgramFiles(x86) = C:\Program Files (x86)\Common Files -CommonProgramW6432 = C:\Program Files\Common Files DEAD_CODE_STRIPPING = YES DEBUG_INFORMATION_FORMAT = dwarf-with-dsym DERIVED_FILES_DIR = sbuild/GLKitComplex.sbuild/Release-iphoneos/GLKitComplex.sbuild/DerivedSources DERIVED_FILE_DIR = sbuild/GLKitComplex.sbuild/Release-iphoneos/GLKitComplex.sbuild/DerivedSources DERIVED_SOURCES_DIR = sbuild/GLKitComplex.sbuild/Release-iphoneos/GLKitComplex.sbuild/DerivedSources -DNX_HOME = %USERPROFILE%\.dnx -DevEnvDir = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\ EFFECTIVE_PLATFORM_NAME = -iphoneos ENABLE_NS_ASSERTIONS = NO ENABLE_STRICT_OBJC_MSGSEND = YES -EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = *.nib *.lproj *.framework *.gch (*) .DS_Store CVS .svn .git .hg *.xcodeproj *.xcode *.pbproj *.pbxproj +EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = *.nib *.lproj *.framework *.gch (*) .DS_Store CVS .svn .git .hg *.xcodeproj *.xcode *.pbproj *.pbxproj *.xcassets EXECUTABLE_FOLDER_PATH = GLKitComplex.app EXECUTABLE_NAME = GLKitComplex EXECUTABLE_PATH = GLKitComplex.app/GLKitComplex -ExtensionSdkDir = C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs FRAMEWORK_SEARCH_PATHS = -FSHARPINSTALLDIR = C:\Program Files (x86)\Microsoft SDKs\F#\4.0\Framework\v4.0\ FULL_PRODUCT_NAME = GLKitComplex.app -Framework40Version = v4.0 -FrameworkDIR32 = C:\Windows\Microsoft.NET\Framework\ -FrameworkDir = C:\Windows\Microsoft.NET\Framework\ -FrameworkVersion = v4.0.30319 -FrameworkVersion32 = v4.0.30319 GCC_C_LANGUAGE_STANDARD = gnu99 GCC_DYNAMIC_NO_PIC = NO GCC_NO_COMMON_BLOCKS = YES @@ -78,106 +65,49 @@ HEADERMAP_INCLUDES_FLAT_ENTRIES_FOR_TARGET_BEING_BUILT = YES HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = YES HEADERMAP_INCLUDES_PROJECT_HEADERS = YES HEADER_SEARCH_PATHS = -HOME = C:\Users\brianker.REDMOND -HOMEDRIVE = C: -HOMEPATH = \Users\brianker.REDMOND -INCLUDE = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\ucrt;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\include\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\winrt; INFOPLIST_FILE = GLKitComplex/Info.plist INFOPLIST_PATH = GLKitComplex.app/Info.plist -IPHONEOS_DEPLOYMENT_TARGET = 9.0 +IPHONEOS_DEPLOYMENT_TARGET = 10.0 LD_NO_PIE = NO LD_RUNPATH_SEARCH_PATHS = @executable_path/Frameworks -LIB = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10586.0\ucrt\x86;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\lib\um\x86;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10586.0\um\x86; -LIBPATH = C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\UnionMetadata;C:\Program Files (x86)\Windows Kits\10\References;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.FoundationContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\indows.Networking.Connectivity.WwanContract\1.0.0.0;C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral; LIBRARY_SEARCH_PATHS = LINK_FILE_LIST = sbuild/GLKitComplex.sbuild/Release-iphoneos/GLKitComplex.sbuild/Objects/msvc/GLKitComplex.LinkFileList LINK_WITH_STANDARD_LIBRARIES = NO -LOCALAPPDATA = C:\Users\brianker.REDMOND\AppData\Local LOCALIZED_RESOURCES_FOLDER_PATH = GLKitComplex.app/English.lproj -LOGONSERVER = \\TK5-RED-DC-08 MTL_ENABLE_DEBUG_INFO = NO -NETFXSDKDir = C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\ -NUMBER_OF_PROCESSORS = 8 OBJECT_FILE_DIR = sbuild/GLKitComplex.sbuild/Release-iphoneos/GLKitComplex.sbuild/Objects/msvc OBJROOT = sbuild -OS = Windows_NT OTHER_CFLAGS = OTHER_CPLUSPLUSFLAGS = OTHER_LDFLAGS = -PATHEXT = .COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC PLATFORM_NAME = iphoneos PRIVATE_HEADERS_FOLDER_PATH = GLKitComplex.app/Private -PROCESSOR_ARCHITECTURE = x86 -PROCESSOR_ARCHITEW6432 = AMD64 -PROCESSOR_IDENTIFIER = Intel64 Family 6 Model 45 Stepping 7, GenuineIntel -PROCESSOR_LEVEL = 6 -PROCESSOR_REVISION = 2d07 -PRODUCT_BUNDLE_IDENTIFIER = com.Microsoft.GLKitComplex +PRODUCT_BUNDLE_IDENTIFIER = test.GLKitComplex PRODUCT_NAME = GLKitComplex PRODUCT_TYPE = com.apple.product-type.application PROJECT = GLKitComplex -PROJECT_DIR = D:/WinObjC/samples/GLKitComplex -PROJECT_FILE_PATH = D:\WinObjC\samples\GLKitComplex\GLKitComplex.xcodeproj +PROJECT_DIR = E:/island/github/henryfox/WinObjC/samples/GLKitComplex +PROJECT_FILE_PATH = E:\island\github\henryfox\WinObjC\samples\GLKitComplex\GLKitComplex.xcodeproj PROJECT_NAME = GLKitComplex PROJECT_TEMP_DIR = sbuild/GLKitComplex.sbuild PROJECT_TEMP_ROOT = sbuild -PROMPT = $P$G -PSModulePath = C:\Program Files\WindowsPowerShell\Modules;C:\Windows\system32\WindowsPowerShell\v1.0\Modules -PUBLIC = C:\Users\Public PUBLIC_HEADERS_FOLDER_PATH = GLKitComplex.app/Public -Path = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\4.0\Framework\v4.0\;C:\Program Files (x86)\MSBuild\14.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\ATI Technologies\ATI.ACE\Core-Static;C:\Users\brianker.REDMOND\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\bin;c:\bin\bin;C:\bin\emacs-24.4\bin;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Program Files (x86)\Git\bin;D:\WinObjC\bin;C:\Users\brianker.REDMOND\.dnx\bin -ProgramData = C:\ProgramData -ProgramFiles = C:\Program Files (x86) -ProgramFiles(x86) = C:\Program Files (x86) -ProgramW6432 = C:\Program Files -SDKROOT = D:\WinObjC\bin/.. -SESSIONNAME = Console -SOURCE_ROOT = D:/WinObjC/samples/GLKitComplex -SRCROOT = D:/WinObjC/samples/GLKitComplex +SDKROOT = E:/island/github/henryfox/WinObjC +SOURCE_ROOT = E:/island/github/henryfox/WinObjC/samples/GLKitComplex +SRCROOT = E:/island/github/henryfox/WinObjC/samples/GLKitComplex SYMROOT = sbuild -SYSTEMTYPE = other -SystemDrive = C: -SystemRoot = C:\Windows +TARGETED_DEVICE_FAMILY = 1,2 TARGETNAME = GLKitComplex TARGET_BUILD_DIR = sbuild/Release-iphoneos TARGET_NAME = GLKitComplex TARGET_SDKVERSION = 5.0 TARGET_TEMP_DIR = sbuild/GLKitComplex.sbuild/Release-iphoneos/GLKitComplex.sbuild -TEMP = C:\Users\BRIANK~1.RED\AppData\Local\Temp TEMP_DIR = sbuild/GLKitComplex.sbuild/Release-iphoneos/GLKitComplex.sbuild -TMP = C:\Users\BRIANK~1.RED\AppData\Local\Temp -UATDATA = C:\Windows\CCM\UATData\D9F8C395-CAB8-491d-B8AC-179A1FE1BE77 -UCRTVersion = 10.0.10586.0 UNLOCALIZED_RESOURCES_FOLDER_PATH = GLKitComplex.app -USER = brianker -USERDNSDOMAIN = REDMOND.CORP.MICROSOFT.COM -USERDOMAIN = REDMOND -USERDOMAIN_ROAMINGPROFILE = REDMOND -USERNAME = brianker -USERPROFILE = C:\Users\brianker.REDMOND +USER = henryfox USER_HEADER_SEARCH_PATHS = USE_HEADERMAP = YES -UniversalCRTSdkDir = C:\Program Files (x86)\Windows Kits\10\ VALIDATE_PRODUCT = YES -VCINSTALLDIR = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ -VS110COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\ -VS120COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\ -VS140COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\ -VSIMPORTER_BINARY_DIR = D:\WinObjC\bin -VSIMPORTER_INTERACTIVE = NO -VSIMPORTER_OUTPUT_DIR = D:\WinObjC\samples\GLKitComplex//GLKitComplex.vsimporter -VSIMPORTER_OUTPUT_FORMAT = WinStore10 -VSIMPORTER_TEMPLATES_DIR = D:\WinObjC\bin/../msvc/vsimporter-templates -VSINSTALLDIR = C:\Program Files (x86)\Microsoft Visual Studio 14.0\ -VSSDK140Install = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\ -VisualStudioVersion = 14.0 WARNING_CFLAGS = WARNING_LDFLAGS = -WINOBJC_SDK_ROOT = D:\WinObjC\bin/.. -WindowsLibPath = C:\Program Files (x86)\Windows Kits\10\UnionMetadata;C:\Program Files (x86)\Windows Kits\10\References;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.FoundationContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\indows.Networking.Connectivity.WwanContract\1.0.0.0 -WindowsSDKLibVersion = 10.0.10586.0\ -WindowsSDKVersion = 10.0.10586.0\ -WindowsSDK_ExecutablePath_x64 = C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\x64\ -WindowsSDK_ExecutablePath_x86 = C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\ -WindowsSdkDir = C:\Program Files (x86)\Windows Kits\10\ -windir = C:\Windows +WINOBJC_SDK_ROOT = E:/island/github/henryfox/WinObjC diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj index 4b4204f1c5..d07ace55da 100644 --- a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj +++ b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj @@ -1,4 +1,4 @@ - + @@ -20,7 +20,6 @@ GLKitComplex - GLKitComplex en-US 14.0 true @@ -29,8 +28,10 @@ true 10.0.14393.0 10.0.10586.0 - {C23D3F93-EF0A-4090-9E65-2D2E4E0CDCB6} - ..\..\..\.. + IslandwoodProj + {E45BBE1B-1E64-4C3C-9D81-433F9AB81749} + GLKitComplex + ..\..\..\.. @@ -38,7 +39,7 @@ v140 GLKitComplex - + Application v140 GLKitComplex @@ -46,39 +47,38 @@ Application v140 - GLKitComplex true true + GLKitComplex - + Application v140 - GLKitComplex true true + GLKitComplex - - - + - + - + GLKitComplex_TemporaryKey.pfx + D095ED4071F7A0D93085697ECF15F78E76342CCF @@ -86,17 +86,20 @@ 4453;28204 MultiThreadedDebugDLL - - true - %(AdditionalDependencies);GLKit.lib;OpenGLES.lib - + MultiThreadedDebugDLL + *.nib;*.lproj;*.framework;*.gch;(*);.DS_Store;CVS;.svn;.git;.hg;*.xcodeproj;*.xcode;*.pbproj;*.pbxproj;*.xcassets Project + $(SolutionPublicHeadersDir) true + true Disabled - DEBUG=1;STARBOARD - MultiThreadedDebugDLL + DEBUG=1 + + true + %(AdditionalDependencies);GLKit.lib + true @@ -107,17 +110,20 @@ 4453;28204 MultiThreadedDebugDLL - - true - %(AdditionalDependencies);GLKit.lib;OpenGLES.lib - + MultiThreadedDebugDLL + *.nib;*.lproj;*.framework;*.gch;(*);.DS_Store;CVS;.svn;.git;.hg;*.xcodeproj;*.xcode;*.pbproj;*.pbxproj;*.xcassets Project + $(SolutionPublicHeadersDir) true + true Disabled - DEBUG=1;STARBOARD - MultiThreadedDebugDLL + DEBUG=1 + + true + %(AdditionalDependencies);GLKit.lib + true @@ -126,19 +132,19 @@ /bigobj %(AdditionalOptions) 4453;28204 - MultiThreadedDLL - - true - %(AdditionalDependencies);GLKit.lib;OpenGLES.lib - + *.nib;*.lproj;*.framework;*.gch;(*);.DS_Store;CVS;.svn;.git;.hg;*.xcodeproj;*.xcode;*.pbproj;*.pbxproj;*.xcassets Project + $(SolutionPublicHeadersDir) true + true MinSpace - STARBOARD - MultiThreadedDLL + + true + %(AdditionalDependencies);GLKit.lib + true @@ -147,27 +153,33 @@ /bigobj %(AdditionalOptions) 4453;28204 - MultiThreadedDLL - - true - %(AdditionalDependencies);GLKit.lib;OpenGLES.lib - + *.nib;*.lproj;*.framework;*.gch;(*);.DS_Store;CVS;.svn;.git;.hg;*.xcodeproj;*.xcode;*.pbproj;*.pbxproj;*.xcassets Project + $(SolutionPublicHeadersDir) true + true MinSpace - STARBOARD - MultiThreadedDLL + + true + %(AdditionalDependencies);GLKit.lib + true + + + Designer + + Designer + @@ -176,29 +188,27 @@ - + + + - - - - - - - - - - - - - - + + false false GLKitComplex-Debug-xcvars.txt GLKitComplex-Release-xcvars.txt + + + + Base.lproj + + + Base.lproj + false @@ -207,10 +217,22 @@ - + + + App.xaml + + + + + App.xaml + + + Create + + - \ No newline at end of file + diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj.filters b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj.filters index e939ecfb1e..1430e276c7 100644 --- a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj.filters +++ b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj.filters @@ -1,23 +1,26 @@ - + - {e68a0447-25d3-48cb-bdf3-37f96be74872} + {6497114e-8c49-47cf-bd7e-2caaaef4b9b5} - {86f70517-f1c4-4b27-b78c-4fd5379e2e21} + {a8203dfd-e407-4106-a91f-45bb7976f98e} - {A1AA97D4-F97A-47C7-A4D9-B7450D1C5294} + {5BB4745A-5EB8-4F23-B063-F9C7E9E2B269} - - {49288208-9761-4541-8AFB-4EA1D0DA1932} + + {CB2B31F2-8729-4BD9-A7EC-DAAEC2F082AD} - {2617FDA0-8671-4055-88FE-40036A03C077} + {FE7114EF-5E09-4C55-8024-0F0F29E662B9} + + + Assets @@ -39,22 +42,40 @@ Assets - + GLKitComplex - + + + GLKitComplex + + + GLKitComplex + GLKitComplex - - GLKitComplex\Supporting Files - GLKitComplex - + GLKitComplex - + + + GLKitComplex + + + GLKitComplex + + + GLKitComplex + + + GLKitComplex\Base + + + GLKitComplex\Base + Xcode Variable Files @@ -62,51 +83,4 @@ Xcode Variable Files - - - - - - - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - - - - \ No newline at end of file + diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/Package.appxmanifest b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/Package.appxmanifest index 0902298bba..df3a52edf6 100644 --- a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/Package.appxmanifest +++ b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/Package.appxmanifest @@ -7,15 +7,15 @@ IgnorableNamespaces="uap mp"> - + GLKitComplex - brianker + henryfox Assets\StoreLogo.png @@ -24,7 +24,7 @@ - + diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/pch.cpp b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/pch.cpp new file mode 100644 index 0000000000..01484ff5aa --- /dev/null +++ b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/pch.cpp @@ -0,0 +1,6 @@ +// +// pch.cpp +// Include the standard header and generate the precompiled header. +// + +#include "pch.h" diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/pch.h b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/pch.h new file mode 100644 index 0000000000..2c4354dd11 --- /dev/null +++ b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/pch.h @@ -0,0 +1,11 @@ +// +// pch.h +// Header for standard system include files. +// + +#pragma once + +#include +#include + +#include "App.xaml.h" diff --git a/samples/GLKitComplex/GLKitComplex.xcodeproj/project.pbxproj b/samples/GLKitComplex/GLKitComplex.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..2be44ae081 --- /dev/null +++ b/samples/GLKitComplex/GLKitComplex.xcodeproj/project.pbxproj @@ -0,0 +1,332 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 8BB6C7FC1E204FF500F0FF90 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8BB6C7FA1E204FF500F0FF90 /* Main.storyboard */; }; + 8BB6C7FE1E204FF500F0FF90 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8BB6C7FD1E204FF500F0FF90 /* Assets.xcassets */; }; + 8BB6C8011E204FF500F0FF90 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8BB6C7FF1E204FF500F0FF90 /* LaunchScreen.storyboard */; }; + 8BB6C80E1E20512600F0FF90 /* GLKitComplex.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8BB6C8081E20512600F0FF90 /* GLKitComplex.mm */; }; + 8BB6C80F1E20512600F0FF90 /* GLRenderer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8BB6C80A1E20512600F0FF90 /* GLRenderer.mm */; }; + 8BB6C8101E20512600F0FF90 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BB6C80B1E20512600F0FF90 /* main.m */; }; + 8BB6C8111E20512600F0FF90 /* Mesh.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8BB6C80D1E20512600F0FF90 /* Mesh.mm */; }; + 8BB6C8131E20512B00F0FF90 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 8BB6C8121E20512B00F0FF90 /* Data */; }; + 8BB6C8161E20514100F0FF90 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BB6C8151E20514100F0FF90 /* GLKit.framework */; }; + 8BB6C8181E20517000F0FF90 /* utah-teapot.obj in Resources */ = {isa = PBXBuildFile; fileRef = 8BB6C8171E20517000F0FF90 /* utah-teapot.obj */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 8BB6C7EE1E204FF500F0FF90 /* GLKitComplex.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GLKitComplex.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 8BB6C7FB1E204FF500F0FF90 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 8BB6C7FD1E204FF500F0FF90 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 8BB6C8001E204FF500F0FF90 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 8BB6C8021E204FF500F0FF90 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 8BB6C8081E20512600F0FF90 /* GLKitComplex.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GLKitComplex.mm; sourceTree = ""; }; + 8BB6C8091E20512600F0FF90 /* GLRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLRenderer.h; sourceTree = ""; }; + 8BB6C80A1E20512600F0FF90 /* GLRenderer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GLRenderer.mm; sourceTree = ""; }; + 8BB6C80B1E20512600F0FF90 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 8BB6C80C1E20512600F0FF90 /* Mesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mesh.h; sourceTree = ""; }; + 8BB6C80D1E20512600F0FF90 /* Mesh.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Mesh.mm; sourceTree = ""; }; + 8BB6C8121E20512B00F0FF90 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Data; sourceTree = ""; }; + 8BB6C8151E20514100F0FF90 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; }; + 8BB6C8171E20517000F0FF90 /* utah-teapot.obj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "utah-teapot.obj"; path = "Data/utah-teapot.obj"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 8BB6C7EB1E204FF500F0FF90 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 8BB6C8161E20514100F0FF90 /* GLKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 8BB6C7E51E204FF500F0FF90 = { + isa = PBXGroup; + children = ( + 8BB6C7F01E204FF500F0FF90 /* GLKitComplex */, + 8BB6C7EF1E204FF500F0FF90 /* Products */, + 8BB6C8141E20514100F0FF90 /* Frameworks */, + ); + sourceTree = ""; + }; + 8BB6C7EF1E204FF500F0FF90 /* Products */ = { + isa = PBXGroup; + children = ( + 8BB6C7EE1E204FF500F0FF90 /* GLKitComplex.app */, + ); + name = Products; + sourceTree = ""; + }; + 8BB6C7F01E204FF500F0FF90 /* GLKitComplex */ = { + isa = PBXGroup; + children = ( + 8BB6C8121E20512B00F0FF90 /* Data */, + 8BB6C8081E20512600F0FF90 /* GLKitComplex.mm */, + 8BB6C8171E20517000F0FF90 /* utah-teapot.obj */, + 8BB6C8091E20512600F0FF90 /* GLRenderer.h */, + 8BB6C80A1E20512600F0FF90 /* GLRenderer.mm */, + 8BB6C80B1E20512600F0FF90 /* main.m */, + 8BB6C80C1E20512600F0FF90 /* Mesh.h */, + 8BB6C80D1E20512600F0FF90 /* Mesh.mm */, + 8BB6C7FA1E204FF500F0FF90 /* Main.storyboard */, + 8BB6C7FD1E204FF500F0FF90 /* Assets.xcassets */, + 8BB6C7FF1E204FF500F0FF90 /* LaunchScreen.storyboard */, + 8BB6C8021E204FF500F0FF90 /* Info.plist */, + ); + path = GLKitComplex; + sourceTree = ""; + }; + 8BB6C8141E20514100F0FF90 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 8BB6C8151E20514100F0FF90 /* GLKit.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 8BB6C7ED1E204FF500F0FF90 /* GLKitComplex */ = { + isa = PBXNativeTarget; + buildConfigurationList = 8BB6C8051E204FF500F0FF90 /* Build configuration list for PBXNativeTarget "GLKitComplex" */; + buildPhases = ( + 8BB6C7EA1E204FF500F0FF90 /* Sources */, + 8BB6C7EB1E204FF500F0FF90 /* Frameworks */, + 8BB6C7EC1E204FF500F0FF90 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = GLKitComplex; + productName = GLKitComplex; + productReference = 8BB6C7EE1E204FF500F0FF90 /* GLKitComplex.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 8BB6C7E61E204FF500F0FF90 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0800; + ORGANIZATIONNAME = "Henry Fox"; + TargetAttributes = { + 8BB6C7ED1E204FF500F0FF90 = { + CreatedOnToolsVersion = 8.0; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = 8BB6C7E91E204FF500F0FF90 /* Build configuration list for PBXProject "GLKitComplex" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 8BB6C7E51E204FF500F0FF90; + productRefGroup = 8BB6C7EF1E204FF500F0FF90 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 8BB6C7ED1E204FF500F0FF90 /* GLKitComplex */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8BB6C7EC1E204FF500F0FF90 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8BB6C8011E204FF500F0FF90 /* LaunchScreen.storyboard in Resources */, + 8BB6C7FE1E204FF500F0FF90 /* Assets.xcassets in Resources */, + 8BB6C8131E20512B00F0FF90 /* Data in Resources */, + 8BB6C8181E20517000F0FF90 /* utah-teapot.obj in Resources */, + 8BB6C7FC1E204FF500F0FF90 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8BB6C7EA1E204FF500F0FF90 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8BB6C8111E20512600F0FF90 /* Mesh.mm in Sources */, + 8BB6C80E1E20512600F0FF90 /* GLKitComplex.mm in Sources */, + 8BB6C8101E20512600F0FF90 /* main.m in Sources */, + 8BB6C80F1E20512600F0FF90 /* GLRenderer.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 8BB6C7FA1E204FF500F0FF90 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 8BB6C7FB1E204FF500F0FF90 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 8BB6C7FF1E204FF500F0FF90 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 8BB6C8001E204FF500F0FF90 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 8BB6C8031E204FF500F0FF90 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 8BB6C8041E204FF500F0FF90 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 8BB6C8061E204FF500F0FF90 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = GLKitComplex/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = test.GLKitComplex; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 8BB6C8071E204FF500F0FF90 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = GLKitComplex/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = test.GLKitComplex; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 8BB6C7E91E204FF500F0FF90 /* Build configuration list for PBXProject "GLKitComplex" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 8BB6C8031E204FF500F0FF90 /* Debug */, + 8BB6C8041E204FF500F0FF90 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 8BB6C8051E204FF500F0FF90 /* Build configuration list for PBXNativeTarget "GLKitComplex" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 8BB6C8061E204FF500F0FF90 /* Debug */, + 8BB6C8071E204FF500F0FF90 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = 8BB6C7E61E204FF500F0FF90 /* Project object */; +} diff --git a/samples/GLKitComplex/GLKitComplex/Base.lproj/LaunchScreen.storyboard b/samples/GLKitComplex/GLKitComplex/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000000..fdf3f97d1b --- /dev/null +++ b/samples/GLKitComplex/GLKitComplex/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/GLKitComplex/GLKitComplex/Base.lproj/Main.storyboard b/samples/GLKitComplex/GLKitComplex/Base.lproj/Main.storyboard new file mode 100644 index 0000000000..4529698c4c --- /dev/null +++ b/samples/GLKitComplex/GLKitComplex/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/HelloGLKit/HelloGLKit-WinStore10.sln b/samples/HelloGLKit/HelloGLKit-WinStore10.sln index 752c4a316a..4ccb6dc6a3 100644 --- a/samples/HelloGLKit/HelloGLKit-WinStore10.sln +++ b/samples/HelloGLKit/HelloGLKit-WinStore10.sln @@ -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}") = "HelloGLKit", "HelloGLKit", "{D0ECD716-6AB8-4ED4-BE7A-C2B13E415822}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HelloGLKit", "HelloGLKit", "{4E066E9E-322D-4859-B489-F3F29E0371BE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloGLKit-Headers", "HelloGLKit.vsimporter\HelloGLKit-Headers-WinStore10\HelloGLKit-Headers.vcxitems", "{35FCD860-3A61-4B01-A826-CD28A67E49B3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloGLKit", "HelloGLKit.vsimporter\HelloGLKit-WinStore10\HelloGLKit.vcxproj", "{B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloGLKit", "HelloGLKit.vsimporter\HelloGLKit-WinStore10\HelloGLKit.vcxproj", "{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - HelloGLKit.vsimporter\HelloGLKit-Headers-WinStore10\HelloGLKit-Headers.vcxitems*{35fcd860-3a61-4b01-a826-cd28a67e49b3}*SharedItemsImports = 9 - HelloGLKit.vsimporter\HelloGLKit-Headers-WinStore10\HelloGLKit-Headers.vcxitems*{b82d23d5-5a6b-4c97-b2ea-ed33a185e6f3}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM @@ -20,24 +16,23 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3}.Debug|ARM.ActiveCfg = Debug|ARM - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3}.Debug|ARM.Build.0 = Debug|ARM - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3}.Debug|ARM.Deploy.0 = Debug|ARM - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3}.Debug|Win32.ActiveCfg = Debug|Win32 - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3}.Debug|Win32.Build.0 = Debug|Win32 - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3}.Debug|Win32.Deploy.0 = Debug|Win32 - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3}.Release|ARM.ActiveCfg = Release|ARM - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3}.Release|ARM.Build.0 = Release|ARM - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3}.Release|ARM.Deploy.0 = Release|ARM - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3}.Release|Win32.ActiveCfg = Release|Win32 - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3}.Release|Win32.Build.0 = Release|Win32 - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3}.Release|Win32.Deploy.0 = Release|Win32 + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Debug|ARM.ActiveCfg = Debug|ARM + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Debug|ARM.Build.0 = Debug|ARM + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Debug|ARM.Deploy.0 = Debug|ARM + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Debug|Win32.ActiveCfg = Debug|Win32 + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Debug|Win32.Build.0 = Debug|Win32 + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Debug|Win32.Deploy.0 = Debug|Win32 + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Release|ARM.ActiveCfg = Release|ARM + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Release|ARM.Build.0 = Release|ARM + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Release|ARM.Deploy.0 = Release|ARM + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Release|Win32.ActiveCfg = Release|Win32 + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Release|Win32.Build.0 = Release|Win32 + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Release|Win32.Deploy.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {35FCD860-3A61-4B01-A826-CD28A67E49B3} = {D0ECD716-6AB8-4ED4-BE7A-C2B13E415822} - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3} = {D0ECD716-6AB8-4ED4-BE7A-C2B13E415822} + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F} = {4E066E9E-322D-4859-B489-F3F29E0371BE} EndGlobalSection EndGlobal diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-Headers-WinStore10/HelloGLKit-Headers.vcxitems b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-Headers-WinStore10/HelloGLKit-Headers.vcxitems deleted file mode 100644 index 59fed36991..0000000000 --- a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-Headers-WinStore10/HelloGLKit-Headers.vcxitems +++ /dev/null @@ -1,16 +0,0 @@ - - - - true - HelloGLKit_Headers - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - {35FCD860-3A61-4B01-A826-CD28A67E49B3} - {6D717DDE-C67E-4FB3-84C6-C7C248399650} - - - - - - - - diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-Headers-WinStore10/HelloGLKit-Headers.vcxitems.filters b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-Headers-WinStore10/HelloGLKit-Headers.vcxitems.filters deleted file mode 100644 index 42bcb481d6..0000000000 --- a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-Headers-WinStore10/HelloGLKit-Headers.vcxitems.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {4269432E-C827-412D-91E5-D6E939D69039} - - - - - HelloGLKit - - - diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/App.xaml b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/App.xaml new file mode 100644 index 0000000000..ce50883871 --- /dev/null +++ b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/App.xaml @@ -0,0 +1,8 @@ + + + diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/App.xaml.cpp b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/App.xaml.cpp new file mode 100644 index 0000000000..acc10b92ff --- /dev/null +++ b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/App.xaml.cpp @@ -0,0 +1,90 @@ +// +// App.xaml.cpp +// Implementation of the App class. +// + +// clang-format off + +#include "pch.h" + +using namespace HelloGLKit; + +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; + +/// +/// 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(). +/// +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 + +/// +/// 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. +/// +/// Details about the launch request and process. +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 + +/// +/// 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. +/// +/// The source of the suspend request. +/// Details about the suspend request. +void App::OnSuspending(Object^ /*sender*/, SuspendingEventArgs^ /*e*/) { + // TODO: Save application state and stop any background activity +} + +/// +/// Invoked when Navigation to a certain page fails +/// +/// The Frame which failed navigation +/// Details about the navigation failure +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 diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/App.xaml.h b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/App.xaml.h new file mode 100644 index 0000000000..693d3b8613 --- /dev/null +++ b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/App.xaml.h @@ -0,0 +1,33 @@ +// +// App.xaml.h +// Declaration of the App class. +// + +// clang-format off +#pragma once + +#include "App.g.h" + +namespace HelloGLKit { +/// +/// Provides application-specific behavior to supplement the default Application class. +/// +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 diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit-Debug-xcvars.txt b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit-Debug-xcvars.txt index babb5c1b19..e8c5d80d60 100644 --- a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit-Debug-xcvars.txt +++ b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit-Debug-xcvars.txt @@ -1,6 +1,4 @@ -ALLUSERSPROFILE = C:\ProgramData ALWAYS_SEARCH_USER_PATHS = NO -APPDATA = C:\Users\brianker.REDMOND\AppData\Roaming APPFOLDER = sbuild/Debug-iphoneos/HelloGLKit.app ARCHS = msvc ARCHS_STANDARD = armv6 @@ -10,6 +8,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = BUILD_DIR = sbuild BUILT_PRODUCTS_DIR = sbuild/Debug-iphoneos +CLANG_ANALYZER_NONNULL = YES CLANG_CXX_LANGUAGE_STANDARD = gnu++0x CLANG_CXX_LIBRARY = libc++ CLANG_ENABLE_MODULES = YES @@ -17,48 +16,36 @@ CLANG_ENABLE_OBJC_ARC = YES CLANG_WARN_BOOL_CONVERSION = YES CLANG_WARN_CONSTANT_CONVERSION = YES CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN_DOCUMENTATION_COMMENTS = YES CLANG_WARN_EMPTY_BODY = YES CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES CLANG_WARN_INT_CONVERSION = YES CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_SUSPICIOUS_MOVES = YES CLANG_WARN_UNREACHABLE_CODE = YES CLANG_WARN__DUPLICATE_METHOD_MATCH = YES CODESIGNING_FOLDER_PATH = sbuild/Debug-iphoneos/HelloGLKit.app CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer -COMPUTERNAME = TRANQUIL CONFIGURATION = Debug CONFIGURATION_BUILD_DIR = sbuild/Debug-iphoneos CONFIGURATION_TEMP_DIR = sbuild/HelloGLKit.sbuild/Debug-iphoneos COPY_PHASE_STRIP = NO CURRENT_ARCH = msvc -CYGWIN = nodosfilewarning -ComSpec = C:\Windows\system32\cmd.exe -CommonProgramFiles = C:\Program Files (x86)\Common Files -CommonProgramFiles(x86) = C:\Program Files (x86)\Common Files -CommonProgramW6432 = C:\Program Files\Common Files DEAD_CODE_STRIPPING = YES -DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +DEBUG_INFORMATION_FORMAT = dwarf DERIVED_FILES_DIR = sbuild/HelloGLKit.sbuild/Debug-iphoneos/HelloGLKit.sbuild/DerivedSources DERIVED_FILE_DIR = sbuild/HelloGLKit.sbuild/Debug-iphoneos/HelloGLKit.sbuild/DerivedSources DERIVED_SOURCES_DIR = sbuild/HelloGLKit.sbuild/Debug-iphoneos/HelloGLKit.sbuild/DerivedSources -DNX_HOME = %USERPROFILE%\.dnx -DevEnvDir = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\ EFFECTIVE_PLATFORM_NAME = -iphoneos ENABLE_STRICT_OBJC_MSGSEND = YES ENABLE_TESTABILITY = YES -EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = *.nib *.lproj *.framework *.gch (*) .DS_Store CVS .svn .git .hg *.xcodeproj *.xcode *.pbproj *.pbxproj +EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = *.nib *.lproj *.framework *.gch (*) .DS_Store CVS .svn .git .hg *.xcodeproj *.xcode *.pbproj *.pbxproj *.xcassets EXECUTABLE_FOLDER_PATH = HelloGLKit.app EXECUTABLE_NAME = HelloGLKit EXECUTABLE_PATH = HelloGLKit.app/HelloGLKit -ExtensionSdkDir = C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs FRAMEWORK_SEARCH_PATHS = -FSHARPINSTALLDIR = C:\Program Files (x86)\Microsoft SDKs\F#\4.0\Framework\v4.0\ FULL_PRODUCT_NAME = HelloGLKit.app -Framework40Version = v4.0 -FrameworkDIR32 = C:\Windows\Microsoft.NET\Framework\ -FrameworkDir = C:\Windows\Microsoft.NET\Framework\ -FrameworkVersion = v4.0.30319 -FrameworkVersion32 = v4.0.30319 GCC_C_LANGUAGE_STANDARD = gnu99 GCC_DYNAMIC_NO_PIC = NO GCC_NO_COMMON_BLOCKS = YES @@ -78,106 +65,49 @@ HEADERMAP_INCLUDES_FLAT_ENTRIES_FOR_TARGET_BEING_BUILT = YES HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = YES HEADERMAP_INCLUDES_PROJECT_HEADERS = YES HEADER_SEARCH_PATHS = -HOME = C:\Users\brianker.REDMOND -HOMEDRIVE = C: -HOMEPATH = \Users\brianker.REDMOND -INCLUDE = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\ucrt;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\include\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\winrt; INFOPLIST_FILE = HelloGLKit/Info.plist INFOPLIST_PATH = HelloGLKit.app/Info.plist -IPHONEOS_DEPLOYMENT_TARGET = 9.0 +IPHONEOS_DEPLOYMENT_TARGET = 10.0 LD_NO_PIE = NO LD_RUNPATH_SEARCH_PATHS = @executable_path/Frameworks -LIB = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10586.0\ucrt\x86;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\lib\um\x86;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10586.0\um\x86; -LIBPATH = C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\UnionMetadata;C:\Program Files (x86)\Windows Kits\10\References;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.FoundationContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\indows.Networking.Connectivity.WwanContract\1.0.0.0;C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral; LIBRARY_SEARCH_PATHS = LINK_FILE_LIST = sbuild/HelloGLKit.sbuild/Debug-iphoneos/HelloGLKit.sbuild/Objects/msvc/HelloGLKit.LinkFileList LINK_WITH_STANDARD_LIBRARIES = NO -LOCALAPPDATA = C:\Users\brianker.REDMOND\AppData\Local LOCALIZED_RESOURCES_FOLDER_PATH = HelloGLKit.app/English.lproj -LOGONSERVER = \\TK5-RED-DC-08 MTL_ENABLE_DEBUG_INFO = YES -NETFXSDKDir = C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\ -NUMBER_OF_PROCESSORS = 8 OBJECT_FILE_DIR = sbuild/HelloGLKit.sbuild/Debug-iphoneos/HelloGLKit.sbuild/Objects/msvc OBJROOT = sbuild ONLY_ACTIVE_ARCH = YES -OS = Windows_NT OTHER_CFLAGS = OTHER_CPLUSPLUSFLAGS = OTHER_LDFLAGS = -PATHEXT = .COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC PLATFORM_NAME = iphoneos PRIVATE_HEADERS_FOLDER_PATH = HelloGLKit.app/Private -PROCESSOR_ARCHITECTURE = x86 -PROCESSOR_ARCHITEW6432 = AMD64 -PROCESSOR_IDENTIFIER = Intel64 Family 6 Model 45 Stepping 7, GenuineIntel -PROCESSOR_LEVEL = 6 -PROCESSOR_REVISION = 2d07 -PRODUCT_BUNDLE_IDENTIFIER = com.Microsoft.HelloGLKit +PRODUCT_BUNDLE_IDENTIFIER = test.HelloGLKit PRODUCT_NAME = HelloGLKit PRODUCT_TYPE = com.apple.product-type.application PROJECT = HelloGLKit -PROJECT_DIR = D:/WinObjC/samples/HelloGLKit -PROJECT_FILE_PATH = D:\WinObjC\samples\HelloGLKit\HelloGLKit.xcodeproj +PROJECT_DIR = E:/island/github/henryfox/WinObjC/samples/HelloGLKit +PROJECT_FILE_PATH = E:\island\github\henryfox\WinObjC\samples\HelloGLKit\HelloGLKit.xcodeproj PROJECT_NAME = HelloGLKit PROJECT_TEMP_DIR = sbuild/HelloGLKit.sbuild PROJECT_TEMP_ROOT = sbuild -PROMPT = $P$G -PSModulePath = C:\Program Files\WindowsPowerShell\Modules;C:\Windows\system32\WindowsPowerShell\v1.0\Modules -PUBLIC = C:\Users\Public PUBLIC_HEADERS_FOLDER_PATH = HelloGLKit.app/Public -Path = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\4.0\Framework\v4.0\;C:\Program Files (x86)\MSBuild\14.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\ATI Technologies\ATI.ACE\Core-Static;C:\Users\brianker.REDMOND\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\bin;c:\bin\bin;C:\bin\emacs-24.4\bin;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Program Files (x86)\Git\bin;D:\WinObjC\bin;C:\Users\brianker.REDMOND\.dnx\bin -ProgramData = C:\ProgramData -ProgramFiles = C:\Program Files (x86) -ProgramFiles(x86) = C:\Program Files (x86) -ProgramW6432 = C:\Program Files -SDKROOT = D:\WinObjC\bin/.. -SESSIONNAME = Console -SOURCE_ROOT = D:/WinObjC/samples/HelloGLKit -SRCROOT = D:/WinObjC/samples/HelloGLKit +SDKROOT = E:/island/github/henryfox/WinObjC +SOURCE_ROOT = E:/island/github/henryfox/WinObjC/samples/HelloGLKit +SRCROOT = E:/island/github/henryfox/WinObjC/samples/HelloGLKit SYMROOT = sbuild -SYSTEMTYPE = other -SystemDrive = C: -SystemRoot = C:\Windows +TARGETED_DEVICE_FAMILY = 1,2 TARGETNAME = HelloGLKit TARGET_BUILD_DIR = sbuild/Debug-iphoneos TARGET_NAME = HelloGLKit TARGET_SDKVERSION = 5.0 TARGET_TEMP_DIR = sbuild/HelloGLKit.sbuild/Debug-iphoneos/HelloGLKit.sbuild -TEMP = C:\Users\BRIANK~1.RED\AppData\Local\Temp TEMP_DIR = sbuild/HelloGLKit.sbuild/Debug-iphoneos/HelloGLKit.sbuild -TMP = C:\Users\BRIANK~1.RED\AppData\Local\Temp -UATDATA = C:\Windows\CCM\UATData\D9F8C395-CAB8-491d-B8AC-179A1FE1BE77 -UCRTVersion = 10.0.10586.0 UNLOCALIZED_RESOURCES_FOLDER_PATH = HelloGLKit.app -USER = brianker -USERDNSDOMAIN = REDMOND.CORP.MICROSOFT.COM -USERDOMAIN = REDMOND -USERDOMAIN_ROAMINGPROFILE = REDMOND -USERNAME = brianker -USERPROFILE = C:\Users\brianker.REDMOND +USER = henryfox USER_HEADER_SEARCH_PATHS = USE_HEADERMAP = YES -UniversalCRTSdkDir = C:\Program Files (x86)\Windows Kits\10\ -VCINSTALLDIR = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ -VS110COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\ -VS120COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\ -VS140COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\ -VSIMPORTER_BINARY_DIR = D:\WinObjC\bin -VSIMPORTER_INTERACTIVE = NO -VSIMPORTER_OUTPUT_DIR = D:\WinObjC\samples\HelloGLKit//HelloGLKit.vsimporter -VSIMPORTER_OUTPUT_FORMAT = WinStore10 -VSIMPORTER_TEMPLATES_DIR = D:\WinObjC\bin/../msvc/vsimporter-templates -VSINSTALLDIR = C:\Program Files (x86)\Microsoft Visual Studio 14.0\ -VSSDK140Install = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\ -VisualStudioVersion = 14.0 WARNING_CFLAGS = WARNING_LDFLAGS = -WINOBJC_SDK_ROOT = D:\WinObjC\bin/.. -WindowsLibPath = C:\Program Files (x86)\Windows Kits\10\UnionMetadata;C:\Program Files (x86)\Windows Kits\10\References;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.FoundationContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\indows.Networking.Connectivity.WwanContract\1.0.0.0 -WindowsSDKLibVersion = 10.0.10586.0\ -WindowsSDKVersion = 10.0.10586.0\ -WindowsSDK_ExecutablePath_x64 = C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\x64\ -WindowsSDK_ExecutablePath_x86 = C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\ -WindowsSdkDir = C:\Program Files (x86)\Windows Kits\10\ -windir = C:\Windows +WINOBJC_SDK_ROOT = E:/island/github/henryfox/WinObjC diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit-Release-xcvars.txt b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit-Release-xcvars.txt index 90197289a4..c9fc899f38 100644 --- a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit-Release-xcvars.txt +++ b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit-Release-xcvars.txt @@ -1,6 +1,4 @@ -ALLUSERSPROFILE = C:\ProgramData ALWAYS_SEARCH_USER_PATHS = NO -APPDATA = C:\Users\brianker.REDMOND\AppData\Roaming APPFOLDER = sbuild/Release-iphoneos/HelloGLKit.app ARCHS = msvc ARCHS_STANDARD = armv6 @@ -10,6 +8,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = BUILD_DIR = sbuild BUILT_PRODUCTS_DIR = sbuild/Release-iphoneos +CLANG_ANALYZER_NONNULL = YES CLANG_CXX_LANGUAGE_STANDARD = gnu++0x CLANG_CXX_LIBRARY = libc++ CLANG_ENABLE_MODULES = YES @@ -17,48 +16,36 @@ CLANG_ENABLE_OBJC_ARC = YES CLANG_WARN_BOOL_CONVERSION = YES CLANG_WARN_CONSTANT_CONVERSION = YES CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN_DOCUMENTATION_COMMENTS = YES CLANG_WARN_EMPTY_BODY = YES CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES CLANG_WARN_INT_CONVERSION = YES CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_SUSPICIOUS_MOVES = YES CLANG_WARN_UNREACHABLE_CODE = YES CLANG_WARN__DUPLICATE_METHOD_MATCH = YES CODESIGNING_FOLDER_PATH = sbuild/Release-iphoneos/HelloGLKit.app CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer -COMPUTERNAME = TRANQUIL CONFIGURATION = Release CONFIGURATION_BUILD_DIR = sbuild/Release-iphoneos CONFIGURATION_TEMP_DIR = sbuild/HelloGLKit.sbuild/Release-iphoneos COPY_PHASE_STRIP = NO CURRENT_ARCH = msvc -CYGWIN = nodosfilewarning -ComSpec = C:\Windows\system32\cmd.exe -CommonProgramFiles = C:\Program Files (x86)\Common Files -CommonProgramFiles(x86) = C:\Program Files (x86)\Common Files -CommonProgramW6432 = C:\Program Files\Common Files DEAD_CODE_STRIPPING = YES DEBUG_INFORMATION_FORMAT = dwarf-with-dsym DERIVED_FILES_DIR = sbuild/HelloGLKit.sbuild/Release-iphoneos/HelloGLKit.sbuild/DerivedSources DERIVED_FILE_DIR = sbuild/HelloGLKit.sbuild/Release-iphoneos/HelloGLKit.sbuild/DerivedSources DERIVED_SOURCES_DIR = sbuild/HelloGLKit.sbuild/Release-iphoneos/HelloGLKit.sbuild/DerivedSources -DNX_HOME = %USERPROFILE%\.dnx -DevEnvDir = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\ EFFECTIVE_PLATFORM_NAME = -iphoneos ENABLE_NS_ASSERTIONS = NO ENABLE_STRICT_OBJC_MSGSEND = YES -EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = *.nib *.lproj *.framework *.gch (*) .DS_Store CVS .svn .git .hg *.xcodeproj *.xcode *.pbproj *.pbxproj +EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = *.nib *.lproj *.framework *.gch (*) .DS_Store CVS .svn .git .hg *.xcodeproj *.xcode *.pbproj *.pbxproj *.xcassets EXECUTABLE_FOLDER_PATH = HelloGLKit.app EXECUTABLE_NAME = HelloGLKit EXECUTABLE_PATH = HelloGLKit.app/HelloGLKit -ExtensionSdkDir = C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs FRAMEWORK_SEARCH_PATHS = -FSHARPINSTALLDIR = C:\Program Files (x86)\Microsoft SDKs\F#\4.0\Framework\v4.0\ FULL_PRODUCT_NAME = HelloGLKit.app -Framework40Version = v4.0 -FrameworkDIR32 = C:\Windows\Microsoft.NET\Framework\ -FrameworkDir = C:\Windows\Microsoft.NET\Framework\ -FrameworkVersion = v4.0.30319 -FrameworkVersion32 = v4.0.30319 GCC_C_LANGUAGE_STANDARD = gnu99 GCC_DYNAMIC_NO_PIC = NO GCC_NO_COMMON_BLOCKS = YES @@ -78,106 +65,49 @@ HEADERMAP_INCLUDES_FLAT_ENTRIES_FOR_TARGET_BEING_BUILT = YES HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = YES HEADERMAP_INCLUDES_PROJECT_HEADERS = YES HEADER_SEARCH_PATHS = -HOME = C:\Users\brianker.REDMOND -HOMEDRIVE = C: -HOMEPATH = \Users\brianker.REDMOND -INCLUDE = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\ucrt;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\include\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\winrt; INFOPLIST_FILE = HelloGLKit/Info.plist INFOPLIST_PATH = HelloGLKit.app/Info.plist -IPHONEOS_DEPLOYMENT_TARGET = 9.0 +IPHONEOS_DEPLOYMENT_TARGET = 10.0 LD_NO_PIE = NO LD_RUNPATH_SEARCH_PATHS = @executable_path/Frameworks -LIB = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10586.0\ucrt\x86;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\lib\um\x86;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10586.0\um\x86; -LIBPATH = C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\UnionMetadata;C:\Program Files (x86)\Windows Kits\10\References;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.FoundationContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\indows.Networking.Connectivity.WwanContract\1.0.0.0;C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral; LIBRARY_SEARCH_PATHS = LINK_FILE_LIST = sbuild/HelloGLKit.sbuild/Release-iphoneos/HelloGLKit.sbuild/Objects/msvc/HelloGLKit.LinkFileList LINK_WITH_STANDARD_LIBRARIES = NO -LOCALAPPDATA = C:\Users\brianker.REDMOND\AppData\Local LOCALIZED_RESOURCES_FOLDER_PATH = HelloGLKit.app/English.lproj -LOGONSERVER = \\TK5-RED-DC-08 MTL_ENABLE_DEBUG_INFO = NO -NETFXSDKDir = C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\ -NUMBER_OF_PROCESSORS = 8 OBJECT_FILE_DIR = sbuild/HelloGLKit.sbuild/Release-iphoneos/HelloGLKit.sbuild/Objects/msvc OBJROOT = sbuild -OS = Windows_NT OTHER_CFLAGS = OTHER_CPLUSPLUSFLAGS = OTHER_LDFLAGS = -PATHEXT = .COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC PLATFORM_NAME = iphoneos PRIVATE_HEADERS_FOLDER_PATH = HelloGLKit.app/Private -PROCESSOR_ARCHITECTURE = x86 -PROCESSOR_ARCHITEW6432 = AMD64 -PROCESSOR_IDENTIFIER = Intel64 Family 6 Model 45 Stepping 7, GenuineIntel -PROCESSOR_LEVEL = 6 -PROCESSOR_REVISION = 2d07 -PRODUCT_BUNDLE_IDENTIFIER = com.Microsoft.HelloGLKit +PRODUCT_BUNDLE_IDENTIFIER = test.HelloGLKit PRODUCT_NAME = HelloGLKit PRODUCT_TYPE = com.apple.product-type.application PROJECT = HelloGLKit -PROJECT_DIR = D:/WinObjC/samples/HelloGLKit -PROJECT_FILE_PATH = D:\WinObjC\samples\HelloGLKit\HelloGLKit.xcodeproj +PROJECT_DIR = E:/island/github/henryfox/WinObjC/samples/HelloGLKit +PROJECT_FILE_PATH = E:\island\github\henryfox\WinObjC\samples\HelloGLKit\HelloGLKit.xcodeproj PROJECT_NAME = HelloGLKit PROJECT_TEMP_DIR = sbuild/HelloGLKit.sbuild PROJECT_TEMP_ROOT = sbuild -PROMPT = $P$G -PSModulePath = C:\Program Files\WindowsPowerShell\Modules;C:\Windows\system32\WindowsPowerShell\v1.0\Modules -PUBLIC = C:\Users\Public PUBLIC_HEADERS_FOLDER_PATH = HelloGLKit.app/Public -Path = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\4.0\Framework\v4.0\;C:\Program Files (x86)\MSBuild\14.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\ATI Technologies\ATI.ACE\Core-Static;C:\Users\brianker.REDMOND\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\bin;c:\bin\bin;C:\bin\emacs-24.4\bin;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Program Files (x86)\Git\bin;D:\WinObjC\bin;C:\Users\brianker.REDMOND\.dnx\bin -ProgramData = C:\ProgramData -ProgramFiles = C:\Program Files (x86) -ProgramFiles(x86) = C:\Program Files (x86) -ProgramW6432 = C:\Program Files -SDKROOT = D:\WinObjC\bin/.. -SESSIONNAME = Console -SOURCE_ROOT = D:/WinObjC/samples/HelloGLKit -SRCROOT = D:/WinObjC/samples/HelloGLKit +SDKROOT = E:/island/github/henryfox/WinObjC +SOURCE_ROOT = E:/island/github/henryfox/WinObjC/samples/HelloGLKit +SRCROOT = E:/island/github/henryfox/WinObjC/samples/HelloGLKit SYMROOT = sbuild -SYSTEMTYPE = other -SystemDrive = C: -SystemRoot = C:\Windows +TARGETED_DEVICE_FAMILY = 1,2 TARGETNAME = HelloGLKit TARGET_BUILD_DIR = sbuild/Release-iphoneos TARGET_NAME = HelloGLKit TARGET_SDKVERSION = 5.0 TARGET_TEMP_DIR = sbuild/HelloGLKit.sbuild/Release-iphoneos/HelloGLKit.sbuild -TEMP = C:\Users\BRIANK~1.RED\AppData\Local\Temp TEMP_DIR = sbuild/HelloGLKit.sbuild/Release-iphoneos/HelloGLKit.sbuild -TMP = C:\Users\BRIANK~1.RED\AppData\Local\Temp -UATDATA = C:\Windows\CCM\UATData\D9F8C395-CAB8-491d-B8AC-179A1FE1BE77 -UCRTVersion = 10.0.10586.0 UNLOCALIZED_RESOURCES_FOLDER_PATH = HelloGLKit.app -USER = brianker -USERDNSDOMAIN = REDMOND.CORP.MICROSOFT.COM -USERDOMAIN = REDMOND -USERDOMAIN_ROAMINGPROFILE = REDMOND -USERNAME = brianker -USERPROFILE = C:\Users\brianker.REDMOND +USER = henryfox USER_HEADER_SEARCH_PATHS = USE_HEADERMAP = YES -UniversalCRTSdkDir = C:\Program Files (x86)\Windows Kits\10\ VALIDATE_PRODUCT = YES -VCINSTALLDIR = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ -VS110COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\ -VS120COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\ -VS140COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\ -VSIMPORTER_BINARY_DIR = D:\WinObjC\bin -VSIMPORTER_INTERACTIVE = NO -VSIMPORTER_OUTPUT_DIR = D:\WinObjC\samples\HelloGLKit//HelloGLKit.vsimporter -VSIMPORTER_OUTPUT_FORMAT = WinStore10 -VSIMPORTER_TEMPLATES_DIR = D:\WinObjC\bin/../msvc/vsimporter-templates -VSINSTALLDIR = C:\Program Files (x86)\Microsoft Visual Studio 14.0\ -VSSDK140Install = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\ -VisualStudioVersion = 14.0 WARNING_CFLAGS = WARNING_LDFLAGS = -WINOBJC_SDK_ROOT = D:\WinObjC\bin/.. -WindowsLibPath = C:\Program Files (x86)\Windows Kits\10\UnionMetadata;C:\Program Files (x86)\Windows Kits\10\References;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.FoundationContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\indows.Networking.Connectivity.WwanContract\1.0.0.0 -WindowsSDKLibVersion = 10.0.10586.0\ -WindowsSDKVersion = 10.0.10586.0\ -WindowsSDK_ExecutablePath_x64 = C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\x64\ -WindowsSDK_ExecutablePath_x86 = C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\ -WindowsSdkDir = C:\Program Files (x86)\Windows Kits\10\ -windir = C:\Windows +WINOBJC_SDK_ROOT = E:/island/github/henryfox/WinObjC diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj index bff0f91122..ac45c299c0 100644 --- a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj +++ b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj @@ -1,4 +1,4 @@ - + @@ -20,7 +20,6 @@ HelloGLKit - HelloGLKit en-US 14.0 true @@ -29,8 +28,10 @@ true 10.0.14393.0 10.0.10586.0 - {B82D23D5-5A6B-4C97-B2EA-ED33A185E6F3} - ..\..\..\.. + IslandwoodProj + {B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F} + HelloGLKit + ..\..\..\.. @@ -38,7 +39,7 @@ v140 HelloGLKit - + Application v140 HelloGLKit @@ -46,39 +47,38 @@ Application v140 - HelloGLKit true true + HelloGLKit - + Application v140 - HelloGLKit true true + HelloGLKit - - - + - + - + HelloGLKit_TemporaryKey.pfx + D095ED4071F7A0D93085697ECF15F78E76342CCF @@ -86,17 +86,20 @@ 4453;28204 MultiThreadedDebugDLL - - true - %(AdditionalDependencies);GLKit.lib;OpenGLES.lib - + MultiThreadedDebugDLL + *.nib;*.lproj;*.framework;*.gch;(*);.DS_Store;CVS;.svn;.git;.hg;*.xcodeproj;*.xcode;*.pbproj;*.pbxproj;*.xcassets Project + $(SolutionPublicHeadersDir) true + true Disabled DEBUG=1 - MultiThreadedDebugDLL + + true + %(AdditionalDependencies);GLKit.lib + true @@ -107,17 +110,20 @@ 4453;28204 MultiThreadedDebugDLL - - true - %(AdditionalDependencies);GLKit.lib;OpenGLES.lib - + MultiThreadedDebugDLL + *.nib;*.lproj;*.framework;*.gch;(*);.DS_Store;CVS;.svn;.git;.hg;*.xcodeproj;*.xcode;*.pbproj;*.pbxproj;*.xcassets Project + $(SolutionPublicHeadersDir) true + true Disabled DEBUG=1 - MultiThreadedDebugDLL + + true + %(AdditionalDependencies);GLKit.lib + true @@ -126,18 +132,19 @@ /bigobj %(AdditionalOptions) 4453;28204 - MultiThreadedDLL - - true - %(AdditionalDependencies);GLKit.lib;OpenGLES.lib - + *.nib;*.lproj;*.framework;*.gch;(*);.DS_Store;CVS;.svn;.git;.hg;*.xcodeproj;*.xcode;*.pbproj;*.pbxproj;*.xcassets Project + $(SolutionPublicHeadersDir) true + true MinSpace - MultiThreadedDLL + + true + %(AdditionalDependencies);GLKit.lib + true @@ -146,26 +153,33 @@ /bigobj %(AdditionalOptions) 4453;28204 - MultiThreadedDLL - - true - %(AdditionalDependencies);GLKit.lib;OpenGLES.lib - + *.nib;*.lproj;*.framework;*.gch;(*);.DS_Store;CVS;.svn;.git;.hg;*.xcodeproj;*.xcode;*.pbproj;*.pbxproj;*.xcassets Project + $(SolutionPublicHeadersDir) true + true MinSpace - MultiThreadedDLL + + true + %(AdditionalDependencies);GLKit.lib + true + + + Designer + + Designer + @@ -174,16 +188,23 @@ + + + - - false false HelloGLKit-Debug-xcvars.txt HelloGLKit-Release-xcvars.txt + + Base.lproj + + + Base.lproj + false @@ -192,10 +213,22 @@ - + + + App.xaml + + + + + App.xaml + + + Create + + - \ No newline at end of file + diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj.filters b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj.filters index bdfc5ccf45..688e1545e1 100644 --- a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj.filters +++ b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj.filters @@ -1,23 +1,26 @@ - + - {c781b802-90d5-4c93-9d68-72335cf971f9} + {fbe85872-bf7f-46b7-bc36-809357e69b23} - {60efa1a4-73ad-4b9c-9453-c6a7ca7697ac} + {793e6d63-787c-4553-9053-43ee6a7ca670} - {0F697321-5871-4D0B-ACA2-3CB3E38A11D0} + {C2D01774-9ACE-4399-8CB2-E1CC7625C369} - - {26CF6ACF-72B4-4EC8-8A9E-C313A141FE9E} + + {8B97283C-8B1F-4785-B872-1C984D2663B2} - {3E42869B-042D-4004-A044-779316F6CE6C} + {8F93AA9A-2C8C-4539-BC65-56CD7DBFB2CF} + + + Assets @@ -39,19 +42,28 @@ Assets + + HelloGLKit + + + HelloGLKit + + + HelloGLKit + HelloGLKit - HelloGLKit\Supporting Files - - HelloGLKit - - HelloGLKit - + + HelloGLKit\Base + + + HelloGLKit\Base + Xcode Variable Files @@ -59,13 +71,4 @@ Xcode Variable Files - - - - - - - - - - \ No newline at end of file + diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/Package.appxmanifest b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/Package.appxmanifest index cc8825f058..87202cd6e1 100644 --- a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/Package.appxmanifest +++ b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/Package.appxmanifest @@ -7,15 +7,15 @@ IgnorableNamespaces="uap mp"> - + HelloGLKit - brianker + henryfox Assets\StoreLogo.png @@ -24,7 +24,7 @@ - + diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/pch.cpp b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/pch.cpp new file mode 100644 index 0000000000..01484ff5aa --- /dev/null +++ b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/pch.cpp @@ -0,0 +1,6 @@ +// +// pch.cpp +// Include the standard header and generate the precompiled header. +// + +#include "pch.h" diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/pch.h b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/pch.h new file mode 100644 index 0000000000..2c4354dd11 --- /dev/null +++ b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/pch.h @@ -0,0 +1,11 @@ +// +// pch.h +// Header for standard system include files. +// + +#pragma once + +#include +#include + +#include "App.xaml.h" diff --git a/samples/HelloGLKit/HelloGLKit.xcodeproj/project.pbxproj b/samples/HelloGLKit/HelloGLKit.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..1f51b27f0e --- /dev/null +++ b/samples/HelloGLKit/HelloGLKit.xcodeproj/project.pbxproj @@ -0,0 +1,326 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 8BC1F6541E2022FE00B963B4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8BC1F6521E2022FE00B963B4 /* Main.storyboard */; }; + 8BC1F6561E2022FE00B963B4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8BC1F6551E2022FE00B963B4 /* Assets.xcassets */; }; + 8BC1F6591E2022FE00B963B4 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8BC1F6571E2022FE00B963B4 /* LaunchScreen.storyboard */; }; + 8BC1F6641E20237200B963B4 /* GLRenderer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8BC1F6611E20237200B963B4 /* GLRenderer.mm */; }; + 8BC1F6651E20237200B963B4 /* HelloGLKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8BC1F6621E20237200B963B4 /* HelloGLKit.mm */; }; + 8BC1F6691E20238F00B963B4 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BC1F6681E20238F00B963B4 /* GLKit.framework */; }; + 8BC1F66B1E2024C600B963B4 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BC1F66A1E2024C600B963B4 /* main.m */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 8BC1F6461E2022FE00B963B4 /* HelloGLKit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloGLKit.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 8BC1F6531E2022FE00B963B4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 8BC1F6551E2022FE00B963B4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 8BC1F6581E2022FE00B963B4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 8BC1F65A1E2022FE00B963B4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 8BC1F6601E20237200B963B4 /* GLRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLRenderer.h; sourceTree = ""; }; + 8BC1F6611E20237200B963B4 /* GLRenderer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GLRenderer.mm; sourceTree = ""; }; + 8BC1F6621E20237200B963B4 /* HelloGLKit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HelloGLKit.mm; sourceTree = ""; }; + 8BC1F6681E20238F00B963B4 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; }; + 8BC1F66A1E2024C600B963B4 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 8BC1F6431E2022FD00B963B4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 8BC1F6691E20238F00B963B4 /* GLKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 8BC1F63D1E2022FD00B963B4 = { + isa = PBXGroup; + children = ( + 8BC1F6481E2022FE00B963B4 /* HelloGLKit */, + 8BC1F6471E2022FE00B963B4 /* Products */, + 8BC1F6671E20238E00B963B4 /* Frameworks */, + ); + sourceTree = ""; + }; + 8BC1F6471E2022FE00B963B4 /* Products */ = { + isa = PBXGroup; + children = ( + 8BC1F6461E2022FE00B963B4 /* HelloGLKit.app */, + ); + name = Products; + sourceTree = ""; + }; + 8BC1F6481E2022FE00B963B4 /* HelloGLKit */ = { + isa = PBXGroup; + children = ( + 8BC1F66A1E2024C600B963B4 /* main.m */, + 8BC1F6601E20237200B963B4 /* GLRenderer.h */, + 8BC1F6611E20237200B963B4 /* GLRenderer.mm */, + 8BC1F6621E20237200B963B4 /* HelloGLKit.mm */, + 8BC1F6521E2022FE00B963B4 /* Main.storyboard */, + 8BC1F6551E2022FE00B963B4 /* Assets.xcassets */, + 8BC1F6571E2022FE00B963B4 /* LaunchScreen.storyboard */, + 8BC1F65A1E2022FE00B963B4 /* Info.plist */, + 8BC1F6491E2022FE00B963B4 /* Supporting Files */, + ); + path = HelloGLKit; + sourceTree = ""; + }; + 8BC1F6491E2022FE00B963B4 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 8BC1F6671E20238E00B963B4 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 8BC1F6681E20238F00B963B4 /* GLKit.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 8BC1F6451E2022FD00B963B4 /* HelloGLKit */ = { + isa = PBXNativeTarget; + buildConfigurationList = 8BC1F65D1E2022FE00B963B4 /* Build configuration list for PBXNativeTarget "HelloGLKit" */; + buildPhases = ( + 8BC1F6421E2022FD00B963B4 /* Sources */, + 8BC1F6431E2022FD00B963B4 /* Frameworks */, + 8BC1F6441E2022FD00B963B4 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = HelloGLKit; + productName = HelloGLKit; + productReference = 8BC1F6461E2022FE00B963B4 /* HelloGLKit.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 8BC1F63E1E2022FD00B963B4 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0800; + ORGANIZATIONNAME = "Henry Fox"; + TargetAttributes = { + 8BC1F6451E2022FD00B963B4 = { + CreatedOnToolsVersion = 8.0; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = 8BC1F6411E2022FD00B963B4 /* Build configuration list for PBXProject "HelloGLKit" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 8BC1F63D1E2022FD00B963B4; + productRefGroup = 8BC1F6471E2022FE00B963B4 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 8BC1F6451E2022FD00B963B4 /* HelloGLKit */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8BC1F6441E2022FD00B963B4 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8BC1F6591E2022FE00B963B4 /* LaunchScreen.storyboard in Resources */, + 8BC1F6561E2022FE00B963B4 /* Assets.xcassets in Resources */, + 8BC1F6541E2022FE00B963B4 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8BC1F6421E2022FD00B963B4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8BC1F6651E20237200B963B4 /* HelloGLKit.mm in Sources */, + 8BC1F66B1E2024C600B963B4 /* main.m in Sources */, + 8BC1F6641E20237200B963B4 /* GLRenderer.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 8BC1F6521E2022FE00B963B4 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 8BC1F6531E2022FE00B963B4 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 8BC1F6571E2022FE00B963B4 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 8BC1F6581E2022FE00B963B4 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 8BC1F65B1E2022FE00B963B4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 8BC1F65C1E2022FE00B963B4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 8BC1F65E1E2022FE00B963B4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = HelloGLKit/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = test.HelloGLKit; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 8BC1F65F1E2022FE00B963B4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = HelloGLKit/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = test.HelloGLKit; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 8BC1F6411E2022FD00B963B4 /* Build configuration list for PBXProject "HelloGLKit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 8BC1F65B1E2022FE00B963B4 /* Debug */, + 8BC1F65C1E2022FE00B963B4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 8BC1F65D1E2022FE00B963B4 /* Build configuration list for PBXNativeTarget "HelloGLKit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 8BC1F65E1E2022FE00B963B4 /* Debug */, + 8BC1F65F1E2022FE00B963B4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = 8BC1F63E1E2022FD00B963B4 /* Project object */; +} diff --git a/samples/HelloGLKit/HelloGLKit/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/HelloGLKit/HelloGLKit/Assets.xcassets/AppIcon.appiconset/Contents.json index 118c98f746..36d2c80d88 100644 --- a/samples/HelloGLKit/HelloGLKit/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/samples/HelloGLKit/HelloGLKit/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -29,6 +29,36 @@ "idiom" : "iphone", "size" : "60x60", "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" } ], "info" : { diff --git a/samples/HelloGLKit/HelloGLKit/Base.lproj/LaunchScreen.storyboard b/samples/HelloGLKit/HelloGLKit/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000000..fdf3f97d1b --- /dev/null +++ b/samples/HelloGLKit/HelloGLKit/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/HelloGLKit/HelloGLKit/Base.lproj/Main.storyboard b/samples/HelloGLKit/HelloGLKit/Base.lproj/Main.storyboard new file mode 100644 index 0000000000..4529698c4c --- /dev/null +++ b/samples/HelloGLKit/HelloGLKit/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/HelloOpenGL/HelloOpenGL-WinStore10.sln b/samples/HelloOpenGL/HelloOpenGL-WinStore10.sln index 67a6bb5bc3..4beebd27d9 100644 --- a/samples/HelloOpenGL/HelloOpenGL-WinStore10.sln +++ b/samples/HelloOpenGL/HelloOpenGL-WinStore10.sln @@ -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}") = "HelloOpenGL", "HelloOpenGL", "{81F1F78D-4F53-4896-B8FF-ADA8E5344AA0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HelloOpenGL", "HelloOpenGL", "{5E800129-96C4-4AFB-AD4D-72F1ED6DB21E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloOpenGL-Headers", "HelloOpenGL.vsimporter\HelloOpenGL-Headers-WinStore10\HelloOpenGL-Headers.vcxitems", "{EAE2BFFB-46EF-4AC3-94DD-D5155779B441}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloOpenGL", "HelloOpenGL.vsimporter\HelloOpenGL-WinStore10\HelloOpenGL.vcxproj", "{94BA35CD-F4E9-4B5B-BEE7-A452AB514360}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloOpenGL", "HelloOpenGL.vsimporter\HelloOpenGL-WinStore10\HelloOpenGL.vcxproj", "{5667C667-0E57-4F19-9091-01FA8737E20F}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - HelloOpenGL.vsimporter\HelloOpenGL-Headers-WinStore10\HelloOpenGL-Headers.vcxitems*{94ba35cd-f4e9-4b5b-bee7-a452ab514360}*SharedItemsImports = 4 - HelloOpenGL.vsimporter\HelloOpenGL-Headers-WinStore10\HelloOpenGL-Headers.vcxitems*{eae2bffb-46ef-4ac3-94dd-d5155779b441}*SharedItemsImports = 9 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM @@ -20,24 +16,23 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360}.Debug|ARM.ActiveCfg = Debug|ARM - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360}.Debug|ARM.Build.0 = Debug|ARM - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360}.Debug|ARM.Deploy.0 = Debug|ARM - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360}.Debug|Win32.ActiveCfg = Debug|Win32 - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360}.Debug|Win32.Build.0 = Debug|Win32 - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360}.Debug|Win32.Deploy.0 = Debug|Win32 - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360}.Release|ARM.ActiveCfg = Release|ARM - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360}.Release|ARM.Build.0 = Release|ARM - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360}.Release|ARM.Deploy.0 = Release|ARM - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360}.Release|Win32.ActiveCfg = Release|Win32 - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360}.Release|Win32.Build.0 = Release|Win32 - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360}.Release|Win32.Deploy.0 = Release|Win32 + {5667C667-0E57-4F19-9091-01FA8737E20F}.Debug|ARM.ActiveCfg = Debug|ARM + {5667C667-0E57-4F19-9091-01FA8737E20F}.Debug|ARM.Build.0 = Debug|ARM + {5667C667-0E57-4F19-9091-01FA8737E20F}.Debug|ARM.Deploy.0 = Debug|ARM + {5667C667-0E57-4F19-9091-01FA8737E20F}.Debug|Win32.ActiveCfg = Debug|Win32 + {5667C667-0E57-4F19-9091-01FA8737E20F}.Debug|Win32.Build.0 = Debug|Win32 + {5667C667-0E57-4F19-9091-01FA8737E20F}.Debug|Win32.Deploy.0 = Debug|Win32 + {5667C667-0E57-4F19-9091-01FA8737E20F}.Release|ARM.ActiveCfg = Release|ARM + {5667C667-0E57-4F19-9091-01FA8737E20F}.Release|ARM.Build.0 = Release|ARM + {5667C667-0E57-4F19-9091-01FA8737E20F}.Release|ARM.Deploy.0 = Release|ARM + {5667C667-0E57-4F19-9091-01FA8737E20F}.Release|Win32.ActiveCfg = Release|Win32 + {5667C667-0E57-4F19-9091-01FA8737E20F}.Release|Win32.Build.0 = Release|Win32 + {5667C667-0E57-4F19-9091-01FA8737E20F}.Release|Win32.Deploy.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {EAE2BFFB-46EF-4AC3-94DD-D5155779B441} = {81F1F78D-4F53-4896-B8FF-ADA8E5344AA0} - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360} = {81F1F78D-4F53-4896-B8FF-ADA8E5344AA0} + {5667C667-0E57-4F19-9091-01FA8737E20F} = {5E800129-96C4-4AFB-AD4D-72F1ED6DB21E} EndGlobalSection EndGlobal diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-Headers-WinStore10/HelloOpenGL-Headers.vcxitems b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-Headers-WinStore10/HelloOpenGL-Headers.vcxitems deleted file mode 100644 index a0f543b622..0000000000 --- a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-Headers-WinStore10/HelloOpenGL-Headers.vcxitems +++ /dev/null @@ -1,16 +0,0 @@ - - - - true - HelloOpenGL_Headers - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - {EAE2BFFB-46EF-4AC3-94DD-D5155779B441} - {9E2C6BF8-2155-4B61-8D50-167249C10C1D} - - - - - - - - diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-Headers-WinStore10/HelloOpenGL-Headers.vcxitems.filters b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-Headers-WinStore10/HelloOpenGL-Headers.vcxitems.filters deleted file mode 100644 index 723c6d2847..0000000000 --- a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-Headers-WinStore10/HelloOpenGL-Headers.vcxitems.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {E06C9FA9-436B-452E-9C46-9AEDD99B6CB7} - - - - - HelloOpenGL - - - diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/App.xaml b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/App.xaml new file mode 100644 index 0000000000..80d1ea8d02 --- /dev/null +++ b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/App.xaml @@ -0,0 +1,8 @@ + + + diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/App.xaml.cpp b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/App.xaml.cpp new file mode 100644 index 0000000000..5263a8f8e2 --- /dev/null +++ b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/App.xaml.cpp @@ -0,0 +1,90 @@ +// +// App.xaml.cpp +// Implementation of the App class. +// + +// clang-format off + +#include "pch.h" + +using namespace HelloOpenGL; + +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; + +/// +/// 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(). +/// +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 + +/// +/// 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. +/// +/// Details about the launch request and process. +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 + +/// +/// 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. +/// +/// The source of the suspend request. +/// Details about the suspend request. +void App::OnSuspending(Object^ /*sender*/, SuspendingEventArgs^ /*e*/) { + // TODO: Save application state and stop any background activity +} + +/// +/// Invoked when Navigation to a certain page fails +/// +/// The Frame which failed navigation +/// Details about the navigation failure +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 diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/App.xaml.h b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/App.xaml.h new file mode 100644 index 0000000000..f06030137e --- /dev/null +++ b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/App.xaml.h @@ -0,0 +1,33 @@ +// +// App.xaml.h +// Declaration of the App class. +// + +// clang-format off +#pragma once + +#include "App.g.h" + +namespace HelloOpenGL { +/// +/// Provides application-specific behavior to supplement the default Application class. +/// +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 diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL-Debug-xcvars.txt b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL-Debug-xcvars.txt index c57807ec60..7fac8a44fb 100644 --- a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL-Debug-xcvars.txt +++ b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL-Debug-xcvars.txt @@ -1,6 +1,4 @@ -ALLUSERSPROFILE = C:\ProgramData ALWAYS_SEARCH_USER_PATHS = NO -APPDATA = C:\Users\brianker.REDMOND\AppData\Roaming APPFOLDER = sbuild/Debug-iphoneos/HelloOpenGL.app ARCHS = msvc ARCHS_STANDARD = armv6 @@ -10,6 +8,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = BUILD_DIR = sbuild BUILT_PRODUCTS_DIR = sbuild/Debug-iphoneos +CLANG_ANALYZER_NONNULL = YES CLANG_CXX_LANGUAGE_STANDARD = gnu++0x CLANG_CXX_LIBRARY = libc++ CLANG_ENABLE_MODULES = YES @@ -17,48 +16,36 @@ CLANG_ENABLE_OBJC_ARC = YES CLANG_WARN_BOOL_CONVERSION = YES CLANG_WARN_CONSTANT_CONVERSION = YES CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN_DOCUMENTATION_COMMENTS = YES CLANG_WARN_EMPTY_BODY = YES CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES CLANG_WARN_INT_CONVERSION = YES CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_SUSPICIOUS_MOVES = YES CLANG_WARN_UNREACHABLE_CODE = YES CLANG_WARN__DUPLICATE_METHOD_MATCH = YES CODESIGNING_FOLDER_PATH = sbuild/Debug-iphoneos/HelloOpenGL.app CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer -COMPUTERNAME = TRANQUIL CONFIGURATION = Debug CONFIGURATION_BUILD_DIR = sbuild/Debug-iphoneos CONFIGURATION_TEMP_DIR = sbuild/HelloOpenGL.sbuild/Debug-iphoneos COPY_PHASE_STRIP = NO CURRENT_ARCH = msvc -CYGWIN = nodosfilewarning -ComSpec = C:\Windows\system32\cmd.exe -CommonProgramFiles = C:\Program Files (x86)\Common Files -CommonProgramFiles(x86) = C:\Program Files (x86)\Common Files -CommonProgramW6432 = C:\Program Files\Common Files DEAD_CODE_STRIPPING = YES -DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +DEBUG_INFORMATION_FORMAT = dwarf DERIVED_FILES_DIR = sbuild/HelloOpenGL.sbuild/Debug-iphoneos/HelloOpenGL.sbuild/DerivedSources DERIVED_FILE_DIR = sbuild/HelloOpenGL.sbuild/Debug-iphoneos/HelloOpenGL.sbuild/DerivedSources DERIVED_SOURCES_DIR = sbuild/HelloOpenGL.sbuild/Debug-iphoneos/HelloOpenGL.sbuild/DerivedSources -DNX_HOME = %USERPROFILE%\.dnx -DevEnvDir = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\ EFFECTIVE_PLATFORM_NAME = -iphoneos ENABLE_STRICT_OBJC_MSGSEND = YES ENABLE_TESTABILITY = YES -EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = *.nib *.lproj *.framework *.gch (*) .DS_Store CVS .svn .git .hg *.xcodeproj *.xcode *.pbproj *.pbxproj +EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = *.nib *.lproj *.framework *.gch (*) .DS_Store CVS .svn .git .hg *.xcodeproj *.xcode *.pbproj *.pbxproj *.xcassets EXECUTABLE_FOLDER_PATH = HelloOpenGL.app EXECUTABLE_NAME = HelloOpenGL EXECUTABLE_PATH = HelloOpenGL.app/HelloOpenGL -ExtensionSdkDir = C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs FRAMEWORK_SEARCH_PATHS = -FSHARPINSTALLDIR = C:\Program Files (x86)\Microsoft SDKs\F#\4.0\Framework\v4.0\ FULL_PRODUCT_NAME = HelloOpenGL.app -Framework40Version = v4.0 -FrameworkDIR32 = C:\Windows\Microsoft.NET\Framework\ -FrameworkDir = C:\Windows\Microsoft.NET\Framework\ -FrameworkVersion = v4.0.30319 -FrameworkVersion32 = v4.0.30319 GCC_C_LANGUAGE_STANDARD = gnu99 GCC_DYNAMIC_NO_PIC = NO GCC_NO_COMMON_BLOCKS = YES @@ -78,110 +65,49 @@ HEADERMAP_INCLUDES_FLAT_ENTRIES_FOR_TARGET_BEING_BUILT = YES HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = YES HEADERMAP_INCLUDES_PROJECT_HEADERS = YES HEADER_SEARCH_PATHS = -HOME = C:\Users\brianker.REDMOND -HOMEDRIVE = C: -HOMEPATH = \Users\brianker.REDMOND -INCLUDE = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\ucrt;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\include\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\winrt; INFOPLIST_FILE = HelloOpenGL/Info.plist INFOPLIST_PATH = HelloOpenGL.app/Info.plist -IPHONEOS_DEPLOYMENT_TARGET = 9.0 +IPHONEOS_DEPLOYMENT_TARGET = 10.0 LD_NO_PIE = NO LD_RUNPATH_SEARCH_PATHS = @executable_path/Frameworks -LIB = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10586.0\ucrt\x86;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\lib\um\x86;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10586.0\um\x86; -LIBPATH = C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\UnionMetadata;C:\Program Files (x86)\Windows Kits\10\References;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.FoundationContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\indows.Networking.Connectivity.WwanContract\1.0.0.0;C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral; LIBRARY_SEARCH_PATHS = -LIBS = objcrt.lib;Starboard.lib;Foundation.lib;CoreFoundation.lib;UIKit.lib;libdispatch.lib LINK_FILE_LIST = sbuild/HelloOpenGL.sbuild/Debug-iphoneos/HelloOpenGL.sbuild/Objects/msvc/HelloOpenGL.LinkFileList LINK_WITH_STANDARD_LIBRARIES = NO -LOCALAPPDATA = C:\Users\brianker.REDMOND\AppData\Local LOCALIZED_RESOURCES_FOLDER_PATH = HelloOpenGL.app/English.lproj -LOGONSERVER = \\TK5-RED-DC-08 MTL_ENABLE_DEBUG_INFO = YES -NETFXSDKDir = C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\ -NUMBER_OF_PROCESSORS = 8 OBJECT_FILE_DIR = sbuild/HelloOpenGL.sbuild/Debug-iphoneos/HelloOpenGL.sbuild/Objects/msvc OBJROOT = sbuild ONLY_ACTIVE_ARCH = YES -OS = Windows_NT OTHER_CFLAGS = OTHER_CPLUSPLUSFLAGS = OTHER_LDFLAGS = -PASSED = TRUE -PATHEXT = .COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC PLATFORM_NAME = iphoneos PRIVATE_HEADERS_FOLDER_PATH = HelloOpenGL.app/Private -PROCESSOR_ARCHITECTURE = x86 -PROCESSOR_ARCHITEW6432 = AMD64 -PROCESSOR_IDENTIFIER = Intel64 Family 6 Model 45 Stepping 7, GenuineIntel -PROCESSOR_LEVEL = 6 -PROCESSOR_REVISION = 2d07 -PRODUCT_BUNDLE_IDENTIFIER = com.Microsoft.HelloOpenGL +PRODUCT_BUNDLE_IDENTIFIER = test.HelloOpenGL PRODUCT_NAME = HelloOpenGL PRODUCT_TYPE = com.apple.product-type.application PROJECT = HelloOpenGL -PROJECT_DIR = D:/devel/WinObjC/samples/HelloOpenGL -PROJECT_FILE_PATH = D:\devel\WinObjC\samples\HelloOpenGL\HelloOpenGL.xcodeproj +PROJECT_DIR = E:/island/github/henryfox/WinObjC/samples/HelloOpenGL +PROJECT_FILE_PATH = E:\island\github\henryfox\WinObjC\samples\HelloOpenGL\HelloOpenGL.xcodeproj PROJECT_NAME = HelloOpenGL PROJECT_TEMP_DIR = sbuild/HelloOpenGL.sbuild PROJECT_TEMP_ROOT = sbuild -PROMPT = $P$G -PSModulePath = C:\Program Files\WindowsPowerShell\Modules;C:\Windows\system32\WindowsPowerShell\v1.0\Modules -PUBLIC = C:\Users\Public PUBLIC_HEADERS_FOLDER_PATH = HelloOpenGL.app/Public -Path = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\4.0\Framework\v4.0\;C:\Program Files (x86)\MSBuild\14.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\ATI Technologies\ATI.ACE\Core-Static;C:\Users\brianker.REDMOND\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\bin;c:\bin\bin;C:\bin\emacs-24.4\bin;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Program Files (x86)\Git\bin;D:\WinObjC\bin;C:\Users\brianker.REDMOND\.dnx\bin -ProgramData = C:\ProgramData -ProgramFiles = C:\Program Files (x86) -ProgramFiles(x86) = C:\Program Files (x86) -ProgramW6432 = C:\Program Files -SDKROOT = D:\WinObjC\bin/.. -SESSIONNAME = Console -SOURCE_ROOT = D:/devel/WinObjC/samples/HelloOpenGL -SRCROOT = D:/devel/WinObjC/samples/HelloOpenGL +SDKROOT = E:/island/github/henryfox/WinObjC +SOURCE_ROOT = E:/island/github/henryfox/WinObjC/samples/HelloOpenGL +SRCROOT = E:/island/github/henryfox/WinObjC/samples/HelloOpenGL SYMROOT = sbuild -SYSTEMTYPE = other -SystemDrive = C: -SystemRoot = C:\Windows +TARGETED_DEVICE_FAMILY = 1,2 TARGETNAME = HelloOpenGL TARGET_BUILD_DIR = sbuild/Debug-iphoneos TARGET_NAME = HelloOpenGL TARGET_SDKVERSION = 5.0 TARGET_TEMP_DIR = sbuild/HelloOpenGL.sbuild/Debug-iphoneos/HelloOpenGL.sbuild -TEMP = C:\Users\BRIANK~1.RED\AppData\Local\Temp TEMP_DIR = sbuild/HelloOpenGL.sbuild/Debug-iphoneos/HelloOpenGL.sbuild -TESTFILES = test_src\GLKit\GLKitTest.mm -TESTNAME = GLKit -TMP = C:\Users\BRIANK~1.RED\AppData\Local\Temp -UATDATA = C:\Windows\CCM\UATData\D9F8C395-CAB8-491d-B8AC-179A1FE1BE77 -UCRTVersion = 10.0.10586.0 UNLOCALIZED_RESOURCES_FOLDER_PATH = HelloOpenGL.app -USER = brianker -USERDNSDOMAIN = REDMOND.CORP.MICROSOFT.COM -USERDOMAIN = REDMOND -USERDOMAIN_ROAMINGPROFILE = REDMOND -USERNAME = brianker -USERPROFILE = C:\Users\brianker.REDMOND +USER = henryfox USER_HEADER_SEARCH_PATHS = USE_HEADERMAP = YES -UniversalCRTSdkDir = C:\Program Files (x86)\Windows Kits\10\ -VCINSTALLDIR = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ -VS110COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\ -VS120COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\ -VS140COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\ -VSIMPORTER_BINARY_DIR = D:\WinObjC\bin -VSIMPORTER_INTERACTIVE = NO -VSIMPORTER_OUTPUT_DIR = D:\devel\WinObjC\samples\HelloOpenGL//HelloOpenGL.vsimporter -VSIMPORTER_OUTPUT_FORMAT = WinStore10 -VSIMPORTER_TEMPLATES_DIR = D:\WinObjC\bin/../msvc/vsimporter-templates -VSINSTALLDIR = C:\Program Files (x86)\Microsoft Visual Studio 14.0\ -VSSDK140Install = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\ -VisualStudioVersion = 14.0 WARNING_CFLAGS = WARNING_LDFLAGS = -WINOBJC_SDK_ROOT = D:\WinObjC\bin/.. -WindowsLibPath = C:\Program Files (x86)\Windows Kits\10\UnionMetadata;C:\Program Files (x86)\Windows Kits\10\References;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.FoundationContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\indows.Networking.Connectivity.WwanContract\1.0.0.0 -WindowsSDKLibVersion = 10.0.10586.0\ -WindowsSDKVersion = 10.0.10586.0\ -WindowsSDK_ExecutablePath_x64 = C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\x64\ -WindowsSDK_ExecutablePath_x86 = C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\ -WindowsSdkDir = C:\Program Files (x86)\Windows Kits\10\ -windir = C:\Windows +WINOBJC_SDK_ROOT = E:/island/github/henryfox/WinObjC diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL-Release-xcvars.txt b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL-Release-xcvars.txt index 55ddfd4ae1..7f81d670b9 100644 --- a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL-Release-xcvars.txt +++ b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL-Release-xcvars.txt @@ -1,6 +1,4 @@ -ALLUSERSPROFILE = C:\ProgramData ALWAYS_SEARCH_USER_PATHS = NO -APPDATA = C:\Users\brianker.REDMOND\AppData\Roaming APPFOLDER = sbuild/Release-iphoneos/HelloOpenGL.app ARCHS = msvc ARCHS_STANDARD = armv6 @@ -10,6 +8,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = BUILD_DIR = sbuild BUILT_PRODUCTS_DIR = sbuild/Release-iphoneos +CLANG_ANALYZER_NONNULL = YES CLANG_CXX_LANGUAGE_STANDARD = gnu++0x CLANG_CXX_LIBRARY = libc++ CLANG_ENABLE_MODULES = YES @@ -17,48 +16,36 @@ CLANG_ENABLE_OBJC_ARC = YES CLANG_WARN_BOOL_CONVERSION = YES CLANG_WARN_CONSTANT_CONVERSION = YES CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN_DOCUMENTATION_COMMENTS = YES CLANG_WARN_EMPTY_BODY = YES CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES CLANG_WARN_INT_CONVERSION = YES CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_SUSPICIOUS_MOVES = YES CLANG_WARN_UNREACHABLE_CODE = YES CLANG_WARN__DUPLICATE_METHOD_MATCH = YES CODESIGNING_FOLDER_PATH = sbuild/Release-iphoneos/HelloOpenGL.app CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer -COMPUTERNAME = TRANQUIL CONFIGURATION = Release CONFIGURATION_BUILD_DIR = sbuild/Release-iphoneos CONFIGURATION_TEMP_DIR = sbuild/HelloOpenGL.sbuild/Release-iphoneos COPY_PHASE_STRIP = NO CURRENT_ARCH = msvc -CYGWIN = nodosfilewarning -ComSpec = C:\Windows\system32\cmd.exe -CommonProgramFiles = C:\Program Files (x86)\Common Files -CommonProgramFiles(x86) = C:\Program Files (x86)\Common Files -CommonProgramW6432 = C:\Program Files\Common Files DEAD_CODE_STRIPPING = YES DEBUG_INFORMATION_FORMAT = dwarf-with-dsym DERIVED_FILES_DIR = sbuild/HelloOpenGL.sbuild/Release-iphoneos/HelloOpenGL.sbuild/DerivedSources DERIVED_FILE_DIR = sbuild/HelloOpenGL.sbuild/Release-iphoneos/HelloOpenGL.sbuild/DerivedSources DERIVED_SOURCES_DIR = sbuild/HelloOpenGL.sbuild/Release-iphoneos/HelloOpenGL.sbuild/DerivedSources -DNX_HOME = %USERPROFILE%\.dnx -DevEnvDir = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\ EFFECTIVE_PLATFORM_NAME = -iphoneos ENABLE_NS_ASSERTIONS = NO ENABLE_STRICT_OBJC_MSGSEND = YES -EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = *.nib *.lproj *.framework *.gch (*) .DS_Store CVS .svn .git .hg *.xcodeproj *.xcode *.pbproj *.pbxproj +EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = *.nib *.lproj *.framework *.gch (*) .DS_Store CVS .svn .git .hg *.xcodeproj *.xcode *.pbproj *.pbxproj *.xcassets EXECUTABLE_FOLDER_PATH = HelloOpenGL.app EXECUTABLE_NAME = HelloOpenGL EXECUTABLE_PATH = HelloOpenGL.app/HelloOpenGL -ExtensionSdkDir = C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs FRAMEWORK_SEARCH_PATHS = -FSHARPINSTALLDIR = C:\Program Files (x86)\Microsoft SDKs\F#\4.0\Framework\v4.0\ FULL_PRODUCT_NAME = HelloOpenGL.app -Framework40Version = v4.0 -FrameworkDIR32 = C:\Windows\Microsoft.NET\Framework\ -FrameworkDir = C:\Windows\Microsoft.NET\Framework\ -FrameworkVersion = v4.0.30319 -FrameworkVersion32 = v4.0.30319 GCC_C_LANGUAGE_STANDARD = gnu99 GCC_DYNAMIC_NO_PIC = NO GCC_NO_COMMON_BLOCKS = YES @@ -78,110 +65,49 @@ HEADERMAP_INCLUDES_FLAT_ENTRIES_FOR_TARGET_BEING_BUILT = YES HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = YES HEADERMAP_INCLUDES_PROJECT_HEADERS = YES HEADER_SEARCH_PATHS = -HOME = C:\Users\brianker.REDMOND -HOMEDRIVE = C: -HOMEPATH = \Users\brianker.REDMOND -INCLUDE = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\ucrt;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\include\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\shared;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\um;C:\Program Files (x86)\Windows Kits\10\include\10.0.10586.0\winrt; INFOPLIST_FILE = HelloOpenGL/Info.plist INFOPLIST_PATH = HelloOpenGL.app/Info.plist -IPHONEOS_DEPLOYMENT_TARGET = 9.0 +IPHONEOS_DEPLOYMENT_TARGET = 10.0 LD_NO_PIE = NO LD_RUNPATH_SEARCH_PATHS = @executable_path/Frameworks -LIB = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10586.0\ucrt\x86;C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\lib\um\x86;C:\Program Files (x86)\Windows Kits\10\lib\10.0.10586.0\um\x86; -LIBPATH = C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\10\UnionMetadata;C:\Program Files (x86)\Windows Kits\10\References;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.FoundationContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\indows.Networking.Connectivity.WwanContract\1.0.0.0;C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral; LIBRARY_SEARCH_PATHS = -LIBS = objcrt.lib;Starboard.lib;Foundation.lib;CoreFoundation.lib;UIKit.lib;libdispatch.lib LINK_FILE_LIST = sbuild/HelloOpenGL.sbuild/Release-iphoneos/HelloOpenGL.sbuild/Objects/msvc/HelloOpenGL.LinkFileList LINK_WITH_STANDARD_LIBRARIES = NO -LOCALAPPDATA = C:\Users\brianker.REDMOND\AppData\Local LOCALIZED_RESOURCES_FOLDER_PATH = HelloOpenGL.app/English.lproj -LOGONSERVER = \\TK5-RED-DC-08 MTL_ENABLE_DEBUG_INFO = NO -NETFXSDKDir = C:\Program Files (x86)\Windows Kits\NETFXSDK\4.6\ -NUMBER_OF_PROCESSORS = 8 OBJECT_FILE_DIR = sbuild/HelloOpenGL.sbuild/Release-iphoneos/HelloOpenGL.sbuild/Objects/msvc OBJROOT = sbuild -OS = Windows_NT OTHER_CFLAGS = OTHER_CPLUSPLUSFLAGS = OTHER_LDFLAGS = -PASSED = TRUE -PATHEXT = .COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC PLATFORM_NAME = iphoneos PRIVATE_HEADERS_FOLDER_PATH = HelloOpenGL.app/Private -PROCESSOR_ARCHITECTURE = x86 -PROCESSOR_ARCHITEW6432 = AMD64 -PROCESSOR_IDENTIFIER = Intel64 Family 6 Model 45 Stepping 7, GenuineIntel -PROCESSOR_LEVEL = 6 -PROCESSOR_REVISION = 2d07 -PRODUCT_BUNDLE_IDENTIFIER = com.Microsoft.HelloOpenGL +PRODUCT_BUNDLE_IDENTIFIER = test.HelloOpenGL PRODUCT_NAME = HelloOpenGL PRODUCT_TYPE = com.apple.product-type.application PROJECT = HelloOpenGL -PROJECT_DIR = D:/devel/WinObjC/samples/HelloOpenGL -PROJECT_FILE_PATH = D:\devel\WinObjC\samples\HelloOpenGL\HelloOpenGL.xcodeproj +PROJECT_DIR = E:/island/github/henryfox/WinObjC/samples/HelloOpenGL +PROJECT_FILE_PATH = E:\island\github\henryfox\WinObjC\samples\HelloOpenGL\HelloOpenGL.xcodeproj PROJECT_NAME = HelloOpenGL PROJECT_TEMP_DIR = sbuild/HelloOpenGL.sbuild PROJECT_TEMP_ROOT = sbuild -PROMPT = $P$G -PSModulePath = C:\Program Files\WindowsPowerShell\Modules;C:\Windows\system32\WindowsPowerShell\v1.0\Modules -PUBLIC = C:\Users\Public PUBLIC_HEADERS_FOLDER_PATH = HelloOpenGL.app/Public -Path = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft SDKs\F#\4.0\Framework\v4.0\;C:\Program Files (x86)\MSBuild\14.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\ATI Technologies\ATI.ACE\Core-Static;C:\Users\brianker.REDMOND\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\bin;c:\bin\bin;C:\bin\emacs-24.4\bin;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Program Files (x86)\Git\bin;D:\WinObjC\bin;C:\Users\brianker.REDMOND\.dnx\bin -ProgramData = C:\ProgramData -ProgramFiles = C:\Program Files (x86) -ProgramFiles(x86) = C:\Program Files (x86) -ProgramW6432 = C:\Program Files -SDKROOT = D:\WinObjC\bin/.. -SESSIONNAME = Console -SOURCE_ROOT = D:/devel/WinObjC/samples/HelloOpenGL -SRCROOT = D:/devel/WinObjC/samples/HelloOpenGL +SDKROOT = E:/island/github/henryfox/WinObjC +SOURCE_ROOT = E:/island/github/henryfox/WinObjC/samples/HelloOpenGL +SRCROOT = E:/island/github/henryfox/WinObjC/samples/HelloOpenGL SYMROOT = sbuild -SYSTEMTYPE = other -SystemDrive = C: -SystemRoot = C:\Windows +TARGETED_DEVICE_FAMILY = 1,2 TARGETNAME = HelloOpenGL TARGET_BUILD_DIR = sbuild/Release-iphoneos TARGET_NAME = HelloOpenGL TARGET_SDKVERSION = 5.0 TARGET_TEMP_DIR = sbuild/HelloOpenGL.sbuild/Release-iphoneos/HelloOpenGL.sbuild -TEMP = C:\Users\BRIANK~1.RED\AppData\Local\Temp TEMP_DIR = sbuild/HelloOpenGL.sbuild/Release-iphoneos/HelloOpenGL.sbuild -TESTFILES = test_src\GLKit\GLKitTest.mm -TESTNAME = GLKit -TMP = C:\Users\BRIANK~1.RED\AppData\Local\Temp -UATDATA = C:\Windows\CCM\UATData\D9F8C395-CAB8-491d-B8AC-179A1FE1BE77 -UCRTVersion = 10.0.10586.0 UNLOCALIZED_RESOURCES_FOLDER_PATH = HelloOpenGL.app -USER = brianker -USERDNSDOMAIN = REDMOND.CORP.MICROSOFT.COM -USERDOMAIN = REDMOND -USERDOMAIN_ROAMINGPROFILE = REDMOND -USERNAME = brianker -USERPROFILE = C:\Users\brianker.REDMOND +USER = henryfox USER_HEADER_SEARCH_PATHS = USE_HEADERMAP = YES -UniversalCRTSdkDir = C:\Program Files (x86)\Windows Kits\10\ VALIDATE_PRODUCT = YES -VCINSTALLDIR = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\ -VS110COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\ -VS120COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\ -VS140COMNTOOLS = C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\ -VSIMPORTER_BINARY_DIR = D:\WinObjC\bin -VSIMPORTER_INTERACTIVE = NO -VSIMPORTER_OUTPUT_DIR = D:\devel\WinObjC\samples\HelloOpenGL//HelloOpenGL.vsimporter -VSIMPORTER_OUTPUT_FORMAT = WinStore10 -VSIMPORTER_TEMPLATES_DIR = D:\WinObjC\bin/../msvc/vsimporter-templates -VSINSTALLDIR = C:\Program Files (x86)\Microsoft Visual Studio 14.0\ -VSSDK140Install = C:\Program Files (x86)\Microsoft Visual Studio 14.0\VSSDK\ -VisualStudioVersion = 14.0 WARNING_CFLAGS = WARNING_LDFLAGS = -WINOBJC_SDK_ROOT = D:\WinObjC\bin/.. -WindowsLibPath = C:\Program Files (x86)\Windows Kits\10\UnionMetadata;C:\Program Files (x86)\Windows Kits\10\References;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.UniversalApiContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\Windows.Foundation.FoundationContract\1.0.0.0;C:\Program Files (x86)\Windows Kits\10\References\indows.Networking.Connectivity.WwanContract\1.0.0.0 -WindowsSDKLibVersion = 10.0.10586.0\ -WindowsSDKVersion = 10.0.10586.0\ -WindowsSDK_ExecutablePath_x64 = C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\x64\ -WindowsSDK_ExecutablePath_x86 = C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\ -WindowsSdkDir = C:\Program Files (x86)\Windows Kits\10\ -windir = C:\Windows +WINOBJC_SDK_ROOT = E:/island/github/henryfox/WinObjC diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj index b5de166dc9..b2a23761a1 100644 --- a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj +++ b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj @@ -1,4 +1,4 @@ - + @@ -20,7 +20,6 @@ HelloOpenGL - HelloOpenGL en-US 14.0 true @@ -29,8 +28,10 @@ true 10.0.14393.0 10.0.10586.0 - {94BA35CD-F4E9-4B5B-BEE7-A452AB514360} - ..\..\..\.. + IslandwoodProj + {5667C667-0E57-4F19-9091-01FA8737E20F} + HelloOpenGL + ..\..\..\.. @@ -38,7 +39,7 @@ v140 HelloOpenGL - + Application v140 HelloOpenGL @@ -46,39 +47,38 @@ Application v140 - HelloOpenGL true true + HelloOpenGL - + Application v140 - HelloOpenGL true true + HelloOpenGL - - - + - + - + HelloOpenGL_TemporaryKey.pfx + D095ED4071F7A0D93085697ECF15F78E76342CCF @@ -86,17 +86,20 @@ 4453;28204 MultiThreadedDebugDLL - - true - %(AdditionalDependencies);OpenGLES.lib - + MultiThreadedDebugDLL + *.nib;*.lproj;*.framework;*.gch;(*);.DS_Store;CVS;.svn;.git;.hg;*.xcodeproj;*.xcode;*.pbproj;*.pbxproj;*.xcassets Project + $(SolutionPublicHeadersDir) true + true Disabled DEBUG=1 - MultiThreadedDebugDLL + + true + %(AdditionalDependencies) + true @@ -107,17 +110,20 @@ 4453;28204 MultiThreadedDebugDLL - - true - %(AdditionalDependencies);OpenGLES.lib - + MultiThreadedDebugDLL + *.nib;*.lproj;*.framework;*.gch;(*);.DS_Store;CVS;.svn;.git;.hg;*.xcodeproj;*.xcode;*.pbproj;*.pbxproj;*.xcassets Project + $(SolutionPublicHeadersDir) true + true Disabled DEBUG=1 - MultiThreadedDebugDLL + + true + %(AdditionalDependencies) + true @@ -126,18 +132,19 @@ /bigobj %(AdditionalOptions) 4453;28204 - MultiThreadedDLL - - true - OpenGLES.lib;%(AdditionalDependencies) - + *.nib;*.lproj;*.framework;*.gch;(*);.DS_Store;CVS;.svn;.git;.hg;*.xcodeproj;*.xcode;*.pbproj;*.pbxproj;*.xcassets Project + $(SolutionPublicHeadersDir) true + true MinSpace - MultiThreadedDLL + + true + %(AdditionalDependencies) + true @@ -146,26 +153,33 @@ /bigobj %(AdditionalOptions) 4453;28204 - MultiThreadedDLL - - true - OpenGLES.lib;%(AdditionalDependencies) - + *.nib;*.lproj;*.framework;*.gch;(*);.DS_Store;CVS;.svn;.git;.hg;*.xcodeproj;*.xcode;*.pbproj;*.pbxproj;*.xcassets Project + $(SolutionPublicHeadersDir) true + true MinSpace - MultiThreadedDLL + + true + %(AdditionalDependencies) + true + + + Designer + + Designer + @@ -174,16 +188,23 @@ + + + - - false false HelloOpenGL-Debug-xcvars.txt HelloOpenGL-Release-xcvars.txt + + Base.lproj + + + Base.lproj + false @@ -192,10 +213,22 @@ - + + + App.xaml + + + + + App.xaml + + + Create + + - \ No newline at end of file + diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj.filters b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj.filters index 88d660da7c..5279cfcbc0 100644 --- a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj.filters +++ b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj.filters @@ -1,23 +1,26 @@ - + - {dc18f23a-ecc1-422e-9809-084b712c77ab} + {60d15db9-65d6-4d10-a0d2-79a35a4ccbb4} - {1a648546-198b-4914-92d5-15dfff250034} + {9452999f-8c71-472d-a8c7-f642727a6f01} - {6A4A98C5-A3A2-4167-A205-B9A62A2BA166} + {EF64643C-2004-4E62-9C12-0A66B0216509} - - {BC0192E6-9063-4F9A-B4EB-BF92BC9E8AE4} + + {59C38EDD-8B7E-4215-A946-0214EA2871E6} - {D4043FF0-41D8-4DAB-8C7B-28FDB36781DE} + {268C280C-3AA2-4B60-AA20-FFF5F1217653} + + + Assets @@ -39,19 +42,28 @@ Assets + + HelloOpenGL + + + HelloOpenGL + + + HelloOpenGL + HelloOpenGL - HelloOpenGL\Supporting Files - - HelloOpenGL - - HelloOpenGL - + + HelloOpenGL\Base + + + HelloOpenGL\Base + Xcode Variable Files @@ -59,13 +71,4 @@ Xcode Variable Files - - - - - - - - - - \ No newline at end of file + diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/Package.appxmanifest b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/Package.appxmanifest index 7a1e964964..a22ff25bf2 100644 --- a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/Package.appxmanifest +++ b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/Package.appxmanifest @@ -7,15 +7,15 @@ IgnorableNamespaces="uap mp"> - + HelloOpenGL - brianker + henryfox Assets\StoreLogo.png @@ -24,7 +24,7 @@ - + diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/pch.cpp b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/pch.cpp new file mode 100644 index 0000000000..01484ff5aa --- /dev/null +++ b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/pch.cpp @@ -0,0 +1,6 @@ +// +// pch.cpp +// Include the standard header and generate the precompiled header. +// + +#include "pch.h" diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/pch.h b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/pch.h new file mode 100644 index 0000000000..2c4354dd11 --- /dev/null +++ b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/pch.h @@ -0,0 +1,11 @@ +// +// pch.h +// Header for standard system include files. +// + +#pragma once + +#include +#include + +#include "App.xaml.h" diff --git a/samples/HelloOpenGL/HelloOpenGL.xcodeproj/project.pbxproj b/samples/HelloOpenGL/HelloOpenGL.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..194c3ca77b --- /dev/null +++ b/samples/HelloOpenGL/HelloOpenGL.xcodeproj/project.pbxproj @@ -0,0 +1,307 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 8B26EDDE1E203B76006ABFA6 /* HelloOpenGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B26EDDA1E203B76006ABFA6 /* HelloOpenGL.m */; }; + 8B26EDDF1E203B76006ABFA6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B26EDDB1E203B76006ABFA6 /* main.m */; }; + 8B26EDE01E203B76006ABFA6 /* OpenGLES20Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B26EDDD1E203B76006ABFA6 /* OpenGLES20Controller.m */; }; + 8BEC89D11E2026980002F77A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8BEC89CF1E2026980002F77A /* Main.storyboard */; }; + 8BEC89D31E2026980002F77A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8BEC89D21E2026980002F77A /* Assets.xcassets */; }; + 8BEC89D61E2026980002F77A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8BEC89D41E2026980002F77A /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 8B26EDDA1E203B76006ABFA6 /* HelloOpenGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelloOpenGL.m; sourceTree = ""; }; + 8B26EDDB1E203B76006ABFA6 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 8B26EDDC1E203B76006ABFA6 /* OpenGLES20Controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenGLES20Controller.h; sourceTree = ""; }; + 8B26EDDD1E203B76006ABFA6 /* OpenGLES20Controller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OpenGLES20Controller.m; sourceTree = ""; }; + 8BEC89C31E2026970002F77A /* HelloOpenGL.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloOpenGL.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 8BEC89D01E2026980002F77A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 8BEC89D21E2026980002F77A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 8BEC89D51E2026980002F77A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 8BEC89D71E2026980002F77A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 8BEC89C01E2026970002F77A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 8BEC89BA1E2026970002F77A = { + isa = PBXGroup; + children = ( + 8BEC89C51E2026970002F77A /* HelloOpenGL */, + 8BEC89C41E2026970002F77A /* Products */, + ); + sourceTree = ""; + }; + 8BEC89C41E2026970002F77A /* Products */ = { + isa = PBXGroup; + children = ( + 8BEC89C31E2026970002F77A /* HelloOpenGL.app */, + ); + name = Products; + sourceTree = ""; + }; + 8BEC89C51E2026970002F77A /* HelloOpenGL */ = { + isa = PBXGroup; + children = ( + 8B26EDDA1E203B76006ABFA6 /* HelloOpenGL.m */, + 8B26EDDB1E203B76006ABFA6 /* main.m */, + 8B26EDDC1E203B76006ABFA6 /* OpenGLES20Controller.h */, + 8B26EDDD1E203B76006ABFA6 /* OpenGLES20Controller.m */, + 8BEC89CF1E2026980002F77A /* Main.storyboard */, + 8BEC89D21E2026980002F77A /* Assets.xcassets */, + 8BEC89D41E2026980002F77A /* LaunchScreen.storyboard */, + 8BEC89D71E2026980002F77A /* Info.plist */, + ); + path = HelloOpenGL; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 8BEC89C21E2026970002F77A /* HelloOpenGL */ = { + isa = PBXNativeTarget; + buildConfigurationList = 8BEC89DA1E2026980002F77A /* Build configuration list for PBXNativeTarget "HelloOpenGL" */; + buildPhases = ( + 8BEC89BF1E2026970002F77A /* Sources */, + 8BEC89C01E2026970002F77A /* Frameworks */, + 8BEC89C11E2026970002F77A /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = HelloOpenGL; + productName = HelloOpenGL; + productReference = 8BEC89C31E2026970002F77A /* HelloOpenGL.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 8BEC89BB1E2026970002F77A /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0800; + ORGANIZATIONNAME = "Henry Fox"; + TargetAttributes = { + 8BEC89C21E2026970002F77A = { + CreatedOnToolsVersion = 8.0; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = 8BEC89BE1E2026970002F77A /* Build configuration list for PBXProject "HelloOpenGL" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 8BEC89BA1E2026970002F77A; + productRefGroup = 8BEC89C41E2026970002F77A /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 8BEC89C21E2026970002F77A /* HelloOpenGL */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8BEC89C11E2026970002F77A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8BEC89D61E2026980002F77A /* LaunchScreen.storyboard in Resources */, + 8BEC89D31E2026980002F77A /* Assets.xcassets in Resources */, + 8BEC89D11E2026980002F77A /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8BEC89BF1E2026970002F77A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8B26EDDF1E203B76006ABFA6 /* main.m in Sources */, + 8B26EDDE1E203B76006ABFA6 /* HelloOpenGL.m in Sources */, + 8B26EDE01E203B76006ABFA6 /* OpenGLES20Controller.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 8BEC89CF1E2026980002F77A /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 8BEC89D01E2026980002F77A /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 8BEC89D41E2026980002F77A /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 8BEC89D51E2026980002F77A /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 8BEC89D81E2026980002F77A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 8BEC89D91E2026980002F77A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 8BEC89DB1E2026980002F77A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = HelloOpenGL/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = test.HelloOpenGL; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 8BEC89DC1E2026980002F77A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = HelloOpenGL/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = test.HelloOpenGL; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 8BEC89BE1E2026970002F77A /* Build configuration list for PBXProject "HelloOpenGL" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 8BEC89D81E2026980002F77A /* Debug */, + 8BEC89D91E2026980002F77A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 8BEC89DA1E2026980002F77A /* Build configuration list for PBXNativeTarget "HelloOpenGL" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 8BEC89DB1E2026980002F77A /* Debug */, + 8BEC89DC1E2026980002F77A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 8BEC89BB1E2026970002F77A /* Project object */; +} diff --git a/samples/HelloOpenGL/HelloOpenGL/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/HelloOpenGL/HelloOpenGL/Assets.xcassets/AppIcon.appiconset/Contents.json index 118c98f746..1d060ed288 100644 --- a/samples/HelloOpenGL/HelloOpenGL/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/samples/HelloOpenGL/HelloOpenGL/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "29x29", @@ -29,6 +39,51 @@ "idiom" : "iphone", "size" : "60x60", "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" } ], "info" : { diff --git a/samples/HelloOpenGL/HelloOpenGL/Base.lproj/LaunchScreen.storyboard b/samples/HelloOpenGL/HelloOpenGL/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000000..fdf3f97d1b --- /dev/null +++ b/samples/HelloOpenGL/HelloOpenGL/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/HelloOpenGL/HelloOpenGL/Base.lproj/Main.storyboard b/samples/HelloOpenGL/HelloOpenGL/Base.lproj/Main.storyboard new file mode 100644 index 0000000000..4529698c4c --- /dev/null +++ b/samples/HelloOpenGL/HelloOpenGL/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/HelloOpenGL/HelloOpenGL/HelloOpenGL.m b/samples/HelloOpenGL/HelloOpenGL/HelloOpenGL.m index 56cd7969cd..b6c5eeaa5c 100644 --- a/samples/HelloOpenGL/HelloOpenGL/HelloOpenGL.m +++ b/samples/HelloOpenGL/HelloOpenGL/HelloOpenGL.m @@ -1,23 +1,21 @@ #import #import "OpenGLES20Controller.h" -@interface HelloOpenGLApp : NSObject -{ - UIWindow *_mainWindow; +@interface HelloOpenGLApp : NSObject { + UIWindow* _mainWindow; } @end @implementation HelloOpenGLApp --(void) applicationDidFinishLaunching: (UIApplication *) app -{ - CGRect bounds = [[UIScreen mainScreen] bounds]; - _mainWindow = [[UIWindow alloc] initWithFrame: bounds]; +- (void)applicationDidFinishLaunching:(UIApplication*)app { + CGRect bounds = [[UIScreen mainScreen] bounds]; + _mainWindow = [[UIWindow alloc] initWithFrame:bounds]; OpenGLES20ViewController* c = [[OpenGLES20ViewController alloc] init]; _mainWindow.rootViewController = c; _mainWindow.backgroundColor = [UIColor whiteColor]; - + [_mainWindow makeKeyAndVisible]; } @@ -25,8 +23,8 @@ -(void) applicationDidFinishLaunching: (UIApplication *) app #ifdef WINOBJC // Tell the WinObjC runtime how large to render the application -@implementation UIApplication(UIApplicationInitialStartupMode) -+(void) setStartupDisplayMode: (WOCDisplayMode *) mode { +@implementation UIApplication (UIApplicationInitialStartupMode) ++ (void)setStartupDisplayMode:(WOCDisplayMode*)mode { mode.autoMagnification = TRUE; mode.sizeUIWindowToFit = TRUE; mode.fixedWidth = 0; diff --git a/samples/HelloOpenGL/HelloOpenGL/OpenGLES20Controller.m b/samples/HelloOpenGL/HelloOpenGL/OpenGLES20Controller.m index 68d32a9916..26ec95bec2 100644 --- a/samples/HelloOpenGL/HelloOpenGL/OpenGLES20Controller.m +++ b/samples/HelloOpenGL/HelloOpenGL/OpenGLES20Controller.m @@ -20,30 +20,30 @@ #import static const char vertexShader[] = -"attribute vec4 _position;\n" -"attribute vec4 _color;\n" -"varying vec4 _outcolor;\n" -"uniform mat4 _projection;\n" -"uniform mat4 _rotate;\n" -"uniform mat4 _translate;\n" -"void main()\n" -"{\n" - "_outcolor = _color;\n" - "gl_Position = _projection * _translate * _rotate * _position;\n" -"}"; + "attribute vec4 _position;\n" + "attribute vec4 _color;\n" + "varying vec4 _outcolor;\n" + "uniform mat4 _projection;\n" + "uniform mat4 _rotate;\n" + "uniform mat4 _translate;\n" + "void main()\n" + "{\n" + "_outcolor = _color;\n" + "gl_Position = _projection * _translate * _rotate * _position;\n" + "}"; static const char fragShader[] = -"varying lowp vec4 _outcolor;\n" -"void main()\n" -"{\n" -"gl_FragColor = _outcolor;\n" -"}"; + "varying lowp vec4 _outcolor;\n" + "void main()\n" + "{\n" + "gl_FragColor = _outcolor;\n" + "}"; @interface OpenGLView : UIView @end @implementation OpenGLView -+(Class)layerClass { ++ (Class)layerClass { return [CAEAGLLayer class]; } @end @@ -53,48 +53,38 @@ +(Class)layerClass { float color[4]; } Vertex; -static Vertex cubeVertices[] = { - { {-1.0f, -1.0f, -1.0f}, - {0.0f, 1.0f, 0.0f, 1.0f}}, - { {1.0f, -1.0f, -1.0f}, - {0.0f, 1.0f, 0.0f, 1.0f}}, - { {1.0f, 1.0f, -1.0f}, - {1.0f, 0.5f, 0.0f, 1.0f}}, - { {-1.0f, 1.0f, -1.0f}, - {1.0f, 0.5f, 0.0f, 1.0f}}, - { {-1.0f, -1.0f, 1.0f}, - {1.0f, 0.0f, 0.0f, 1.0f}}, - { { 1.0f, -1.0f, 1.0f}, - {1.0f, 0.0f, 0.0f, 1.0f}}, - { { 1.0f, 1.0f, 1.0f}, - {0.0f, 0.0f, 1.0f, 1.0f}}, - { {-1.0f, 1.0f, 1.0f}, - {1.0f, 0.0f, 1.0f, 1.0f }}}; - -static void CATransform3DToFloat(CATransform3D *in, float *out) -{ - out[0] = (float) in->m11; - out[1] = (float) in->m12; - out[2] = (float) in->m13; - out[3] = (float) in->m14; - out[4] = (float) in->m21; - out[5] = (float) in->m22; - out[6] = (float) in->m23; - out[7] = (float) in->m24; - out[8] = (float) in->m31; - out[9] = (float) in->m32; - out[10] = (float) in->m33; - out[11] = (float) in->m34; - out[12] = (float) in->m41; - out[13] = (float) in->m42; - out[14] = (float) in->m43; - out[15] = (float) in->m44; +static Vertex cubeVertices[] = { { { -1.0f, -1.0f, -1.0f }, { 0.0f, 1.0f, 0.0f, 1.0f } }, + { { 1.0f, -1.0f, -1.0f }, { 0.0f, 1.0f, 0.0f, 1.0f } }, + { { 1.0f, 1.0f, -1.0f }, { 1.0f, 0.5f, 0.0f, 1.0f } }, + { { -1.0f, 1.0f, -1.0f }, { 1.0f, 0.5f, 0.0f, 1.0f } }, + { { -1.0f, -1.0f, 1.0f }, { 1.0f, 0.0f, 0.0f, 1.0f } }, + { { 1.0f, -1.0f, 1.0f }, { 1.0f, 0.0f, 0.0f, 1.0f } }, + { { 1.0f, 1.0f, 1.0f }, { 0.0f, 0.0f, 1.0f, 1.0f } }, + { { -1.0f, 1.0f, 1.0f }, { 1.0f, 0.0f, 1.0f, 1.0f } } }; + +static void CATransform3DToFloat(CATransform3D* in, float* out) { + out[0] = (float)in->m11; + out[1] = (float)in->m12; + out[2] = (float)in->m13; + out[3] = (float)in->m14; + out[4] = (float)in->m21; + out[5] = (float)in->m22; + out[6] = (float)in->m23; + out[7] = (float)in->m24; + out[8] = (float)in->m31; + out[9] = (float)in->m32; + out[10] = (float)in->m33; + out[11] = (float)in->m34; + out[12] = (float)in->m41; + out[13] = (float)in->m42; + out[14] = (float)in->m43; + out[15] = (float)in->m44; } @implementation OpenGLES20ViewController { - EAGLContext *_ctx; - OpenGLView *_outputView; - CADisplayLink *_displayLink; + EAGLContext* _ctx; + OpenGLView* _outputView; + CADisplayLink* _displayLink; GLint rbWidth, rbHeight; float cubeAngle; CGSize _curSize; @@ -105,8 +95,7 @@ @implementation OpenGLES20ViewController { GLuint _positionBuffer, _colorBuffer; } -static void glPerspective(GLfloat fov, GLfloat aspect, GLfloat znear, GLfloat zfar, GLuint attrib) -{ +static void glPerspective(GLfloat fov, GLfloat aspect, GLfloat znear, GLfloat zfar, GLuint attrib) { static GLfloat mat[4][4] = { 0 }; mat[1][1] = cos(fov / 2.0f) / sin(fov / 2.0f); @@ -115,27 +104,26 @@ static void glPerspective(GLfloat fov, GLfloat aspect, GLfloat znear, GLfloat zf mat[2][3] = -1.0f; mat[3][2] = 2.0f * znear * zfar / (znear - zfar); mat[3][3] = 1.0f; - - glUniformMatrix4fv(attrib, 1, 0, (const GLfloat *) mat); + + glUniformMatrix4fv(attrib, 1, 0, (const GLfloat*)mat); } --(void) viewWillLayoutSubviews -{ - [EAGLContext setCurrentContext: _ctx]; - if ( !CGSizeEqualToSize(_curSize, _outputView.bounds.size) ) { +- (void)viewWillLayoutSubviews { + [EAGLContext setCurrentContext:_ctx]; + if (!CGSizeEqualToSize(_curSize, _outputView.bounds.size)) { _curSize = _outputView.bounds.size; - if ( _renderbuffer != 0 ) { + if (_renderbuffer != 0) { glDeleteRenderbuffers(1, &_renderbuffer); _renderbuffer = 0; } - if ( _depthbuffer != 0 ) { + if (_depthbuffer != 0) { glDeleteRenderbuffers(1, &_depthbuffer); _depthbuffer = 0; } - if ( _framebuffer != 0 ) { + if (_framebuffer != 0) { glDeleteFramebuffers(1, &_framebuffer); _depthbuffer = 0; } @@ -146,15 +134,16 @@ -(void) viewWillLayoutSubviews glBindRenderbuffer(GL_RENDERBUFFER, _renderbuffer); #ifdef WINOBJC - _outputView.layer.contentsScale = [[UIApplication displayMode] currentMagnification] * [[UIApplication displayMode] hostScreenScale]; + _outputView.layer.contentsScale = + [[UIApplication displayMode] currentMagnification] * [[UIApplication displayMode] hostScreenScale]; #endif - [_ctx renderbufferStorage: GL_RENDERBUFFER fromDrawable:(CAEAGLLayer *)_outputView.layer]; - glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, _renderbuffer); + [_ctx renderbufferStorage:GL_RENDERBUFFER fromDrawable:(CAEAGLLayer*)_outputView.layer]; + glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, _renderbuffer); glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &rbWidth); glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &rbHeight); - + glGenRenderbuffers(1, &_depthbuffer); glBindRenderbuffer(GL_RENDERBUFFER, _depthbuffer); glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, rbWidth, rbHeight); @@ -164,31 +153,30 @@ -(void) viewWillLayoutSubviews glClearDepthf(1.0f); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_LEQUAL); - + glGenBuffers(1, &_positionBuffer); glBindBuffer(GL_ARRAY_BUFFER, _positionBuffer); glBufferData(GL_ARRAY_BUFFER, sizeof(cubeVertices), cubeVertices, GL_STATIC_DRAW); - + glViewport(0, 0, rbWidth, rbHeight); _aspect = (GLfloat)rbWidth / (GLfloat)rbHeight; glPerspective(M_PI / 3, _aspect, 0.01f, 100.0f, _projectionAttrib); } } --(void) viewDidLoad -{ +- (void)viewDidLoad { self.title = @"OpenGLES 2.0"; - _ctx = [[EAGLContext alloc] initWithAPI: kEAGLRenderingAPIOpenGLES2]; - [EAGLContext setCurrentContext: _ctx]; + _ctx = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2]; + [EAGLContext setCurrentContext:_ctx]; _vertShaderHandle = glCreateShader(GL_VERTEX_SHADER); _fragShaderHandle = glCreateShader(GL_FRAGMENT_SHADER); - const GLchar *vertexShaderSrc[] = { vertexShader }; + const GLchar* vertexShaderSrc[] = { vertexShader }; const GLint vertexShaderLen[] = { sizeof(vertexShader) }; - const GLchar *fragShaderSrc[] = { fragShader }; + const GLchar* fragShaderSrc[] = { fragShader }; const GLint fragShaderLen[] = { sizeof(fragShader) }; glShaderSource(_vertShaderHandle, 1, vertexShaderSrc, vertexShaderLen); @@ -210,61 +198,52 @@ -(void) viewDidLoad _translateAttrib = glGetUniformLocation(_programHandle, "_translate"); CGRect frame = CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height); - _outputView = [[OpenGLView alloc] initWithFrame: frame]; + _outputView = [[OpenGLView alloc] initWithFrame:frame]; _outputView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; - _displayLink = [CADisplayLink displayLinkWithTarget: self selector: @selector(render)]; + _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(render)]; self.view.backgroundColor = [UIColor blackColor]; - [self.view addSubview: _outputView]; + [self.view addSubview:_outputView]; } --(void)viewWillAppear:(BOOL)animated -{ - [_displayLink addToRunLoop: [NSRunLoop currentRunLoop] forMode: NSDefaultRunLoopMode]; +- (void)viewWillAppear:(BOOL)animated { + [_displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; } --(void)viewWillDisappear:(BOOL)animated -{ - [_displayLink removeFromRunLoop: [NSRunLoop currentRunLoop] forMode: NSDefaultRunLoopMode]; +- (void)viewWillDisappear:(BOOL)animated { + [_displayLink removeFromRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; } --(void)render -{ - [EAGLContext setCurrentContext: _ctx]; +- (void)render { + [EAGLContext setCurrentContext:_ctx]; glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glUseProgram(_programHandle); glEnableVertexAttribArray(_positionAttrib); - glEnableVertexAttribArray(_colorAttrib); + glEnableVertexAttribArray(_colorAttrib); glVertexAttribPointer(_positionAttrib, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), 0); - glVertexAttribPointer(_colorAttrib, 4, GL_FLOAT, GL_FALSE, sizeof(Vertex), (GLvoid *) (sizeof(float) * 3)); + glVertexAttribPointer(_colorAttrib, 4, GL_FLOAT, GL_FALSE, sizeof(Vertex), (GLvoid*)(sizeof(float) * 3)); CATransform3D rotate = CATransform3DMakeRotation(cubeAngle, 1.0f, 0.0f, 0.0f); rotate = CATransform3DRotate(rotate, cubeAngle, 0.0f, 1.0f, 0.0f); - + CATransform3D translate = CATransform3DMakeTranslation(0.0f, 0.0f, -5.0f); float floatMatrix[16] = { 0 }; - + CATransform3DToFloat(&rotate, floatMatrix); - glUniformMatrix4fv(_rotateAttrib, 1, 0, (const GLfloat *) floatMatrix); + glUniformMatrix4fv(_rotateAttrib, 1, 0, (const GLfloat*)floatMatrix); CATransform3DToFloat(&translate, floatMatrix); - glUniformMatrix4fv(_translateAttrib, 1, 0, (const GLfloat *) floatMatrix); + glUniformMatrix4fv(_translateAttrib, 1, 0, (const GLfloat*)floatMatrix); cubeAngle += 1.0f / 180.0f * M_PI; - static uint8_t drawIndices[] = { - 0, 4, 5, 0, 5, 1, - 1, 5, 6, 1, 6, 2, - 2, 6, 7, 2, 7, 3, - 3, 7, 4, 3, 4, 0, - 4, 7, 6, 4, 6, 5, - 3, 0, 1, 3, 1, 2 }; + static uint8_t drawIndices[] = { 0, 4, 5, 0, 5, 1, 1, 5, 6, 1, 6, 2, 2, 6, 7, 2, 7, 3, + 3, 7, 4, 3, 4, 0, 4, 7, 6, 4, 6, 5, 3, 0, 1, 3, 1, 2 }; glDrawElements(GL_TRIANGLES, sizeof(drawIndices) / sizeof(uint8_t), GL_UNSIGNED_BYTE, drawIndices); - - [_ctx presentRenderbuffer: GL_RENDERBUFFER]; + + [_ctx presentRenderbuffer:GL_RENDERBUFFER]; } @end - diff --git a/samples/HelloOpenGL/HelloOpenGL/main.m b/samples/HelloOpenGL/HelloOpenGL/main.m index 1a55e756c7..f55677b755 100644 --- a/samples/HelloOpenGL/HelloOpenGL/main.m +++ b/samples/HelloOpenGL/HelloOpenGL/main.m @@ -1,9 +1,8 @@ // #import -int main(int argc, char* argv[]) -{ +int main(int argc, char* argv[]) { UIApplicationMain(0, NULL, nil, @"HelloOpenGLApp"); - + return 0; }