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/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 -- 6 files changed, 1 insertion(+), 331 deletions(-) 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/UnityEmulator') 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 -- cgit v1.2.3