From 8077ddaf62bdbff2169973eca565a5752501587d Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Fri, 19 Aug 2016 23:38:41 -0700 Subject: Updated to Diligent Engine 2.0 --- RenderScript/build/Windows/EngineRoot.props | 30 -- .../build/Windows/RenderScript-Debug.vgdbsettings | 76 ----- .../Windows/RenderScript-Release.vgdbsettings | 76 ----- RenderScript/build/Windows/RenderScript.props | 10 - RenderScript/build/Windows/RenderScript.vcxproj | 308 --------------------- .../build/Windows/RenderScript.vcxproj.filters | 90 ------ RenderScript/build/Windows/jni/Android.mk | 31 --- RenderScript/build/Windows/jni/Application.mk | 7 - 8 files changed, 628 deletions(-) delete mode 100644 RenderScript/build/Windows/EngineRoot.props delete mode 100644 RenderScript/build/Windows/RenderScript-Debug.vgdbsettings delete mode 100644 RenderScript/build/Windows/RenderScript-Release.vgdbsettings delete mode 100644 RenderScript/build/Windows/RenderScript.props delete mode 100644 RenderScript/build/Windows/RenderScript.vcxproj delete mode 100644 RenderScript/build/Windows/RenderScript.vcxproj.filters delete mode 100644 RenderScript/build/Windows/jni/Android.mk delete mode 100644 RenderScript/build/Windows/jni/Application.mk (limited to 'RenderScript/build/Windows') diff --git a/RenderScript/build/Windows/EngineRoot.props b/RenderScript/build/Windows/EngineRoot.props deleted file mode 100644 index 92b5517..0000000 --- a/RenderScript/build/Windows/EngineRoot.props +++ /dev/null @@ -1,30 +0,0 @@ - - - - - ..\.. - ..\..\.. - ..\..\..\.. - $(EngineRoot)\diligentcore - $(CoreRoot)\Graphics - - - - - - $(ProjectRoot) - - - $(ToolsRoot) - - - $(EngineRoot) - - - $(CoreRoot) - - - $(GraphicsRoot) - - - \ No newline at end of file diff --git a/RenderScript/build/Windows/RenderScript-Debug.vgdbsettings b/RenderScript/build/Windows/RenderScript-Debug.vgdbsettings deleted file mode 100644 index 3f5b24b..0000000 --- a/RenderScript/build/Windows/RenderScript-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/RenderScript/build/Windows/RenderScript-Release.vgdbsettings b/RenderScript/build/Windows/RenderScript-Release.vgdbsettings deleted file mode 100644 index 669691f..0000000 --- a/RenderScript/build/Windows/RenderScript-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/RenderScript/build/Windows/RenderScript.props b/RenderScript/build/Windows/RenderScript.props deleted file mode 100644 index 8dd0ca6..0000000 --- a/RenderScript/build/Windows/RenderScript.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - $(ProjectRoot)\include;$(CoreRoot)\Common\include;$(CoreRoot)\Common\interface;$(GraphicsRoot)\GraphicsEngine\interface;$(ToolsRoot)\External\lua-5.2.3\src;$(CoreRoot)\Platforms\interface;$(GraphicsRoot)\GraphicsTools\include;$(VC_IncludePath);$(WindowsSDK_IncludePath) - - - - \ No newline at end of file diff --git a/RenderScript/build/Windows/RenderScript.vcxproj b/RenderScript/build/Windows/RenderScript.vcxproj deleted file mode 100644 index 3ea8d8e..0000000 --- a/RenderScript/build/Windows/RenderScript.vcxproj +++ /dev/null @@ -1,308 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04} - RenderScript - - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - v120 - Makefile - - - v120 - Makefile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(ProjectDir)..\..\..\Common\Android\gcc_Debug.h;$(NMakeForcedIncludes) - - - $(ProjectDir)..\..\..\Common\Android\gcc_Release.h;$(NMakeForcedIncludes) - - - - Level3 - Disabled - true - - - true - - - - - Level3 - Disabled - true - - - true - - - - - Level3 - MaxSpeed - true - true - true - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - true - - - true - true - true - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - \ No newline at end of file diff --git a/RenderScript/build/Windows/RenderScript.vcxproj.filters b/RenderScript/build/Windows/RenderScript.vcxproj.filters deleted file mode 100644 index 4ef09d5..0000000 --- a/RenderScript/build/Windows/RenderScript.vcxproj.filters +++ /dev/null @@ -1,90 +0,0 @@ - - - - - {7b27af1c-c100-4b86-8a4d-3ca9de633b95} - - - {2d07eaf6-da74-46a3-87bb-44b0c7ce24e6} - - - - - jni - - - jni - - - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - \ No newline at end of file diff --git a/RenderScript/build/Windows/jni/Android.mk b/RenderScript/build/Windows/jni/Android.mk deleted file mode 100644 index d629a4f..0000000 --- a/RenderScript/build/Windows/jni/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -# Preamble -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) -include $(CLEAR_VARS) - - -# Project configuration -LOCAL_MODULE := RenderScript -LOCAL_CFLAGS := -std=c++11 -Wno-invalid-offsetof -LOCAL_CPP_FEATURES := exceptions rtti -LOCAL_STATIC_LIBRARIES += - -# Include paths -PROJECT_ROOT = $(LOCAL_PATH)/../../.. -REPO_ROOT := $(PROJECT_ROOT)/.. -ENGINE_ROOT := $(REPO_ROOT)/.. -CORE_ROOT := $(ENGINE_ROOT)/diligentcore -GRAPHICS_ROOT := $(CORE_ROOT)/graphics -LOCAL_C_INCLUDES += $(PROJECT_ROOT)/include -LOCAL_C_INCLUDES += $(GRAPHICS_ROOT)/GraphicsEngine/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/include -LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/interface -LOCAL_C_INCLUDES += $(REPO_ROOT)/External/lua-5.2.3/src -LOCAL_C_INCLUDES += $(GRAPHICS_ROOT)/GraphicsTools/include -LOCAL_C_INCLUDES += $(CORE_ROOT)/Platforms/interface - -# Source files -#VisualGDBAndroid: AutoUpdateSourcesInNextLine -LOCAL_SRC_FILES := ../../../src/BlendStateParser.cpp ../../../src/BufferParser.cpp ../../../src/BufferViewParser.cpp ../../../src/DepthStencilStateParser.cpp ../../../src/DeviceContextFuncBindings.cpp ../../../src/DrawAttribsParser.cpp ../../../src/EngineObjectParserBase.cpp ../../../src/EnumMappings.cpp ../../../src/LayoutDescParser.cpp ../../../src/LuaBindings.cpp ../../../src/LuaFunctionBinding.cpp ../../../src/LuaWrappers.cpp ../../../src/ParsingErrors.cpp ../../../src/RasterizerStateParser.cpp ../../../src/ResourceMappingParser.cpp ../../../src/SamplerParser.cpp ../../../src/ScissorRectParser.cpp ../../../src/ScriptParser.cpp ../../../src/ShaderParser.cpp ../../../src/ShaderVariableParser.cpp ../../../src/TextureParser.cpp ../../../src/TextureViewParser.cpp ../../../src/ViewportParser.cpp - -include $(BUILD_STATIC_LIBRARY) diff --git a/RenderScript/build/Windows/jni/Application.mk b/RenderScript/build/Windows/jni/Application.mk deleted file mode 100644 index 1c80ded..0000000 --- a/RenderScript/build/Windows/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 := RenderScript \ No newline at end of file -- cgit v1.2.3