From af1e3842b7986a9b0840e4f79823279f77ccd386 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 18 Dec 2017 11:05:03 -0800 Subject: Removed jni/Visual GDB Android build from legacy project files --- .../build/Win32/GhostCubePlugin-Debug.vgdbsettings | 76 ------------- .../Win32/GhostCubePlugin-Release.vgdbsettings | 76 ------------- .../build/Win32/GhostCubePlugin.vcxproj | 53 --------- .../build/Win32/GhostCubePlugin.vcxproj.filters | 31 ------ .../PluginSource/build/Win32/jni/Android.mk | 80 -------------- .../PluginSource/build/Win32/jni/Application.mk | 7 -- .../GhostCubeScene/build/Win32/AndroidManifest.xml | 20 ---- .../build/Win32/GhostCubeScene-Debug.vgdbsettings | 90 --------------- .../Win32/GhostCubeScene-Release.vgdbsettings | 81 -------------- .../build/Win32/GhostCubeScene.vcxproj | 58 ---------- .../build/Win32/GhostCubeScene.vcxproj.filters | 47 -------- .../GhostCubeScene/build/Win32/android_build.bat | 13 --- unityplugin/GhostCubeScene/build/Win32/build.xml | 100 ----------------- .../GhostCubeScene/build/Win32/jni/Android.mk | 122 --------------------- .../GhostCubeScene/build/Win32/jni/Application.mk | 7 -- .../build/Win32/res/drawable-hdpi/ic_launcher.png | Bin 8203 -> 0 bytes .../build/Win32/res/drawable-ldpi/ic_launcher.png | Bin 2556 -> 0 bytes .../build/Win32/res/drawable-mdpi/ic_launcher.png | Bin 4064 -> 0 bytes .../build/Win32/res/drawable-xhdpi/ic_launcher.png | Bin 13541 -> 0 bytes .../build/Win32/res/layout/widgets.xml | 17 --- .../build/Win32/res/values-v11/styles.xml | 11 -- .../build/Win32/res/values-v14/styles.xml | 12 -- .../build/Win32/res/values/strings.xml | 6 - .../build/Win32/res/values/styles.xml | 20 ---- .../build/Win32/UnityEmulator-Debug.vgdbsettings | 76 ------------- .../build/Win32/UnityEmulator-Release.vgdbsettings | 76 ------------- .../build/Win32/UnityEmulator.vcxproj | 77 +------------ .../build/Win32/UnityEmulator.vcxproj.filters | 49 --------- .../UnityEmulator/build/Win32/jni/Android.mk | 47 -------- .../UnityEmulator/build/Win32/jni/Application.mk | 7 -- unityplugin/build/Win32/UnityPlugin.sln | 70 ------------ 31 files changed, 1 insertion(+), 1328 deletions(-) delete mode 100644 unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin-Debug.vgdbsettings delete mode 100644 unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin-Release.vgdbsettings delete mode 100644 unityplugin/GhostCubePlugin/PluginSource/build/Win32/jni/Android.mk delete mode 100644 unityplugin/GhostCubePlugin/PluginSource/build/Win32/jni/Application.mk delete mode 100644 unityplugin/GhostCubeScene/build/Win32/AndroidManifest.xml delete mode 100644 unityplugin/GhostCubeScene/build/Win32/GhostCubeScene-Debug.vgdbsettings delete mode 100644 unityplugin/GhostCubeScene/build/Win32/GhostCubeScene-Release.vgdbsettings delete mode 100644 unityplugin/GhostCubeScene/build/Win32/android_build.bat delete mode 100644 unityplugin/GhostCubeScene/build/Win32/build.xml delete mode 100644 unityplugin/GhostCubeScene/build/Win32/jni/Android.mk delete mode 100644 unityplugin/GhostCubeScene/build/Win32/jni/Application.mk delete mode 100644 unityplugin/GhostCubeScene/build/Win32/res/drawable-hdpi/ic_launcher.png delete mode 100644 unityplugin/GhostCubeScene/build/Win32/res/drawable-ldpi/ic_launcher.png delete mode 100644 unityplugin/GhostCubeScene/build/Win32/res/drawable-mdpi/ic_launcher.png delete mode 100644 unityplugin/GhostCubeScene/build/Win32/res/drawable-xhdpi/ic_launcher.png delete mode 100644 unityplugin/GhostCubeScene/build/Win32/res/layout/widgets.xml delete mode 100644 unityplugin/GhostCubeScene/build/Win32/res/values-v11/styles.xml delete mode 100644 unityplugin/GhostCubeScene/build/Win32/res/values-v14/styles.xml delete mode 100644 unityplugin/GhostCubeScene/build/Win32/res/values/strings.xml delete mode 100644 unityplugin/GhostCubeScene/build/Win32/res/values/styles.xml delete mode 100644 unityplugin/UnityEmulator/build/Win32/UnityEmulator-Debug.vgdbsettings delete mode 100644 unityplugin/UnityEmulator/build/Win32/UnityEmulator-Release.vgdbsettings delete mode 100644 unityplugin/UnityEmulator/build/Win32/jni/Android.mk delete mode 100644 unityplugin/UnityEmulator/build/Win32/jni/Application.mk (limited to 'unityplugin') 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 @@ - - - Debug - - - - MinGWWindowsSlash - - $(ProjectDir) - - - android-19 - true - true - bin;obj - false - false - - - - - - false - false - true - false - false - false - false - true - false - KillApp - - false - false - false - false - false - false - false - false - - false - false - main - true - - - false - false - 5039 - 5039 - 10000 - 0 - false - Ask - true - true - - - - - - - - - - - Default - - - - true - - - \ 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 @@ - - - Release - - - - MinGWWindowsSlash - - $(ProjectDir) - - - android-19 - false - true - bin;obj - false - false - - - - - - false - false - true - false - false - false - false - true - false - KillApp - - false - false - false - false - false - false - false - false - - false - false - main - true - - - false - false - 5039 - 5039 - 10000 - 0 - false - Ask - true - true - - - - - - - - - - - Default - - - - true - - - \ 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 @@  - - Debug - ARM - Debug Win32 @@ -13,10 +9,6 @@ Debug x64 - - Release - ARM - Release Win32 @@ -51,9 +43,6 @@ {1a782154-a5bd-4a05-b837-efc77f126c84} - - {e333476e-15e3-4d43-a4cf-8748058b3be9} - {8ada5f93-7a38-4ad8-b8f5-1ffd4d4f630c} @@ -63,34 +52,6 @@ - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - {EDA960FC-AA6C-44B3-8ABB-90765DA4D516} @@ -125,14 +86,6 @@ true Unicode - - v120 - Makefile - - - v120 - Makefile - @@ -161,12 +114,6 @@ - - - - - - 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 @@ - - Android\jni - - - Android\jni - - - - - {11b4220e-29bf-4572-bee2-1fd8d75f0c48} - - - {f09afa4f-3ec1-407b-acef-eeded2cb895d} - - - {c3a3aa9e-0f29-4329-92ef-929a34b932fb} - - - - - Android\src - - - Android\src - - - Android\src - - - Android\src - \ 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 @@ - - - - - - - - - - - - - - - - - - - \ 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 @@ - - - Debug - - - - MinGWWindowsSlash - - $(ProjectDir) - - - android-19 - true - false - bin;obj - false - false - - - - - - false - false - true - false - false - false - false - true - true - KillApp - - false - false - false - false - false - false - false - false - - false - false - main - true - false - false - - - false - - true - 5039 - 5039 - 10000 - 0 - false - Relaunch - true - true - - - - - /data/local/tmp - - - - - - - - - - - - - - - - - Default - - - - true - - - \ 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 @@ - - - Release - - - - MinGWWindowsSlash - - $(ProjectDir) - - - android-19 - false - false - bin;obj - false - false - - - - - - false - false - true - false - false - false - false - true - false - KillApp - - false - false - false - false - false - false - false - false - - false - false - main - true - false - false - - - false - false - 5039 - 5039 - 10000 - 0 - false - Ask - true - true - - /data/local/tmp - - - - - - - - - - - - Default - - - - true - - - \ 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 @@  - - Debug - ARM - Debug Win32 @@ -13,10 +9,6 @@ Debug x64 - - Release - ARM - Release Win32 @@ -58,14 +50,6 @@ true Unicode - - v120 - Makefile - - - v120 - Makefile - @@ -91,25 +75,11 @@ - - - - - - - - $(ProjectDir)..\..\..\..\Common\Android\gcc_Debug.h;$(NMakeForcedIncludes) - $(ProjectDir)GhostCubeScene-Debug.vgdbsettings - - - $(ProjectDir)..\..\..\..\Common\Android\gcc_Release.h;$(NMakeForcedIncludes) - $(ProjectDir)GhostCubeScene-Release.vgdbsettings - Level3 @@ -215,28 +185,14 @@ copy "%(RelativeDir)%(Filename).pdb" "$(TargetDir)" Copying %(Filename).dll and %(Filename).pdb $(TargetDir)%(Filename).dll - - - - - - - - {7380f7e6-315f-4b4e-92eb-e6aeee865298} - - {22ba09ae-e0b5-49f1-8403-2a824762376e} - {664e6f0d-6784-4760-9565-d54f8eb1edf4} - - {e333476e-15e3-4d43-a4cf-8748058b3be9} - {8ada5f93-7a38-4ad8-b8f5-1ffd4d4f630c} @@ -247,20 +203,6 @@ copy "%(RelativeDir)%(Filename).pdb" "$(TargetDir)" {f40021ac-6d7b-4828-81c4-2d04f946a88e} - - - true - true - true - true - - - true - true - true - true - - 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 @@  - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - {99c6c817-b02b-4b78-8b27-011a6f68c396} - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {1e08520a-5f84-419f-9ab8-b20c4af153a3} - - - {cd80a81f-81ce-45e0-a041-ad1424d39aef} - - - {450ce8ab-a0ce-402c-97d8-aa38f90f85bd} - - - - - Android\jni - - - Android\jni - - - - - Android - - - Android - - - Android\res - - - Android\res - @@ -58,12 +19,4 @@ DLLs - - - Android\src - - - Android\src - - \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index ea01cbf..0000000 Binary files a/unityplugin/GhostCubeScene/build/Win32/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/unityplugin/GhostCubeScene/build/Win32/res/drawable-ldpi/ic_launcher.png b/unityplugin/GhostCubeScene/build/Win32/res/drawable-ldpi/ic_launcher.png deleted file mode 100644 index a3d6a18..0000000 Binary files a/unityplugin/GhostCubeScene/build/Win32/res/drawable-ldpi/ic_launcher.png and /dev/null differ diff --git a/unityplugin/GhostCubeScene/build/Win32/res/drawable-mdpi/ic_launcher.png b/unityplugin/GhostCubeScene/build/Win32/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 8f80897..0000000 Binary files a/unityplugin/GhostCubeScene/build/Win32/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/unityplugin/GhostCubeScene/build/Win32/res/drawable-xhdpi/ic_launcher.png b/unityplugin/GhostCubeScene/build/Win32/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index b779a2b..0000000 Binary files a/unityplugin/GhostCubeScene/build/Win32/res/drawable-xhdpi/ic_launcher.png and /dev/null differ 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 @@ - - - - - - \ 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 @@ - - - - - - \ 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 @@ - - - - - - \ 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 @@ - - - Ghost cube scene emulator - GhostCubePlugin - - \ 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 @@ - - - - - - - - - \ 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 @@ - - - Debug - - - - MinGWWindowsSlash - - $(ProjectDir) - - - android-19 - true - true - bin;obj - false - false - - - - - - false - false - true - false - false - false - false - true - false - KillApp - - false - false - false - false - false - false - false - false - - false - false - main - true - - - false - false - 5039 - 5039 - 10000 - 0 - false - Ask - true - true - - - - - - - - - - - Default - - - - true - - - \ 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 @@ - - - Release - - - - MinGWWindowsSlash - - $(ProjectDir) - - - android-19 - false - true - bin;obj - false - false - - - - - - false - false - true - false - false - false - false - true - false - KillApp - - false - false - false - false - false - false - false - false - - false - false - main - true - - - false - false - 5039 - 5039 - 10000 - 0 - false - Ask - true - true - - - - - - - - - - - Default - - - - true - - - \ 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 @@  - - Debug - ARM - Debug Win32 @@ -13,10 +9,6 @@ Debug x64 - - Release - ARM - Release Win32 @@ -59,14 +51,6 @@ true Unicode - - v120 - Makefile - - - v120 - Makefile - @@ -94,27 +78,11 @@ - - - - - - - - $(ProjectDir)..\..\..\..\Common\Android\gcc_Debug.h;$(NMakeForcedIncludes) - - - - - $(ProjectDir)..\..\..\..\Common\Android\gcc_Release.h;$(NMakeForcedIncludes) - - - Level3 @@ -188,40 +156,7 @@ - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - + @@ -249,16 +184,6 @@ {58f32677-436b-412a-bbf8-2b1310d82cd8} - - - - - - - - - - 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 @@  - - {154722cc-8c82-4869-8e51-fb073a87f966} - - - {fe07d990-c5ac-488d-b7df-b3c66018d0b3} - - - {31c218a8-0b04-4224-97ad-909aeff5c135} - - - {90e91db8-8be2-446b-abee-0365b7dc18a8} - {e9f1e7cd-5112-4fb6-854a-3ebfd5efa88b} @@ -24,42 +12,5 @@ Windows\src - - Android\src - - - Android\src - - - Android\src - - - Android\src - - - Android\src - - - - - Android\Java - - - Android\jni - - - Android\jni - - - Android\Java - - - Android\Java - - - - - Android\src - \ 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 -- cgit v1.2.3