From f2e065dee10fb110e9d51175ee6381333319ef56 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Tue, 20 Oct 2015 21:05:29 -0700 Subject: Release v1.0.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 + RenderScript/build/WindowsStore/EngineRoot.props | 30 ++ .../RenderScript.Shared.vcxitems | 77 ++++++ .../RenderScript.Shared.vcxitems.filters | 171 ++++++++++++ .../RenderScript.Windows.vcxproj | 205 ++++++++++++++ .../RenderScript.Windows.vcxproj.filters | 5 + .../RenderScript.WindowsPhone.vcxproj | 144 ++++++++++ .../RenderScript.WindowsPhone.vcxproj.filters | 5 + 15 files changed, 1265 insertions(+) create mode 100644 RenderScript/build/Windows/EngineRoot.props create mode 100644 RenderScript/build/Windows/RenderScript-Debug.vgdbsettings create mode 100644 RenderScript/build/Windows/RenderScript-Release.vgdbsettings create mode 100644 RenderScript/build/Windows/RenderScript.props create mode 100644 RenderScript/build/Windows/RenderScript.vcxproj create mode 100644 RenderScript/build/Windows/RenderScript.vcxproj.filters create mode 100644 RenderScript/build/Windows/jni/Android.mk create mode 100644 RenderScript/build/Windows/jni/Application.mk create mode 100644 RenderScript/build/WindowsStore/EngineRoot.props create mode 100644 RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems create mode 100644 RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems.filters create mode 100644 RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj create mode 100644 RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj.filters create mode 100644 RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj create mode 100644 RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj.filters (limited to 'RenderScript/build') diff --git a/RenderScript/build/Windows/EngineRoot.props b/RenderScript/build/Windows/EngineRoot.props new file mode 100644 index 0000000..92b5517 --- /dev/null +++ b/RenderScript/build/Windows/EngineRoot.props @@ -0,0 +1,30 @@ + + + + + ..\.. + ..\..\.. + ..\..\..\.. + $(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 new file mode 100644 index 0000000..3f5b24b --- /dev/null +++ b/RenderScript/build/Windows/RenderScript-Debug.vgdbsettings @@ -0,0 +1,76 @@ + + + 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 new file mode 100644 index 0000000..669691f --- /dev/null +++ b/RenderScript/build/Windows/RenderScript-Release.vgdbsettings @@ -0,0 +1,76 @@ + + + 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 new file mode 100644 index 0000000..8dd0ca6 --- /dev/null +++ b/RenderScript/build/Windows/RenderScript.props @@ -0,0 +1,10 @@ + + + + + + $(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 new file mode 100644 index 0000000..3ea8d8e --- /dev/null +++ b/RenderScript/build/Windows/RenderScript.vcxproj @@ -0,0 +1,308 @@ + + + + + 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 new file mode 100644 index 0000000..4ef09d5 --- /dev/null +++ b/RenderScript/build/Windows/RenderScript.vcxproj.filters @@ -0,0 +1,90 @@ + + + + + {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 new file mode 100644 index 0000000..d629a4f --- /dev/null +++ b/RenderScript/build/Windows/jni/Android.mk @@ -0,0 +1,31 @@ +# 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 new file mode 100644 index 0000000..1c80ded --- /dev/null +++ b/RenderScript/build/Windows/jni/Application.mk @@ -0,0 +1,7 @@ +# 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 diff --git a/RenderScript/build/WindowsStore/EngineRoot.props b/RenderScript/build/WindowsStore/EngineRoot.props new file mode 100644 index 0000000..79dc389 --- /dev/null +++ b/RenderScript/build/WindowsStore/EngineRoot.props @@ -0,0 +1,30 @@ + + + + + ..\..\.. + $(ProjectRoot)\.. + $(ToolsRoot)\.. + $(EngineRoot)\diligentcore + $(CoreRoot)\Graphics + + + + + + $(ProjectRoot) + + + $(ToolsRoot) + + + $(EngineRoot) + + + $(CoreRoot) + + + $(GraphicsRoot) + + + \ No newline at end of file diff --git a/RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems b/RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems new file mode 100644 index 0000000..cb66637 --- /dev/null +++ b/RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems @@ -0,0 +1,77 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {ac843cd8-70c4-4bf9-bbfb-bb8e5979f81e} + RenderScript + RenderScript.Shared + 248F659F-DAC5-46E8-AC09-60EC9FC95053 + + + + %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + \ No newline at end of file diff --git a/RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems.filters b/RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems.filters new file mode 100644 index 0000000..a82a379 --- /dev/null +++ b/RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems.filters @@ -0,0 +1,171 @@ + + + + + {69ff86a9-0ff4-402f-817b-e18bb6685329} + + + {6e3f6948-d5fa-4225-b192-0354c9935989} + + + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + \ No newline at end of file diff --git a/RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj b/RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj new file mode 100644 index 0000000..250c7b6 --- /dev/null +++ b/RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj @@ -0,0 +1,205 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + {1911bc2f-d78f-49c7-8847-b10b333da85a} + RenderScript + en-US + 12.0 + true + Windows Store + 8.1 + CodeSharingStaticLibrary + + + + StaticLibrary + true + v120 + + + StaticLibrary + true + v120 + + + StaticLibrary + true + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + true + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + false + + + false + + + false + + + false + + + false + + + + Use + false + true + + + Console + false + false + + + + + Use + false + true + + + Console + false + false + + + + + Use + false + true + + + Console + false + false + + + + + Use + false + true + + + Console + false + false + + + + + Use + false + true + + + Console + false + false + + + + + Use + false + true + + + Console + false + false + + + + + + \ No newline at end of file diff --git a/RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj.filters b/RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj.filters new file mode 100644 index 0000000..a7761ab --- /dev/null +++ b/RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj.filters @@ -0,0 +1,5 @@ + + + + + diff --git a/RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj b/RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj new file mode 100644 index 0000000..1bb30a3 --- /dev/null +++ b/RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj @@ -0,0 +1,144 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Release + ARM + + + Release + Win32 + + + + {c6d20522-f184-47e4-afa0-31341a71495f} + RenderScript + en-US + 12.0 + true + Windows Phone + 8.1 + CodeSharingStaticLibrary + + + + StaticLibrary + true + v120_wp81 + + + StaticLibrary + true + v120_wp81 + + + StaticLibrary + false + true + v120_wp81 + + + StaticLibrary + false + true + v120_wp81 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + false + + + false + + + false + + + + Use + false + true + + + Console + false + false + + + + + Use + false + true + + + Console + false + false + + + + + Use + false + true + + + Console + false + false + + + + + Use + false + true + + + Console + false + false + + + + + + \ No newline at end of file diff --git a/RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj.filters b/RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj.filters new file mode 100644 index 0000000..a7761ab --- /dev/null +++ b/RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj.filters @@ -0,0 +1,5 @@ + + + + + -- cgit v1.2.3