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 -- 6 files changed, 323 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 (limited to 'unityplugin/GhostCubePlugin/PluginSource') 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 -- cgit v1.2.3