diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2017-12-18 19:05:03 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2017-12-18 19:05:03 +0000 |
| commit | af1e3842b7986a9b0840e4f79823279f77ccd386 (patch) | |
| tree | c4934f8b8e8964143be1ca271144d638f0ba64db /unityplugin | |
| parent | Minor update to readme (diff) | |
| download | DiligentEngine-af1e3842b7986a9b0840e4f79823279f77ccd386.tar.gz DiligentEngine-af1e3842b7986a9b0840e4f79823279f77ccd386.zip | |
Removed jni/Visual GDB Android build from legacy project files
Diffstat (limited to 'unityplugin')
31 files changed, 1 insertions, 1328 deletions
diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin-Debug.vgdbsettings b/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin-Debug.vgdbsettings deleted file mode 100644 index 3f5b24b..0000000 --- a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin-Debug.vgdbsettings +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0"?> -<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConfigurationName>Debug</ConfigurationName> - <Project xsi:type="com.visualgdb.project.android"> - <CustomSourceDirectories> - <Directories /> - <PathStyle>MinGWWindowsSlash</PathStyle> - </CustomSourceDirectories> - <AndroidProjectPath>$(ProjectDir)</AndroidProjectPath> - </Project> - <Build xsi:type="com.visualgdb.build.android"> - <AndroidPlatform>android-19</AndroidPlatform> - <IsDebugConfiguration>true</IsDebugConfiguration> - <JNIOnlyBuild>true</JNIOnlyBuild> - <AdditionalDirectoriesToDeleteOnClean>bin;obj</AdditionalDirectoriesToDeleteOnClean> - <DeleteANTFilesOnClean>false</DeleteANTFilesOnClean> - <DoNotEditAndroidManifest>false</DoNotEditAndroidManifest> - <CustomActions /> - </Build> - <Debug xsi:type="com.visualgdb.debug.android"> - <AdditionalStartupCommands /> - <AdditionalGDBSettings> - <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications> - <ForceSingleThreadedMode>false</ForceSingleThreadedMode> - <PendingBreakpointsSupported>true</PendingBreakpointsSupported> - <DisableChildRanges>false</DisableChildRanges> - <UseAppleExtensions>false</UseAppleExtensions> - <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning> - <MakeLogFile>false</MakeLogFile> - <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping> - <UseRelativePathsOnly>false</UseRelativePathsOnly> - <ExitAction>KillApp</ExitAction> - <Features> - <DisableAutoDetection>false</DisableAutoDetection> - <UseFrameParameter>false</UseFrameParameter> - <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported> - <ListLocalsSupported>false</ListLocalsSupported> - <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable> - <ThreadInfoSupported>false</ThreadInfoSupported> - <PendingBreakpointsSupported>false</PendingBreakpointsSupported> - <SupportTargetCommand>false</SupportTargetCommand> - </Features> - <DisableDisassembly>false</DisableDisassembly> - <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand> - <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry> - <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat> - </AdditionalGDBSettings> - <LaunchGDBSettings xsi:type="GDBLaunchParametersAndroid" /> - <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC> - <UseDefaultInstallDir>false</UseDefaultInstallDir> - <RemotePort>5039</RemotePort> - <LocalPort>5039</LocalPort> - <GDBServerStartupTimeout>10000</GDBServerStartupTimeout> - <AdditionalGDBServerStartupDelay>0</AdditionalGDBServerStartupDelay> - <DoubleSlashWorkaround>false</DoubleSlashWorkaround> - <AlreadyRunningDecision>Ask</AlreadyRunningDecision> - <ShowLogCat>true</ShowLogCat> - <EnableThreadNameWatcher>true</EnableThreadNameWatcher> - </Debug> - <CustomBuild> - <PreBuildActions /> - <PostBuildActions /> - <PreCleanActions /> - <PostCleanActions /> - </CustomBuild> - <CustomDebug> - <PreDebugActions /> - <PostDebugActions /> - <BreakMode>Default</BreakMode> - </CustomDebug> - <CustomShortcuts> - <Shortcuts /> - <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting> - </CustomShortcuts> - <UserDefinedVariables /> -</VisualGDBProjectSettings2>
\ No newline at end of file diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin-Release.vgdbsettings b/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin-Release.vgdbsettings deleted file mode 100644 index 669691f..0000000 --- a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin-Release.vgdbsettings +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0"?> -<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConfigurationName>Release</ConfigurationName> - <Project xsi:type="com.visualgdb.project.android"> - <CustomSourceDirectories> - <Directories /> - <PathStyle>MinGWWindowsSlash</PathStyle> - </CustomSourceDirectories> - <AndroidProjectPath>$(ProjectDir)</AndroidProjectPath> - </Project> - <Build xsi:type="com.visualgdb.build.android"> - <AndroidPlatform>android-19</AndroidPlatform> - <IsDebugConfiguration>false</IsDebugConfiguration> - <JNIOnlyBuild>true</JNIOnlyBuild> - <AdditionalDirectoriesToDeleteOnClean>bin;obj</AdditionalDirectoriesToDeleteOnClean> - <DeleteANTFilesOnClean>false</DeleteANTFilesOnClean> - <DoNotEditAndroidManifest>false</DoNotEditAndroidManifest> - <CustomActions /> - </Build> - <Debug xsi:type="com.visualgdb.debug.android"> - <AdditionalStartupCommands /> - <AdditionalGDBSettings> - <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications> - <ForceSingleThreadedMode>false</ForceSingleThreadedMode> - <PendingBreakpointsSupported>true</PendingBreakpointsSupported> - <DisableChildRanges>false</DisableChildRanges> - <UseAppleExtensions>false</UseAppleExtensions> - <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning> - <MakeLogFile>false</MakeLogFile> - <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping> - <UseRelativePathsOnly>false</UseRelativePathsOnly> - <ExitAction>KillApp</ExitAction> - <Features> - <DisableAutoDetection>false</DisableAutoDetection> - <UseFrameParameter>false</UseFrameParameter> - <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported> - <ListLocalsSupported>false</ListLocalsSupported> - <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable> - <ThreadInfoSupported>false</ThreadInfoSupported> - <PendingBreakpointsSupported>false</PendingBreakpointsSupported> - <SupportTargetCommand>false</SupportTargetCommand> - </Features> - <DisableDisassembly>false</DisableDisassembly> - <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand> - <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry> - <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat> - </AdditionalGDBSettings> - <LaunchGDBSettings xsi:type="GDBLaunchParametersAndroid" /> - <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC> - <UseDefaultInstallDir>false</UseDefaultInstallDir> - <RemotePort>5039</RemotePort> - <LocalPort>5039</LocalPort> - <GDBServerStartupTimeout>10000</GDBServerStartupTimeout> - <AdditionalGDBServerStartupDelay>0</AdditionalGDBServerStartupDelay> - <DoubleSlashWorkaround>false</DoubleSlashWorkaround> - <AlreadyRunningDecision>Ask</AlreadyRunningDecision> - <ShowLogCat>true</ShowLogCat> - <EnableThreadNameWatcher>true</EnableThreadNameWatcher> - </Debug> - <CustomBuild> - <PreBuildActions /> - <PostBuildActions /> - <PreCleanActions /> - <PostCleanActions /> - </CustomBuild> - <CustomDebug> - <PreDebugActions /> - <PostDebugActions /> - <BreakMode>Default</BreakMode> - </CustomDebug> - <CustomShortcuts> - <Shortcuts /> - <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting> - </CustomShortcuts> - <UserDefinedVariables /> -</VisualGDBProjectSettings2>
\ No newline at end of file diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj b/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj index 4166510..e12e345 100644 --- a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj +++ b/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -13,10 +9,6 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -51,9 +43,6 @@ <ProjectReference Include="..\..\..\..\..\diligentcore\Graphics\HLSL2GLSLConverterLib\build\Win32\HLSL2GLSLConverterLib.vcxproj"> <Project>{1a782154-a5bd-4a05-b837-efc77f126c84}</Project> </ProjectReference> - <ProjectReference Include="..\..\..\..\..\diligentcore\Platforms\Android\build\Windows\AndroidPlatform.vcxproj"> - <Project>{e333476e-15e3-4d43-a4cf-8748058b3be9}</Project> - </ProjectReference> <ProjectReference Include="..\..\..\..\..\diligentcore\Platforms\Basic\build\Win32\BasicPlatform.vcxproj"> <Project>{8ada5f93-7a38-4ad8-b8f5-1ffd4d4f630c}</Project> </ProjectReference> @@ -63,34 +52,6 @@ </ItemGroup> <ItemGroup> <None Include="..\..\src\RenderingPlugin.def" /> - <None Include="jni\Android.mk" /> - <None Include="jni\Application.mk" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\src\RenderAPI.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\src\RenderAPI_OpenGLCoreES.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\src\RenderingPlugin.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\src\SamplePlugin.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{EDA960FC-AA6C-44B3-8ABB-90765DA4D516}</ProjectGuid> @@ -125,14 +86,6 @@ <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> - <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <PlatformToolset>v120</PlatformToolset> - <ConfigurationType>Makefile</ConfigurationType> - </PropertyGroup> - <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <PlatformToolset>v120</PlatformToolset> - <ConfigurationType>Makefile</ConfigurationType> - </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> <Import Project="..\Windows.Shared\GhostCubePlugin.Shared.vcxitems" Label="Shared" Condition="Exists('..\Windows.Shared\GhostCubePlugin.Shared.vcxitems')" /> @@ -161,12 +114,6 @@ <Import Project="EngineRoot.props" /> <Import Project="..\Windows.Shared\GhostCubePlugin.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Android32d.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Android32r.props" /> - </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj.filters b/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj.filters index d6b075f..26ca0eb 100644 --- a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj.filters +++ b/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj.filters @@ -2,36 +2,5 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <None Include="..\..\src\RenderingPlugin.def" /> - <None Include="jni\Android.mk"> - <Filter>Android\jni</Filter> - </None> - <None Include="jni\Application.mk"> - <Filter>Android\jni</Filter> - </None> - </ItemGroup> - <ItemGroup> - <Filter Include="Android"> - <UniqueIdentifier>{11b4220e-29bf-4572-bee2-1fd8d75f0c48}</UniqueIdentifier> - </Filter> - <Filter Include="Android\src"> - <UniqueIdentifier>{f09afa4f-3ec1-407b-acef-eeded2cb895d}</UniqueIdentifier> - </Filter> - <Filter Include="Android\jni"> - <UniqueIdentifier>{c3a3aa9e-0f29-4329-92ef-929a34b932fb}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\src\RenderAPI.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - <ClCompile Include="..\..\src\RenderAPI_OpenGLCoreES.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - <ClCompile Include="..\..\src\RenderingPlugin.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - <ClCompile Include="..\..\src\SamplePlugin.cpp"> - <Filter>Android\src</Filter> - </ClCompile> </ItemGroup> </Project>
\ No newline at end of file diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/jni/Android.mk b/unityplugin/GhostCubePlugin/PluginSource/build/Win32/jni/Android.mk deleted file mode 100644 index 37ea10d..0000000 --- a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/jni/Android.mk +++ /dev/null @@ -1,80 +0,0 @@ -# Android NDK project makefile autogenerated by Premake - -# Preamble -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) -include $(CLEAR_VARS) - - -# Project configuration -LOCAL_MODULE := GhostCubePlugin -LOCAL_CFLAGS := -std=c++11 -DUSE_GL3_STUB=0 -DUNITY_ANDROID -fvisibility=hidden -LOCAL_CPP_FEATURES := exceptions rtti -LOCAL_STATIC_LIBRARIES += GraphicsEngineOpenGL_static-prebuilt GraphicsEngine-prebuilt HLSL2GLSLConverterLib-prebuilt AndroidPlatform-prebuilt BasicPlatform-prebuilt GraphicsTools-prebuilt Common-prebuilt -LOCAL_LDLIBS := -lGLESv3 -lEGL -llog -landroid - -# Include paths -PROJECT_ROOT := $(LOCAL_PATH)/../../.. -ENGINE_ROOT := $(PROJECT_ROOT)/../../.. -CORE_ROOT := $(ENGINE_ROOT)/diligentcore -LOCAL_C_INCLUDES := $(PROJECT_ROOT)/include $(PROJECT_ROOT)/interface - -# Source files -#VisualGDBAndroid: AutoUpdateSourcesInNextLine -LOCAL_SRC_FILES := ../../../src/RenderAPI.cpp ../../../src/RenderAPI_OpenGLCoreES.cpp ../../../src/RenderingPlugin.cpp ../../../src/SamplePlugin.cpp - -#VisualGDBAndroid: VSExcludeListLocation -VISUALGDB_VS_EXCLUDED_FILES_Release := ../../../src/DLLMain.cpp ../../../src/GLContextWindows.cpp -VISUALGDB_VS_EXCLUDED_FILES_Debug := -LOCAL_SRC_FILES := $(filter-out $(VISUALGDB_VS_EXCLUDED_FILES_$(VGDB_VSCONFIG)),$(LOCAL_SRC_FILES)) - -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -# Declare pre-built Common library -LOCAL_MODULE := Common-prebuilt -LOCAL_EXPORT_C_INCLUDES := $(CORE_ROOT)/Common/include $(CORE_ROOT)/Common/interface -LOCAL_SRC_FILES := $(CORE_ROOT)/Common/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libCommon.a -include $(PREBUILT_STATIC_LIBRARY) - - -include $(CLEAR_VARS) -# Declare pre-built AndroidPlatform library -LOCAL_MODULE := AndroidPlatform-prebuilt -LOCAL_SRC_FILES := $(CORE_ROOT)/Platforms/Android/build/Windows/obj/local/$(TARGET_ARCH_ABI)/libAndroidPlatform.a -LOCAL_EXPORT_C_INCLUDES := $(CORE_ROOT)/Platforms/interface -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -# Declare pre-built BasicPlatform library -LOCAL_MODULE := BasicPlatform-prebuilt -LOCAL_SRC_FILES := $(CORE_ROOT)/Platforms/Basic/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libBasicPlatform.a -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -# Declare pre-built GraphicsEngine library -LOCAL_MODULE := GraphicsEngine-prebuilt -LOCAL_SRC_FILES := $(CORE_ROOT)/Graphics/GraphicsEngine/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libGraphicsEngine.a -LOCAL_EXPORT_C_INCLUDES := $(CORE_ROOT)/Graphics/GraphicsEngine/include $(CORE_ROOT)/Graphics/GraphicsEngine/interface -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -# Declare pre-built Graphics Tools library -LOCAL_MODULE := GraphicsTools-prebuilt -LOCAL_SRC_FILES := $(CORE_ROOT)/Graphics/GraphicsTools/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libGraphicsTools.a -LOCAL_EXPORT_C_INCLUDES := $(CORE_ROOT)/Graphics/GraphicsTools/include -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -# Declare pre-built HLSL2GLSLConverterLib library -LOCAL_MODULE := HLSL2GLSLConverterLib-prebuilt -LOCAL_SRC_FILES := $(CORE_ROOT)/Graphics/HLSL2GLSLConverterLib/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libHLSL2GLSLConverterLib.a -LOCAL_EXPORT_C_INCLUDES := $(CORE_ROOT)/Graphics/HLSL2GLSLConverterLib/include $(CORE_ROOT)/Graphics/HLSL2GLSLConverterLib/interface -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -# Declare pre-built GraphicsEngineOpenGL library -LOCAL_MODULE := GraphicsEngineOpenGL_static-prebuilt -LOCAL_SRC_FILES := $(CORE_ROOT)/Graphics/GraphicsEngineOpenGL/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libGraphicsEngineOpenGL.a -LOCAL_EXPORT_C_INCLUDES := $(CORE_ROOT)/Graphics/GraphicsEngineOpenGL/interface -include $(PREBUILT_STATIC_LIBRARY) diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/jni/Application.mk b/unityplugin/GhostCubePlugin/PluginSource/build/Win32/jni/Application.mk deleted file mode 100644 index 2a28528..0000000 --- a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/jni/Application.mk +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by VisualGDB - -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) -include $(LOCAL_PATH)/../../../../../../diligentcore/Common/make/AppCommon.mk - -APP_MODULES := GhostCubePlugin
\ No newline at end of file diff --git a/unityplugin/GhostCubeScene/build/Win32/AndroidManifest.xml b/unityplugin/GhostCubeScene/build/Win32/AndroidManifest.xml deleted file mode 100644 index f5f99f3..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/AndroidManifest.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.DiligentGraphics.UnityEmulator" android:versionCode="1" android:versionName="1.0"> - <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="19" /> - <uses-feature android:glEsVersion="0x00030000" android:required="true"> - </uses-feature> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"> - </uses-permission> - <application android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@style/AppTheme" android:hasCode="true" android:name="com.DiligentGraphics.UnityEmulator.UnityEmulatorApplication" android:debuggable="true"> - <!-- Our activity is the built-in NativeActivity framework class. - This will take care of integrating with our NDK code. --> - <activity android:name="com.DiligentGraphics.UnityEmulator.UnityEmulatorNativeActivity" android:label="@string/app_name" android:configChanges="orientation|keyboardHidden"> - <!-- Tell NativeActivity the name of or .so --> - <meta-data android:name="android.app.lib_name" android:value="GhostCubeSceneEmulator" /> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> -</manifest>
\ No newline at end of file diff --git a/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene-Debug.vgdbsettings b/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene-Debug.vgdbsettings deleted file mode 100644 index ddc029c..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene-Debug.vgdbsettings +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0"?> -<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConfigurationName>Debug</ConfigurationName> - <Project xsi:type="com.visualgdb.project.android"> - <CustomSourceDirectories> - <Directories /> - <PathStyle>MinGWWindowsSlash</PathStyle> - </CustomSourceDirectories> - <AndroidProjectPath>$(ProjectDir)</AndroidProjectPath> - </Project> - <Build xsi:type="com.visualgdb.build.android"> - <AndroidPlatform>android-19</AndroidPlatform> - <IsDebugConfiguration>true</IsDebugConfiguration> - <JNIOnlyBuild>false</JNIOnlyBuild> - <AdditionalDirectoriesToDeleteOnClean>bin;obj</AdditionalDirectoriesToDeleteOnClean> - <DeleteANTFilesOnClean>false</DeleteANTFilesOnClean> - <DoNotEditAndroidManifest>false</DoNotEditAndroidManifest> - <CustomActions /> - </Build> - <Debug xsi:type="com.visualgdb.debug.android"> - <AdditionalStartupCommands /> - <AdditionalGDBSettings> - <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications> - <ForceSingleThreadedMode>false</ForceSingleThreadedMode> - <PendingBreakpointsSupported>true</PendingBreakpointsSupported> - <DisableChildRanges>false</DisableChildRanges> - <UseAppleExtensions>false</UseAppleExtensions> - <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning> - <MakeLogFile>false</MakeLogFile> - <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping> - <UseRelativePathsOnly>true</UseRelativePathsOnly> - <ExitAction>KillApp</ExitAction> - <Features> - <DisableAutoDetection>false</DisableAutoDetection> - <UseFrameParameter>false</UseFrameParameter> - <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported> - <ListLocalsSupported>false</ListLocalsSupported> - <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable> - <ThreadInfoSupported>false</ThreadInfoSupported> - <PendingBreakpointsSupported>false</PendingBreakpointsSupported> - <SupportTargetCommand>false</SupportTargetCommand> - </Features> - <DisableDisassembly>false</DisableDisassembly> - <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand> - <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry> - <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat> - <EnableSmartStepping>false</EnableSmartStepping> - <DisableSignals>false</DisableSignals> - </AdditionalGDBSettings> - <LaunchGDBSettings xsi:type="GDBLaunchParametersAndroid" /> - <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC> - <PreferredDevice /> - <UseDefaultInstallDir>true</UseDefaultInstallDir> - <RemotePort>5039</RemotePort> - <LocalPort>5039</LocalPort> - <GDBServerStartupTimeout>10000</GDBServerStartupTimeout> - <AdditionalGDBServerStartupDelay>0</AdditionalGDBServerStartupDelay> - <DoubleSlashWorkaround>false</DoubleSlashWorkaround> - <AlreadyRunningDecision>Relaunch</AlreadyRunningDecision> - <ShowLogCat>true</ShowLogCat> - <EnableThreadNameWatcher>true</EnableThreadNameWatcher> - <LaunchAMStartParameters /> - <StartupActivity /> - <GDBServer /> - <StandaloneExeSettings> - <DeploymentDirectory>/data/local/tmp</DeploymentDirectory> - <WorkingDirectory /> - <CommandLineArguments /> - <Environment> - <Records /> - </Environment> - </StandaloneExeSettings> - </Debug> - <CustomBuild> - <PreBuildActions /> - <PostBuildActions /> - <PreCleanActions /> - <PostCleanActions /> - </CustomBuild> - <CustomDebug> - <PreDebugActions /> - <PostDebugActions /> - <BreakMode>Default</BreakMode> - </CustomDebug> - <CustomShortcuts> - <Shortcuts /> - <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting> - </CustomShortcuts> - <UserDefinedVariables /> -</VisualGDBProjectSettings2>
\ No newline at end of file diff --git a/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene-Release.vgdbsettings b/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene-Release.vgdbsettings deleted file mode 100644 index 17856d6..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene-Release.vgdbsettings +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0"?> -<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConfigurationName>Release</ConfigurationName> - <Project xsi:type="com.visualgdb.project.android"> - <CustomSourceDirectories> - <Directories /> - <PathStyle>MinGWWindowsSlash</PathStyle> - </CustomSourceDirectories> - <AndroidProjectPath>$(ProjectDir)</AndroidProjectPath> - </Project> - <Build xsi:type="com.visualgdb.build.android"> - <AndroidPlatform>android-19</AndroidPlatform> - <IsDebugConfiguration>false</IsDebugConfiguration> - <JNIOnlyBuild>false</JNIOnlyBuild> - <AdditionalDirectoriesToDeleteOnClean>bin;obj</AdditionalDirectoriesToDeleteOnClean> - <DeleteANTFilesOnClean>false</DeleteANTFilesOnClean> - <DoNotEditAndroidManifest>false</DoNotEditAndroidManifest> - <CustomActions /> - </Build> - <Debug xsi:type="com.visualgdb.debug.android"> - <AdditionalStartupCommands /> - <AdditionalGDBSettings> - <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications> - <ForceSingleThreadedMode>false</ForceSingleThreadedMode> - <PendingBreakpointsSupported>true</PendingBreakpointsSupported> - <DisableChildRanges>false</DisableChildRanges> - <UseAppleExtensions>false</UseAppleExtensions> - <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning> - <MakeLogFile>false</MakeLogFile> - <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping> - <UseRelativePathsOnly>false</UseRelativePathsOnly> - <ExitAction>KillApp</ExitAction> - <Features> - <DisableAutoDetection>false</DisableAutoDetection> - <UseFrameParameter>false</UseFrameParameter> - <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported> - <ListLocalsSupported>false</ListLocalsSupported> - <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable> - <ThreadInfoSupported>false</ThreadInfoSupported> - <PendingBreakpointsSupported>false</PendingBreakpointsSupported> - <SupportTargetCommand>false</SupportTargetCommand> - </Features> - <DisableDisassembly>false</DisableDisassembly> - <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand> - <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry> - <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat> - <EnableSmartStepping>false</EnableSmartStepping> - <DisableSignals>false</DisableSignals> - </AdditionalGDBSettings> - <LaunchGDBSettings xsi:type="GDBLaunchParametersAndroid" /> - <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC> - <UseDefaultInstallDir>false</UseDefaultInstallDir> - <RemotePort>5039</RemotePort> - <LocalPort>5039</LocalPort> - <GDBServerStartupTimeout>10000</GDBServerStartupTimeout> - <AdditionalGDBServerStartupDelay>0</AdditionalGDBServerStartupDelay> - <DoubleSlashWorkaround>false</DoubleSlashWorkaround> - <AlreadyRunningDecision>Ask</AlreadyRunningDecision> - <ShowLogCat>true</ShowLogCat> - <EnableThreadNameWatcher>true</EnableThreadNameWatcher> - <StandaloneExeSettings> - <DeploymentDirectory>/data/local/tmp</DeploymentDirectory> - </StandaloneExeSettings> - </Debug> - <CustomBuild> - <PreBuildActions /> - <PostBuildActions /> - <PreCleanActions /> - <PostCleanActions /> - </CustomBuild> - <CustomDebug> - <PreDebugActions /> - <PostDebugActions /> - <BreakMode>Default</BreakMode> - </CustomDebug> - <CustomShortcuts> - <Shortcuts /> - <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting> - </CustomShortcuts> - <UserDefinedVariables /> -</VisualGDBProjectSettings2>
\ No newline at end of file diff --git a/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene.vcxproj b/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene.vcxproj index aa7ad7d..1390287 100644 --- a/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene.vcxproj +++ b/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene.vcxproj @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -13,10 +9,6 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -58,14 +50,6 @@ <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> - <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <PlatformToolset>v120</PlatformToolset> - <ConfigurationType>Makefile</ConfigurationType> - </PropertyGroup> - <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <PlatformToolset>v120</PlatformToolset> - <ConfigurationType>Makefile</ConfigurationType> - </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> <Import Project="..\Windows.Shared\GhostCubeScene.Shared.vcxitems" Label="Shared" Condition="Exists('..\Windows.Shared\GhostCubeScene.Shared.vcxitems')" /> @@ -91,25 +75,11 @@ <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Win64r.props" /> <Import Project="..\Windows.Shared\GhostCubeScene.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Android32d.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Android32r.props" /> - </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <NMakeForcedIncludes>$(ProjectDir)..\..\..\..\Common\Android\gcc_Debug.h;$(NMakeForcedIncludes)</NMakeForcedIncludes> - <NMakeOutput>$(ProjectDir)GhostCubeScene-Debug.vgdbsettings</NMakeOutput> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <NMakeForcedIncludes>$(ProjectDir)..\..\..\..\Common\Android\gcc_Release.h;$(NMakeForcedIncludes)</NMakeForcedIncludes> - <NMakeOutput>$(ProjectDir)GhostCubeScene-Release.vgdbsettings</NMakeOutput> - </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <WarningLevel>Level3</WarningLevel> @@ -215,28 +185,14 @@ copy "%(RelativeDir)%(Filename).pdb" "$(TargetDir)"</Command> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename).dll and %(Filename).pdb</Message> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)%(Filename).dll</Outputs> </CustomBuild> - <None Include="jni\Android.mk" /> - <None Include="jni\Application.mk" /> - </ItemGroup> - <ItemGroup> - <Xml Include="AndroidManifest.xml" /> - <Xml Include="build.xml" /> - <Xml Include="res\values\strings.xml" /> - <Xml Include="res\values\styles.xml" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\..\..\diligentcore\Common\build\Win32\Common.vcxproj"> <Project>{7380f7e6-315f-4b4e-92eb-e6aeee865298}</Project> </ProjectReference> - <ProjectReference Include="..\..\..\..\diligentcore\External\Android\ndk_helper\build\NdkHelper.vcxproj"> - <Project>{22ba09ae-e0b5-49f1-8403-2a824762376e}</Project> - </ProjectReference> <ProjectReference Include="..\..\..\..\diligentcore\External\glew\build\Win32\glew_static.vcxproj"> <Project>{664e6f0d-6784-4760-9565-d54f8eb1edf4}</Project> </ProjectReference> - <ProjectReference Include="..\..\..\..\diligentcore\Platforms\Android\build\Windows\AndroidPlatform.vcxproj"> - <Project>{e333476e-15e3-4d43-a4cf-8748058b3be9}</Project> - </ProjectReference> <ProjectReference Include="..\..\..\..\diligentcore\Platforms\Basic\build\Win32\BasicPlatform.vcxproj"> <Project>{8ada5f93-7a38-4ad8-b8f5-1ffd4d4f630c}</Project> </ProjectReference> @@ -247,20 +203,6 @@ copy "%(RelativeDir)%(Filename).pdb" "$(TargetDir)"</Command> <Project>{f40021ac-6d7b-4828-81c4-2d04f946a88e}</Project> </ProjectReference> </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\src\Android\AndroidMain.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\src\GhostCubeScene.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene.vcxproj.filters b/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene.vcxproj.filters index 3ecc134..9dfc9c8 100644 --- a/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene.vcxproj.filters +++ b/unityplugin/GhostCubeScene/build/Win32/GhostCubeScene.vcxproj.filters @@ -1,48 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> <Filter Include="DLLs"> <UniqueIdentifier>{99c6c817-b02b-4b78-8b27-011a6f68c396}</UniqueIdentifier> </Filter> - <Filter Include="Android"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Android\src"> - <UniqueIdentifier>{1e08520a-5f84-419f-9ab8-b20c4af153a3}</UniqueIdentifier> - </Filter> - <Filter Include="Android\jni"> - <UniqueIdentifier>{cd80a81f-81ce-45e0-a041-ad1424d39aef}</UniqueIdentifier> - </Filter> - <Filter Include="Android\res"> - <UniqueIdentifier>{450ce8ab-a0ce-402c-97d8-aa38f90f85bd}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <None Include="jni\Application.mk"> - <Filter>Android\jni</Filter> - </None> - <None Include="jni\Android.mk"> - <Filter>Android\jni</Filter> - </None> - </ItemGroup> - <ItemGroup> - <Xml Include="AndroidManifest.xml"> - <Filter>Android</Filter> - </Xml> - <Xml Include="build.xml"> - <Filter>Android</Filter> - </Xml> - <Xml Include="res\values\styles.xml"> - <Filter>Android\res</Filter> - </Xml> - <Xml Include="res\values\strings.xml"> - <Filter>Android\res</Filter> - </Xml> </ItemGroup> <ItemGroup> <CustomBuild Include="..\..\..\build\Win32\bin\DLLs\x86\GhostCubePlugin_32d.dll"> @@ -58,12 +19,4 @@ <Filter>DLLs</Filter> </CustomBuild> </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\src\Android\AndroidMain.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - <ClCompile Include="..\..\src\GhostCubeScene.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/unityplugin/GhostCubeScene/build/Win32/android_build.bat b/unityplugin/GhostCubeScene/build/Win32/android_build.bat deleted file mode 100644 index 444e545..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/android_build.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off -SET LOCAL_PATH=%~dp0 - -SET ENGINE_ROOT=%LOCAL_PATH%/../../../.. -chdir /d "%ENGINE_ROOT%/build/Android" -call build_all.bat - -chdir /d %LOCAL_PATH% - -call android update project -p . --target android-19 -call ant debug -call adb install -r ./bin/UnityEmulatorNativeActivity-debug.apk -call adb shell am start -a android.intent.action.MAIN -n com.DiligentGraphics.UnityEmulator/com.DiligentGraphics.UnityEmulator.UnityEmulatorNativeActivity diff --git a/unityplugin/GhostCubeScene/build/Win32/build.xml b/unityplugin/GhostCubeScene/build/Win32/build.xml deleted file mode 100644 index d45250f..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/build.xml +++ /dev/null @@ -1,100 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="UnityEmulatorNativeActivity" default="help"> - - <!-- compilation options --> - <property name="java.target" value="1.7" /> - <property name="java.source" value="1.7" /> - - <!-- The local.properties file is created and updated by the 'android' tool. - It contains the path to the SDK. It should *NOT* be checked into - Version Control Systems. --> - <property file="local.properties" /> - - <!-- The ant.properties file can be created by you. It is only edited by the - 'android' tool to add properties to it. - This is the place to change some Ant specific build properties. - Here are some properties you may want to change/update: - - source.dir - The name of the source directory. Default is 'src'. - out.dir - The name of the output directory. Default is 'bin'. - - For other overridable properties, look at the beginning of the rules - files in the SDK, at tools/ant/build.xml - - Properties related to the SDK location or the project target should - be updated using the 'android' tool with the 'update' action. - - This file is an integral part of the build system for your - application and should be checked into Version Control Systems. - - --> - <property file="ant.properties" /> - - <property name="source.dir" value="../../../UnityEmulator/Src/Android" /> - <property name="asset.dir" value="../assets" /> - - - <!-- if sdk.dir was not set from one of the property file, then - get it from the ANDROID_HOME env var. - This must be done before we load project.properties since - the proguard config can use sdk.dir --> - <property environment="env" /> - <condition property="sdk.dir" value="${env.ANDROID_HOME}"> - <isset property="env.ANDROID_HOME" /> - </condition> - - <!-- The project.properties file is created and updated by the 'android' - tool, as well as ADT. - - This contains project specific properties such as project target, and library - dependencies. Lower level build properties are stored in ant.properties - (or in .classpath for Eclipse projects). - - This file is an integral part of the build system for your - application and should be checked into Version Control Systems. --> - <loadproperties srcFile="project.properties" /> - - <!-- quick check on sdk.dir --> - <fail - message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable." - unless="sdk.dir" - /> - - <!-- - Import per project custom build rules if present at the root of the project. - This is the place to put custom intermediary targets such as: - -pre-build - -pre-compile - -post-compile (This is typically used for code obfuscation. - Compiled code location: ${out.classes.absolute.dir} - If this is not done in place, override ${out.dex.input.absolute.dir}) - -post-package - -post-build - -pre-clean - --> - <import file="custom_rules.xml" optional="true" /> - - <!-- Import the actual build file. - - To customize existing targets, there are two options: - - Customize only one target: - - copy/paste the target into this file, *before* the - <import> task. - - customize it to your needs. - - Customize the whole content of build.xml - - copy/paste the content of the rules files (minus the top node) - into this file, replacing the <import> task. - - customize to your needs. - - *********************** - ****** IMPORTANT ****** - *********************** - In all cases you must update the value of version-tag below to read 'custom' instead of an integer, - in order to avoid having your file be overridden by tools such as "android update project" - --> - <!-- version-tag: 1 --> - <import file="${sdk.dir}/tools/ant/build.xml" /> - -</project> diff --git a/unityplugin/GhostCubeScene/build/Win32/jni/Android.mk b/unityplugin/GhostCubeScene/build/Win32/jni/Android.mk deleted file mode 100644 index 8944170..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/jni/Android.mk +++ /dev/null @@ -1,122 +0,0 @@ - -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) - -include $(CLEAR_VARS) -# Project configuration -LOCAL_MODULE := GhostCubeSceneEmulator -LOCAL_CFLAGS := -std=c++11 -fvisibility=hidden -LOCAL_CPP_FEATURES := exceptions -LOCAL_LDLIBS := -lGLESv3 -lEGL -llog -landroid - -# !!!!! VERY IMPORTANT !!!!! -# Not too smart gcc linker links libraries in the order they are declared. From each library it only exports the -# methods/functions required to resolve CURRENTLY OUTSTANDING dependencies and ignores the rest. -# If a subsequent library then uses methods/functions that were not originally required by the objects, you will -# have missing dependencies. -LOCAL_STATIC_LIBRARIES := UnityEmulator-prebuilt GraphicsEngine-prebuilt GraphicsTools-prebuilt cpufeatures android_native_app_glue NdkHelper-prebuilt -# These libraries depend on each other -LOCAL_WHOLE_STATIC_LIBRARIES := AndroidPlatform-prebuilt BasicPlatform-prebuilt Common-prebuilt -LOCAL_SHARED_LIBRARIES := GhostCubePlugin-prebuilt GraphicsEngineOpenGL-prebuilt - -# Include paths -PROJECT_ROOT := $(LOCAL_PATH)/../../.. -ENGINE_ROOT := $(PROJECT_ROOT)/../.. -CORE_ROOT := $(ENGINE_ROOT)/diligentcore -TOOLS_ROOT := $(ENGINE_ROOT)/diligenttools -SAMPLES_ROOT := $(ENGINE_ROOT)/diligentsamples - -LOCAL_C_INCLUDES += $(PROJECT_ROOT)/../GhostCubePlugin/PluginSource/src/Unity -# include directories for static libraries are declared in corresponding LOCAL_EXPORT_C_INCLUDES sections - - -# Source files -#VisualGDBAndroid: AutoUpdateSourcesInNextLine -LOCAL_SRC_FILES := ../../../src/Android/AndroidMain.cpp ../../../src/GhostCubeScene.cpp - -include $(BUILD_SHARED_LIBRARY) - - -# Declare pre-built static libraries - -include $(CLEAR_VARS) -# Declare pre-built Common library -LOCAL_MODULE := UnityEmulator-prebuilt -LOCAL_SRC_FILES := $(PROJECT_ROOT)/../UnityEmulator/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libUnityEmulator.a - -# The LOCAL_EXPORT_C_INCLUDES definition ensures that any module that depends on the -# prebuilt one will have its LOCAL_C_INCLUDES automatically prepended with the path to the -# prebuilt's include directory, and will thus be able to find headers inside that. -LOCAL_EXPORT_C_INCLUDES := $(PROJECT_ROOT)/../UnityEmulator/include - -include $(PREBUILT_STATIC_LIBRARY) - - -# Declare pre-built static libraries - -include $(CLEAR_VARS) -# Declare pre-built Common library -LOCAL_MODULE := Common-prebuilt -LOCAL_SRC_FILES := $(CORE_ROOT)/Common/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libCommon.a - -# The LOCAL_EXPORT_C_INCLUDES definition ensures that any module that depends on the -# prebuilt one will have its LOCAL_C_INCLUDES automatically prepended with the path to the -# prebuilt's include directory, and will thus be able to find headers inside that. -LOCAL_EXPORT_C_INCLUDES := $(CORE_ROOT)/Common/include $(CORE_ROOT)/Common/interface $(CORE_ROOT)/Platforms/interface - -include $(PREBUILT_STATIC_LIBRARY) - - -include $(CLEAR_VARS) -# Declare pre-built AndroidPlatform library -LOCAL_MODULE := AndroidPlatform-prebuilt -LOCAL_SRC_FILES := $(CORE_ROOT)/Platforms/Android/build/Windows/obj/local/$(TARGET_ARCH_ABI)/libAndroidPlatform.a -LOCAL_EXPORT_C_INCLUDES := $(CORE_ROOT)/Platforms/interface -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -# Declare pre-built BasicPlatform library -LOCAL_MODULE := BasicPlatform-prebuilt -LOCAL_SRC_FILES := $(CORE_ROOT)/Platforms/Basic/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libBasicPlatform.a -include $(PREBUILT_STATIC_LIBRARY) - - -include $(CLEAR_VARS) -# Declare pre-built GraphicsEngine library -LOCAL_MODULE := GraphicsEngine-prebuilt -LOCAL_SRC_FILES := $(CORE_ROOT)/Graphics/GraphicsEngine/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libGraphicsEngine.a -LOCAL_EXPORT_C_INCLUDES := $(CORE_ROOT)/Graphics/GraphicsEngine/interface -include $(PREBUILT_STATIC_LIBRARY) - - -include $(CLEAR_VARS) -# Declare pre-built GraphicsEngineOpenGL library -LOCAL_MODULE := GraphicsEngineOpenGL-prebuilt -LOCAL_SRC_FILES := $(CORE_ROOT)/Graphics/GraphicsEngineOpenGL/build/Win32/libs/$(TARGET_ARCH_ABI)/libGraphicsEngineOpenGL.so -LOCAL_EXPORT_C_INCLUDES := $(CORE_ROOT)/Graphics/GraphicsEngineOpenGL/interface -include $(PREBUILT_SHARED_LIBRARY) - -include $(CLEAR_VARS) -# Declare pre-built Graphics Tools library -LOCAL_MODULE := GraphicsTools-prebuilt -LOCAL_SRC_FILES := $(CORE_ROOT)/Graphics/GraphicsTools/build/Win32/obj/local/$(TARGET_ARCH_ABI)/libGraphicsTools.a -LOCAL_EXPORT_C_INCLUDES := $(CORE_ROOT)/Graphics/GraphicsTools/include -include $(PREBUILT_STATIC_LIBRARY) - - -include $(CLEAR_VARS) -# Declare pre-built GhostCubePlugin library -LOCAL_MODULE := GhostCubePlugin-prebuilt -LOCAL_SRC_FILES := $(PROJECT_ROOT)/../GhostCubePlugin/PluginSource/build/Win32/libs/$(TARGET_ARCH_ABI)/libGhostCubePlugin.so -include $(PREBUILT_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := NdkHelper-prebuilt -LOCAL_SRC_FILES := $(CORE_ROOT)/External/Android/ndk_helper/build/obj/local/$(TARGET_ARCH_ABI)/libNdkHelper.a -LOCAL_EXPORT_C_INCLUDES := $(CORE_ROOT)/External/Android/ndk_helper/include -include $(PREBUILT_STATIC_LIBRARY) - - -$(call import-module,android/native_app_glue) -$(call import-module,android/cpufeatures) - diff --git a/unityplugin/GhostCubeScene/build/Win32/jni/Application.mk b/unityplugin/GhostCubeScene/build/Win32/jni/Application.mk deleted file mode 100644 index 08521c2..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/jni/Application.mk +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by VisualGDB - -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) -include $(LOCAL_PATH)/../../../../../diligentcore/Common/make/AppCommon.mk - -APP_MODULES := GhostCubeSceneEmulator
\ No newline at end of file diff --git a/unityplugin/GhostCubeScene/build/Win32/res/drawable-hdpi/ic_launcher.png b/unityplugin/GhostCubeScene/build/Win32/res/drawable-hdpi/ic_launcher.png Binary files differdeleted file mode 100644 index ea01cbf..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/res/drawable-hdpi/ic_launcher.png +++ /dev/null diff --git a/unityplugin/GhostCubeScene/build/Win32/res/drawable-ldpi/ic_launcher.png b/unityplugin/GhostCubeScene/build/Win32/res/drawable-ldpi/ic_launcher.png Binary files differdeleted file mode 100644 index a3d6a18..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/res/drawable-ldpi/ic_launcher.png +++ /dev/null diff --git a/unityplugin/GhostCubeScene/build/Win32/res/drawable-mdpi/ic_launcher.png b/unityplugin/GhostCubeScene/build/Win32/res/drawable-mdpi/ic_launcher.png Binary files differdeleted file mode 100644 index 8f80897..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/res/drawable-mdpi/ic_launcher.png +++ /dev/null diff --git a/unityplugin/GhostCubeScene/build/Win32/res/drawable-xhdpi/ic_launcher.png b/unityplugin/GhostCubeScene/build/Win32/res/drawable-xhdpi/ic_launcher.png Binary files differdeleted file mode 100644 index b779a2b..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/res/drawable-xhdpi/ic_launcher.png +++ /dev/null diff --git a/unityplugin/GhostCubeScene/build/Win32/res/layout/widgets.xml b/unityplugin/GhostCubeScene/build/Win32/res/layout/widgets.xml deleted file mode 100644 index 36b64f3..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/res/layout/widgets.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="top" - android:orientation="vertical" > - - <TextView - android:id="@+id/textViewFPS" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="right" - android:text="0.0 FPS" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@android:color/white" /> - -</LinearLayout>
\ No newline at end of file diff --git a/unityplugin/GhostCubeScene/build/Win32/res/values-v11/styles.xml b/unityplugin/GhostCubeScene/build/Win32/res/values-v11/styles.xml deleted file mode 100644 index 541752f..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/res/values-v11/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ -<resources> - - <!-- - Base application theme for API 11+. This theme completely replaces - AppBaseTheme from res/values/styles.xml on API 11+ devices. - --> - <style name="AppBaseTheme" parent="android:Theme.Holo.Light"> - <!-- API 11 theme customizations can go here. --> - </style> - -</resources>
\ No newline at end of file diff --git a/unityplugin/GhostCubeScene/build/Win32/res/values-v14/styles.xml b/unityplugin/GhostCubeScene/build/Win32/res/values-v14/styles.xml deleted file mode 100644 index f20e015..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/res/values-v14/styles.xml +++ /dev/null @@ -1,12 +0,0 @@ -<resources> - - <!-- - Base application theme for API 14+. This theme completely replaces - AppBaseTheme from BOTH res/values/styles.xml and - res/values-v11/styles.xml on API 14+ devices. - --> - <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar"> - <!-- API 14 theme customizations can go here. --> - </style> - -</resources>
\ No newline at end of file diff --git a/unityplugin/GhostCubeScene/build/Win32/res/values/strings.xml b/unityplugin/GhostCubeScene/build/Win32/res/values/strings.xml deleted file mode 100644 index f29ce4e..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/res/values/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ -<resources> - - <string name="app_name">Ghost cube scene emulator</string> - <string name="plugin_name">GhostCubePlugin</string> - -</resources>
\ No newline at end of file diff --git a/unityplugin/GhostCubeScene/build/Win32/res/values/styles.xml b/unityplugin/GhostCubeScene/build/Win32/res/values/styles.xml deleted file mode 100644 index 4a10ca4..0000000 --- a/unityplugin/GhostCubeScene/build/Win32/res/values/styles.xml +++ /dev/null @@ -1,20 +0,0 @@ -<resources> - - <!-- - Base application theme, dependent on API level. This theme is replaced - by AppBaseTheme from res/values-vXX/styles.xml on newer devices. - --> - <style name="AppBaseTheme" parent="android:Theme.Light"> - <!-- - Theme customizations available in newer API levels can go in - res/values-vXX/styles.xml, while customizations related to - backward-compatibility can go here. - --> - </style> - - <!-- Application theme. --> - <style name="AppTheme" parent="AppBaseTheme"> - <!-- All customizations that are NOT specific to a particular API-level can go here. --> - </style> - -</resources>
\ No newline at end of file diff --git a/unityplugin/UnityEmulator/build/Win32/UnityEmulator-Debug.vgdbsettings b/unityplugin/UnityEmulator/build/Win32/UnityEmulator-Debug.vgdbsettings deleted file mode 100644 index 3f5b24b..0000000 --- a/unityplugin/UnityEmulator/build/Win32/UnityEmulator-Debug.vgdbsettings +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0"?> -<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConfigurationName>Debug</ConfigurationName> - <Project xsi:type="com.visualgdb.project.android"> - <CustomSourceDirectories> - <Directories /> - <PathStyle>MinGWWindowsSlash</PathStyle> - </CustomSourceDirectories> - <AndroidProjectPath>$(ProjectDir)</AndroidProjectPath> - </Project> - <Build xsi:type="com.visualgdb.build.android"> - <AndroidPlatform>android-19</AndroidPlatform> - <IsDebugConfiguration>true</IsDebugConfiguration> - <JNIOnlyBuild>true</JNIOnlyBuild> - <AdditionalDirectoriesToDeleteOnClean>bin;obj</AdditionalDirectoriesToDeleteOnClean> - <DeleteANTFilesOnClean>false</DeleteANTFilesOnClean> - <DoNotEditAndroidManifest>false</DoNotEditAndroidManifest> - <CustomActions /> - </Build> - <Debug xsi:type="com.visualgdb.debug.android"> - <AdditionalStartupCommands /> - <AdditionalGDBSettings> - <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications> - <ForceSingleThreadedMode>false</ForceSingleThreadedMode> - <PendingBreakpointsSupported>true</PendingBreakpointsSupported> - <DisableChildRanges>false</DisableChildRanges> - <UseAppleExtensions>false</UseAppleExtensions> - <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning> - <MakeLogFile>false</MakeLogFile> - <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping> - <UseRelativePathsOnly>false</UseRelativePathsOnly> - <ExitAction>KillApp</ExitAction> - <Features> - <DisableAutoDetection>false</DisableAutoDetection> - <UseFrameParameter>false</UseFrameParameter> - <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported> - <ListLocalsSupported>false</ListLocalsSupported> - <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable> - <ThreadInfoSupported>false</ThreadInfoSupported> - <PendingBreakpointsSupported>false</PendingBreakpointsSupported> - <SupportTargetCommand>false</SupportTargetCommand> - </Features> - <DisableDisassembly>false</DisableDisassembly> - <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand> - <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry> - <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat> - </AdditionalGDBSettings> - <LaunchGDBSettings xsi:type="GDBLaunchParametersAndroid" /> - <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC> - <UseDefaultInstallDir>false</UseDefaultInstallDir> - <RemotePort>5039</RemotePort> - <LocalPort>5039</LocalPort> - <GDBServerStartupTimeout>10000</GDBServerStartupTimeout> - <AdditionalGDBServerStartupDelay>0</AdditionalGDBServerStartupDelay> - <DoubleSlashWorkaround>false</DoubleSlashWorkaround> - <AlreadyRunningDecision>Ask</AlreadyRunningDecision> - <ShowLogCat>true</ShowLogCat> - <EnableThreadNameWatcher>true</EnableThreadNameWatcher> - </Debug> - <CustomBuild> - <PreBuildActions /> - <PostBuildActions /> - <PreCleanActions /> - <PostCleanActions /> - </CustomBuild> - <CustomDebug> - <PreDebugActions /> - <PostDebugActions /> - <BreakMode>Default</BreakMode> - </CustomDebug> - <CustomShortcuts> - <Shortcuts /> - <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting> - </CustomShortcuts> - <UserDefinedVariables /> -</VisualGDBProjectSettings2>
\ No newline at end of file diff --git a/unityplugin/UnityEmulator/build/Win32/UnityEmulator-Release.vgdbsettings b/unityplugin/UnityEmulator/build/Win32/UnityEmulator-Release.vgdbsettings deleted file mode 100644 index 669691f..0000000 --- a/unityplugin/UnityEmulator/build/Win32/UnityEmulator-Release.vgdbsettings +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0"?> -<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConfigurationName>Release</ConfigurationName> - <Project xsi:type="com.visualgdb.project.android"> - <CustomSourceDirectories> - <Directories /> - <PathStyle>MinGWWindowsSlash</PathStyle> - </CustomSourceDirectories> - <AndroidProjectPath>$(ProjectDir)</AndroidProjectPath> - </Project> - <Build xsi:type="com.visualgdb.build.android"> - <AndroidPlatform>android-19</AndroidPlatform> - <IsDebugConfiguration>false</IsDebugConfiguration> - <JNIOnlyBuild>true</JNIOnlyBuild> - <AdditionalDirectoriesToDeleteOnClean>bin;obj</AdditionalDirectoriesToDeleteOnClean> - <DeleteANTFilesOnClean>false</DeleteANTFilesOnClean> - <DoNotEditAndroidManifest>false</DoNotEditAndroidManifest> - <CustomActions /> - </Build> - <Debug xsi:type="com.visualgdb.debug.android"> - <AdditionalStartupCommands /> - <AdditionalGDBSettings> - <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications> - <ForceSingleThreadedMode>false</ForceSingleThreadedMode> - <PendingBreakpointsSupported>true</PendingBreakpointsSupported> - <DisableChildRanges>false</DisableChildRanges> - <UseAppleExtensions>false</UseAppleExtensions> - <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning> - <MakeLogFile>false</MakeLogFile> - <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping> - <UseRelativePathsOnly>false</UseRelativePathsOnly> - <ExitAction>KillApp</ExitAction> - <Features> - <DisableAutoDetection>false</DisableAutoDetection> - <UseFrameParameter>false</UseFrameParameter> - <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported> - <ListLocalsSupported>false</ListLocalsSupported> - <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable> - <ThreadInfoSupported>false</ThreadInfoSupported> - <PendingBreakpointsSupported>false</PendingBreakpointsSupported> - <SupportTargetCommand>false</SupportTargetCommand> - </Features> - <DisableDisassembly>false</DisableDisassembly> - <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand> - <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry> - <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat> - </AdditionalGDBSettings> - <LaunchGDBSettings xsi:type="GDBLaunchParametersAndroid" /> - <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC> - <UseDefaultInstallDir>false</UseDefaultInstallDir> - <RemotePort>5039</RemotePort> - <LocalPort>5039</LocalPort> - <GDBServerStartupTimeout>10000</GDBServerStartupTimeout> - <AdditionalGDBServerStartupDelay>0</AdditionalGDBServerStartupDelay> - <DoubleSlashWorkaround>false</DoubleSlashWorkaround> - <AlreadyRunningDecision>Ask</AlreadyRunningDecision> - <ShowLogCat>true</ShowLogCat> - <EnableThreadNameWatcher>true</EnableThreadNameWatcher> - </Debug> - <CustomBuild> - <PreBuildActions /> - <PostBuildActions /> - <PreCleanActions /> - <PostCleanActions /> - </CustomBuild> - <CustomDebug> - <PreDebugActions /> - <PostDebugActions /> - <BreakMode>Default</BreakMode> - </CustomDebug> - <CustomShortcuts> - <Shortcuts /> - <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting> - </CustomShortcuts> - <UserDefinedVariables /> -</VisualGDBProjectSettings2>
\ No newline at end of file diff --git a/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj b/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj index d3dd0b6..736d6d6 100644 --- a/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj +++ b/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -13,10 +9,6 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -59,14 +51,6 @@ <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> - <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <PlatformToolset>v120</PlatformToolset> - <ConfigurationType>Makefile</ConfigurationType> - </PropertyGroup> - <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <PlatformToolset>v120</PlatformToolset> - <ConfigurationType>Makefile</ConfigurationType> - </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> <Import Project="..\Windows.Shared\UnityEmulator.Shared.vcxitems" Label="Shared" Condition="Exists('..\WindowsStore\UnityEmulator.Shared\UnityEmulator.Shared.vcxitems')" /> @@ -94,27 +78,11 @@ <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Win64r.props" /> <Import Project="..\Windows.Shared\UnityEmulator.props" /> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Android32d.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Android32r.props" /> - </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <NMakeForcedIncludes>$(ProjectDir)..\..\..\..\Common\Android\gcc_Debug.h;$(NMakeForcedIncludes)</NMakeForcedIncludes> - <NMakeOutput> - </NMakeOutput> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <NMakeForcedIncludes>$(ProjectDir)..\..\..\..\Common\Android\gcc_Release.h;$(NMakeForcedIncludes)</NMakeForcedIncludes> - <NMakeOutput> - </NMakeOutput> - </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <WarningLevel>Level3</WarningLevel> @@ -188,40 +156,7 @@ </PostBuildEvent> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\src\Android\AndroidMainImpl.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\src\Android\UnityGraphicsGLESAndroid_Impl.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\src\DiligentGraphicsAdapterGL.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\src\UnityGraphicsEmulator.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\src\UnityGraphicsGLCoreES_Emulator.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\src\Windows\WinMain.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - </ClCompile> + <ClCompile Include="..\..\src\Windows\WinMain.cpp" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\..\..\diligentcore\Common\build\Win32\Common.vcxproj"> @@ -249,16 +184,6 @@ <Project>{58f32677-436b-412a-bbf8-2b1310d82cd8}</Project> </ProjectReference> </ItemGroup> - <ItemGroup> - <None Include="..\..\src\Android\Java\helper\NDKHelper.java" /> - <None Include="..\..\src\Android\Java\UnityEmulator\UnityEmulatorNativeActivity.java" /> - <None Include="..\..\src\Android\Java\UnityEmulator\UnityEmulatorApplication.java" /> - <None Include="jni\Android.mk" /> - <None Include="jni\Application.mk" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\src\Android\UnityGraphicsGLESAndroid_Impl.h" /> - </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj.filters b/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj.filters index 6952802..1395a81 100644 --- a/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj.filters +++ b/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj.filters @@ -1,18 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="Android"> - <UniqueIdentifier>{154722cc-8c82-4869-8e51-fb073a87f966}</UniqueIdentifier> - </Filter> - <Filter Include="Android\Java"> - <UniqueIdentifier>{fe07d990-c5ac-488d-b7df-b3c66018d0b3}</UniqueIdentifier> - </Filter> - <Filter Include="Android\jni"> - <UniqueIdentifier>{31c218a8-0b04-4224-97ad-909aeff5c135}</UniqueIdentifier> - </Filter> - <Filter Include="Android\src"> - <UniqueIdentifier>{90e91db8-8be2-446b-abee-0365b7dc18a8}</UniqueIdentifier> - </Filter> <Filter Include="Windows"> <UniqueIdentifier>{e9f1e7cd-5112-4fb6-854a-3ebfd5efa88b}</UniqueIdentifier> </Filter> @@ -24,42 +12,5 @@ <ClCompile Include="..\..\src\Windows\WinMain.cpp"> <Filter>Windows\src</Filter> </ClCompile> - <ClCompile Include="..\..\src\Android\AndroidMainImpl.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - <ClCompile Include="..\..\src\Android\UnityGraphicsGLESAndroid_Impl.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - <ClCompile Include="..\..\src\UnityGraphicsGLCoreES_Emulator.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - <ClCompile Include="..\..\src\DiligentGraphicsAdapterGL.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - <ClCompile Include="..\..\src\UnityGraphicsEmulator.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <None Include="..\..\src\Android\Java\helper\NDKHelper.java"> - <Filter>Android\Java</Filter> - </None> - <None Include="jni\Android.mk"> - <Filter>Android\jni</Filter> - </None> - <None Include="jni\Application.mk"> - <Filter>Android\jni</Filter> - </None> - <None Include="..\..\src\Android\Java\UnityEmulator\UnityEmulatorNativeActivity.java"> - <Filter>Android\Java</Filter> - </None> - <None Include="..\..\src\Android\Java\UnityEmulator\UnityEmulatorApplication.java"> - <Filter>Android\Java</Filter> - </None> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\src\Android\UnityGraphicsGLESAndroid_Impl.h"> - <Filter>Android\src</Filter> - </ClInclude> </ItemGroup> </Project>
\ No newline at end of file diff --git a/unityplugin/UnityEmulator/build/Win32/jni/Android.mk b/unityplugin/UnityEmulator/build/Win32/jni/Android.mk deleted file mode 100644 index 44ece36..0000000 --- a/unityplugin/UnityEmulator/build/Win32/jni/Android.mk +++ /dev/null @@ -1,47 +0,0 @@ - -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) - -include $(CLEAR_VARS) -# Project configuration -LOCAL_MODULE := UnityEmulator -LOCAL_CFLAGS := -std=c++11 -DENGINE_DLL -LOCAL_CPP_FEATURES := exceptions - -LOCAL_STATIC_LIBRARIES := cpufeatures android_native_app_glue - -# Include paths -PROJECT_ROOT := $(LOCAL_PATH)/../../.. -ENGINE_ROOT := $(PROJECT_ROOT)/../.. -CORE_ROOT := $(ENGINE_ROOT)/diligentcore -TOOLS_ROOT := $(ENGINE_ROOT)/diligenttools -# include directories for static libraries are declared in corresponding LOCAL_EXPORT_C_INCLUDES sections -LOCAL_C_INCLUDES += $(PROJECT_ROOT)/include -LOCAL_C_INCLUDES += $(PROJECT_ROOT)/src -LOCAL_C_INCLUDES += $(PROJECT_ROOT)/../GhostCubePlugin/PluginSource/src/Unity -LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/include -LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/Platforms/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/Graphics/GraphicsEngine/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/Graphics/GraphicsEngine/include -LOCAL_C_INCLUDES += $(CORE_ROOT)/Graphics/GraphicsEngineD3DBase/include -LOCAL_C_INCLUDES += $(CORE_ROOT)/Graphics/GraphicsEngineOpenGL/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/Graphics/HLSL2GLSLConverterLib/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/External/Android/ndk_helper/include -LOCAL_C_INCLUDES += $(TOOLS_ROOT)/Graphics/GraphicsTools/include - -# Source files -#VisualGDBAndroid: AutoUpdateSourcesInNextLine -LOCAL_SRC_FILES := ../../../src/Android/AndroidMainImpl.cpp ../../../src/Android/UnityGraphicsGLESAndroid_Impl.cpp ../../../src/DiligentGraphicsAdapterGL.cpp ../../../src/UnityGraphicsEmulator.cpp ../../../src/UnityGraphicsGLCoreES_Emulator.cpp ../../../src/Windows/WinMain.cpp - -# Build instructions -#VisualGDBAndroid: VSExcludeListLocation -VISUALGDB_VS_EXCLUDED_FILES_Release := ../../../Src/Win32/WinMain.cpp -VISUALGDB_VS_EXCLUDED_FILES_Debug := ../../../src/Windows/WinMain.cpp -LOCAL_SRC_FILES := $(filter-out $(VISUALGDB_VS_EXCLUDED_FILES_$(VGDB_VSCONFIG)),$(LOCAL_SRC_FILES)) - -include $(BUILD_STATIC_LIBRARY) - -$(call import-module,android/ndk_helper) -$(call import-module,android/native_app_glue) -$(call import-module,android/cpufeatures) diff --git a/unityplugin/UnityEmulator/build/Win32/jni/Application.mk b/unityplugin/UnityEmulator/build/Win32/jni/Application.mk deleted file mode 100644 index e8ef4b4..0000000 --- a/unityplugin/UnityEmulator/build/Win32/jni/Application.mk +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by VisualGDB - -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) -include $(LOCAL_PATH)/../../../../../diligentcore/Common/make/AppCommon.mk - -APP_MODULES := UnityEmulator
\ No newline at end of file diff --git a/unityplugin/build/Win32/UnityPlugin.sln b/unityplugin/build/Win32/UnityPlugin.sln index 036f107..9612e6a 100644 --- a/unityplugin/build/Win32/UnityPlugin.sln +++ b/unityplugin/build/Win32/UnityPlugin.sln @@ -49,8 +49,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicPlatform", "..\..\..\d EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win32Platform", "..\..\..\diligentcore\Platforms\Win32\build\Win32\WindowsPlatform.vcxproj", "{58F32677-436B-412A-BBF8-2B1310D82CD8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AndroidPlatform", "..\..\..\diligentcore\Platforms\Android\build\Windows\AndroidPlatform.vcxproj", "{E333476E-15E3-4D43-A4CF-8748058B3BE9}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GhostCubePlugin", "..\..\GhostCubePlugin\PluginSource\build\Win32\GhostCubePlugin.vcxproj", "{EDA960FC-AA6C-44B3-8ABB-90765DA4D516}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GhostCubePlugin.Shared", "..\..\GhostCubePlugin\PluginSource\build\Windows.Shared\GhostCubePlugin.Shared.vcxitems", "{27B0C157-0A7A-46B0-AED3-919E7AF5EF4B}" @@ -68,8 +66,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GhostCubeScene", "..\..\Gho EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GhostCubeScene.Assets", "..\..\GhostCubeScene\build\GhostCubeScene.Assets.vcxitems", "{CAF59C31-47E1-4F26-8455-C5E49F75BB3C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NdkHelper", "..\..\..\diligentcore\External\Android\ndk_helper\build\NdkHelper.vcxproj", "{22BA09AE-E0B5-49F1-8403-2A824762376E}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\diligentcore\Graphics\GraphicsEngine\build\Windows.Shared\GraphicsEngine.Shared.vcxitems*{052dd700-477c-4512-a7f4-b05ebef5c80e}*SharedItemsImports = 4 @@ -97,188 +93,124 @@ Global ..\..\..\diligentcore\Graphics\GraphicsEngineD3D12\build\Windows.Shared\GraphicsEngineD3D12.Shared.vcxitems*{fff8071a-db82-485b-adc3-f0b675296869}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|ARM = Release|ARM Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|ARM.ActiveCfg = Debug|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.ActiveCfg = Debug|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.Build.0 = Debug|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x86.ActiveCfg = Debug|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x86.Build.0 = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|ARM.ActiveCfg = Release|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.ActiveCfg = Release|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.Build.0 = Release|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x86.ActiveCfg = Release|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x86.Build.0 = Release|Win32 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Debug|ARM.ActiveCfg = Debug|ARM - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Debug|ARM.Build.0 = Debug|ARM {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Debug|x64.ActiveCfg = Debug|x64 {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Debug|x64.Build.0 = Debug|x64 {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Debug|x86.ActiveCfg = Debug|Win32 {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Debug|x86.Build.0 = Debug|Win32 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Release|ARM.ActiveCfg = Release|ARM - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Release|ARM.Build.0 = Release|ARM {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Release|x64.ActiveCfg = Release|x64 {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Release|x64.Build.0 = Release|x64 {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Release|x86.ActiveCfg = Release|Win32 {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Release|x86.Build.0 = Release|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Debug|ARM.ActiveCfg = Debug|Win32 {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Debug|x64.ActiveCfg = Debug|x64 {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Debug|x64.Build.0 = Debug|x64 {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Debug|x86.ActiveCfg = Debug|Win32 {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Debug|x86.Build.0 = Debug|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Release|ARM.ActiveCfg = Release|Win32 {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Release|x64.ActiveCfg = Release|x64 {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Release|x64.Build.0 = Release|x64 {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Release|x86.ActiveCfg = Release|Win32 {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Release|x86.Build.0 = Release|Win32 - {FFF8071A-DB82-485B-ADC3-F0B675296869}.Debug|ARM.ActiveCfg = Debug|Win32 {FFF8071A-DB82-485B-ADC3-F0B675296869}.Debug|x64.ActiveCfg = Debug|x64 {FFF8071A-DB82-485B-ADC3-F0B675296869}.Debug|x64.Build.0 = Debug|x64 {FFF8071A-DB82-485B-ADC3-F0B675296869}.Debug|x86.ActiveCfg = Debug|Win32 {FFF8071A-DB82-485B-ADC3-F0B675296869}.Debug|x86.Build.0 = Debug|Win32 - {FFF8071A-DB82-485B-ADC3-F0B675296869}.Release|ARM.ActiveCfg = Release|Win32 {FFF8071A-DB82-485B-ADC3-F0B675296869}.Release|x64.ActiveCfg = Release|x64 {FFF8071A-DB82-485B-ADC3-F0B675296869}.Release|x64.Build.0 = Release|x64 {FFF8071A-DB82-485B-ADC3-F0B675296869}.Release|x86.ActiveCfg = Release|Win32 {FFF8071A-DB82-485B-ADC3-F0B675296869}.Release|x86.Build.0 = Release|Win32 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Debug|ARM.ActiveCfg = Debug|ARM - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Debug|ARM.Build.0 = Debug|ARM {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Debug|x64.ActiveCfg = Debug|x64 {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Debug|x64.Build.0 = Debug|x64 {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Debug|x86.ActiveCfg = Debug|Win32 {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Debug|x86.Build.0 = Debug|Win32 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Release|ARM.ActiveCfg = Release|ARM - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Release|ARM.Build.0 = Release|ARM {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Release|x64.ActiveCfg = Release|x64 {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Release|x64.Build.0 = Release|x64 {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Release|x86.ActiveCfg = Release|Win32 {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Release|x86.Build.0 = Release|Win32 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Debug|ARM.ActiveCfg = Debug|ARM - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Debug|ARM.Build.0 = Debug|ARM {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Debug|x64.ActiveCfg = Debug|x64 {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Debug|x64.Build.0 = Debug|x64 {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Debug|x86.ActiveCfg = Debug|Win32 {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Debug|x86.Build.0 = Debug|Win32 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Release|ARM.ActiveCfg = Release|ARM - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Release|ARM.Build.0 = Release|ARM {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Release|x64.ActiveCfg = Release|x64 {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Release|x64.Build.0 = Release|x64 {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Release|x86.ActiveCfg = Release|Win32 {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Release|x86.Build.0 = Release|Win32 - {1A782154-A5BD-4A05-B837-EFC77F126C84}.Debug|ARM.ActiveCfg = Debug|ARM - {1A782154-A5BD-4A05-B837-EFC77F126C84}.Debug|ARM.Build.0 = Debug|ARM {1A782154-A5BD-4A05-B837-EFC77F126C84}.Debug|x64.ActiveCfg = Debug|x64 {1A782154-A5BD-4A05-B837-EFC77F126C84}.Debug|x64.Build.0 = Debug|x64 {1A782154-A5BD-4A05-B837-EFC77F126C84}.Debug|x86.ActiveCfg = Debug|Win32 {1A782154-A5BD-4A05-B837-EFC77F126C84}.Debug|x86.Build.0 = Debug|Win32 - {1A782154-A5BD-4A05-B837-EFC77F126C84}.Release|ARM.ActiveCfg = Release|ARM - {1A782154-A5BD-4A05-B837-EFC77F126C84}.Release|ARM.Build.0 = Release|ARM {1A782154-A5BD-4A05-B837-EFC77F126C84}.Release|x64.ActiveCfg = Release|x64 {1A782154-A5BD-4A05-B837-EFC77F126C84}.Release|x64.Build.0 = Release|x64 {1A782154-A5BD-4A05-B837-EFC77F126C84}.Release|x86.ActiveCfg = Release|Win32 {1A782154-A5BD-4A05-B837-EFC77F126C84}.Release|x86.Build.0 = Release|Win32 - {40FD58ED-AABC-4CBD-BEE4-33116995A626}.Debug|ARM.ActiveCfg = Debug|Win32 {40FD58ED-AABC-4CBD-BEE4-33116995A626}.Debug|x64.ActiveCfg = Debug|x64 {40FD58ED-AABC-4CBD-BEE4-33116995A626}.Debug|x64.Build.0 = Debug|x64 {40FD58ED-AABC-4CBD-BEE4-33116995A626}.Debug|x86.ActiveCfg = Debug|Win32 {40FD58ED-AABC-4CBD-BEE4-33116995A626}.Debug|x86.Build.0 = Debug|Win32 - {40FD58ED-AABC-4CBD-BEE4-33116995A626}.Release|ARM.ActiveCfg = Release|Win32 {40FD58ED-AABC-4CBD-BEE4-33116995A626}.Release|x64.ActiveCfg = Release|x64 {40FD58ED-AABC-4CBD-BEE4-33116995A626}.Release|x64.Build.0 = Release|x64 {40FD58ED-AABC-4CBD-BEE4-33116995A626}.Release|x86.ActiveCfg = Release|Win32 {40FD58ED-AABC-4CBD-BEE4-33116995A626}.Release|x86.Build.0 = Release|Win32 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Debug|ARM.ActiveCfg = Debug|ARM - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Debug|ARM.Build.0 = Debug|ARM {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Debug|x64.ActiveCfg = Debug|x64 {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Debug|x64.Build.0 = Debug|x64 {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Debug|x86.ActiveCfg = Debug|Win32 {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Debug|x86.Build.0 = Debug|Win32 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Release|ARM.ActiveCfg = Release|ARM - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Release|ARM.Build.0 = Release|ARM {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Release|x64.ActiveCfg = Release|x64 {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Release|x64.Build.0 = Release|x64 {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Release|x86.ActiveCfg = Release|Win32 {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Release|x86.Build.0 = Release|Win32 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Debug|ARM.ActiveCfg = Debug|ARM - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Debug|ARM.Build.0 = Debug|ARM {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Debug|x64.ActiveCfg = Debug|x64 {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Debug|x64.Build.0 = Debug|x64 {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Debug|x86.ActiveCfg = Debug|Win32 {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Debug|x86.Build.0 = Debug|Win32 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Release|ARM.ActiveCfg = Release|ARM - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Release|ARM.Build.0 = Release|ARM {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Release|x64.ActiveCfg = Release|x64 {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Release|x64.Build.0 = Release|x64 {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Release|x86.ActiveCfg = Release|Win32 {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Release|x86.Build.0 = Release|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.Debug|ARM.ActiveCfg = Debug|Win32 {58F32677-436B-412A-BBF8-2B1310D82CD8}.Debug|x64.ActiveCfg = Debug|x64 {58F32677-436B-412A-BBF8-2B1310D82CD8}.Debug|x64.Build.0 = Debug|x64 {58F32677-436B-412A-BBF8-2B1310D82CD8}.Debug|x86.ActiveCfg = Debug|Win32 {58F32677-436B-412A-BBF8-2B1310D82CD8}.Debug|x86.Build.0 = Debug|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.Release|ARM.ActiveCfg = Release|Win32 {58F32677-436B-412A-BBF8-2B1310D82CD8}.Release|x64.ActiveCfg = Release|x64 {58F32677-436B-412A-BBF8-2B1310D82CD8}.Release|x64.Build.0 = Release|x64 {58F32677-436B-412A-BBF8-2B1310D82CD8}.Release|x86.ActiveCfg = Release|Win32 {58F32677-436B-412A-BBF8-2B1310D82CD8}.Release|x86.Build.0 = Release|Win32 - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Debug|ARM.ActiveCfg = Debug|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Debug|ARM.Build.0 = Debug|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Debug|x64.ActiveCfg = Debug|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Debug|x86.ActiveCfg = Debug|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Release|ARM.ActiveCfg = Release|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Release|ARM.Build.0 = Release|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Release|x64.ActiveCfg = Release|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Release|x86.ActiveCfg = Release|ARM - {EDA960FC-AA6C-44B3-8ABB-90765DA4D516}.Debug|ARM.ActiveCfg = Debug|ARM - {EDA960FC-AA6C-44B3-8ABB-90765DA4D516}.Debug|ARM.Build.0 = Debug|ARM {EDA960FC-AA6C-44B3-8ABB-90765DA4D516}.Debug|x64.ActiveCfg = Debug|x64 {EDA960FC-AA6C-44B3-8ABB-90765DA4D516}.Debug|x64.Build.0 = Debug|x64 {EDA960FC-AA6C-44B3-8ABB-90765DA4D516}.Debug|x86.ActiveCfg = Debug|Win32 {EDA960FC-AA6C-44B3-8ABB-90765DA4D516}.Debug|x86.Build.0 = Debug|Win32 - {EDA960FC-AA6C-44B3-8ABB-90765DA4D516}.Release|ARM.ActiveCfg = Release|ARM - {EDA960FC-AA6C-44B3-8ABB-90765DA4D516}.Release|ARM.Build.0 = Release|ARM {EDA960FC-AA6C-44B3-8ABB-90765DA4D516}.Release|x64.ActiveCfg = Release|x64 {EDA960FC-AA6C-44B3-8ABB-90765DA4D516}.Release|x64.Build.0 = Release|x64 {EDA960FC-AA6C-44B3-8ABB-90765DA4D516}.Release|x86.ActiveCfg = Release|Win32 {EDA960FC-AA6C-44B3-8ABB-90765DA4D516}.Release|x86.Build.0 = Release|Win32 - {F40021AC-6D7B-4828-81C4-2D04F946A88E}.Debug|ARM.ActiveCfg = Debug|ARM - {F40021AC-6D7B-4828-81C4-2D04F946A88E}.Debug|ARM.Build.0 = Debug|ARM {F40021AC-6D7B-4828-81C4-2D04F946A88E}.Debug|x64.ActiveCfg = Debug|x64 {F40021AC-6D7B-4828-81C4-2D04F946A88E}.Debug|x64.Build.0 = Debug|x64 {F40021AC-6D7B-4828-81C4-2D04F946A88E}.Debug|x86.ActiveCfg = Debug|Win32 {F40021AC-6D7B-4828-81C4-2D04F946A88E}.Debug|x86.Build.0 = Debug|Win32 - {F40021AC-6D7B-4828-81C4-2D04F946A88E}.Release|ARM.ActiveCfg = Release|ARM - {F40021AC-6D7B-4828-81C4-2D04F946A88E}.Release|ARM.Build.0 = Release|ARM {F40021AC-6D7B-4828-81C4-2D04F946A88E}.Release|x64.ActiveCfg = Release|x64 {F40021AC-6D7B-4828-81C4-2D04F946A88E}.Release|x64.Build.0 = Release|x64 {F40021AC-6D7B-4828-81C4-2D04F946A88E}.Release|x86.ActiveCfg = Release|Win32 {F40021AC-6D7B-4828-81C4-2D04F946A88E}.Release|x86.Build.0 = Release|Win32 - {516AA088-64B1-4DCF-9631-59F91F0E849A}.Debug|ARM.ActiveCfg = Debug|ARM - {516AA088-64B1-4DCF-9631-59F91F0E849A}.Debug|ARM.Build.0 = Debug|ARM {516AA088-64B1-4DCF-9631-59F91F0E849A}.Debug|x64.ActiveCfg = Debug|x64 {516AA088-64B1-4DCF-9631-59F91F0E849A}.Debug|x64.Build.0 = Debug|x64 {516AA088-64B1-4DCF-9631-59F91F0E849A}.Debug|x86.ActiveCfg = Debug|Win32 {516AA088-64B1-4DCF-9631-59F91F0E849A}.Debug|x86.Build.0 = Debug|Win32 - {516AA088-64B1-4DCF-9631-59F91F0E849A}.Release|ARM.ActiveCfg = Release|ARM - {516AA088-64B1-4DCF-9631-59F91F0E849A}.Release|ARM.Build.0 = Release|ARM {516AA088-64B1-4DCF-9631-59F91F0E849A}.Release|x64.ActiveCfg = Release|x64 {516AA088-64B1-4DCF-9631-59F91F0E849A}.Release|x64.Build.0 = Release|x64 {516AA088-64B1-4DCF-9631-59F91F0E849A}.Release|x86.ActiveCfg = Release|Win32 {516AA088-64B1-4DCF-9631-59F91F0E849A}.Release|x86.Build.0 = Release|Win32 - {22BA09AE-E0B5-49F1-8403-2A824762376E}.Debug|ARM.ActiveCfg = Debug|ARM - {22BA09AE-E0B5-49F1-8403-2A824762376E}.Debug|ARM.Build.0 = Debug|ARM - {22BA09AE-E0B5-49F1-8403-2A824762376E}.Debug|x64.ActiveCfg = Debug|ARM - {22BA09AE-E0B5-49F1-8403-2A824762376E}.Debug|x86.ActiveCfg = Debug|ARM - {22BA09AE-E0B5-49F1-8403-2A824762376E}.Release|ARM.ActiveCfg = Release|ARM - {22BA09AE-E0B5-49F1-8403-2A824762376E}.Release|ARM.Build.0 = Release|ARM - {22BA09AE-E0B5-49F1-8403-2A824762376E}.Release|x64.ActiveCfg = Release|ARM - {22BA09AE-E0B5-49F1-8403-2A824762376E}.Release|x86.ActiveCfg = Release|ARM EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -305,7 +237,5 @@ Global {C50F6528-6A12-49A9-BEC0-E07CF153FCA8} = {1A93BE77-E0C0-48BC-83FB-96518008B148} {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C} = {1A93BE77-E0C0-48BC-83FB-96518008B148} {58F32677-436B-412A-BBF8-2B1310D82CD8} = {1A93BE77-E0C0-48BC-83FB-96518008B148} - {E333476E-15E3-4D43-A4CF-8748058B3BE9} = {1A93BE77-E0C0-48BC-83FB-96518008B148} - {22BA09AE-E0B5-49F1-8403-2A824762376E} = {1D709544-3FFA-4778-81E4-F1BEFEA67EDF} EndGlobalSection EndGlobal |
