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 --- .../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 ---- 18 files changed, 604 deletions(-) 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 (limited to 'unityplugin/GhostCubeScene') 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 -- cgit v1.2.3