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 --- .../build/Win32/RenderScript-Debug.vgdbsettings | 76 +++++ .../build/Win32/RenderScript-Release.vgdbsettings | 76 +++++ RenderScript/build/Win32/RenderScript.vcxproj | 316 +++++++++++++++++++++ .../build/Win32/RenderScript.vcxproj.filters | 96 +++++++ RenderScript/build/Win32/jni/Android.mk | 31 ++ RenderScript/build/Win32/jni/Application.mk | 7 + 6 files changed, 602 insertions(+) create mode 100644 RenderScript/build/Win32/RenderScript-Debug.vgdbsettings create mode 100644 RenderScript/build/Win32/RenderScript-Release.vgdbsettings create mode 100644 RenderScript/build/Win32/RenderScript.vcxproj create mode 100644 RenderScript/build/Win32/RenderScript.vcxproj.filters create mode 100644 RenderScript/build/Win32/jni/Android.mk create mode 100644 RenderScript/build/Win32/jni/Application.mk (limited to 'RenderScript/build/Win32') diff --git a/RenderScript/build/Win32/RenderScript-Debug.vgdbsettings b/RenderScript/build/Win32/RenderScript-Debug.vgdbsettings new file mode 100644 index 0000000..3f5b24b --- /dev/null +++ b/RenderScript/build/Win32/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/Win32/RenderScript-Release.vgdbsettings b/RenderScript/build/Win32/RenderScript-Release.vgdbsettings new file mode 100644 index 0000000..669691f --- /dev/null +++ b/RenderScript/build/Win32/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/Win32/RenderScript.vcxproj b/RenderScript/build/Win32/RenderScript.vcxproj new file mode 100644 index 0000000..403dd93 --- /dev/null +++ b/RenderScript/build/Win32/RenderScript.vcxproj @@ -0,0 +1,316 @@ + + + + + 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 + + + true + true + true + true + + + true + true + true + true + + + + + + \ No newline at end of file diff --git a/RenderScript/build/Win32/RenderScript.vcxproj.filters b/RenderScript/build/Win32/RenderScript.vcxproj.filters new file mode 100644 index 0000000..fda009a --- /dev/null +++ b/RenderScript/build/Win32/RenderScript.vcxproj.filters @@ -0,0 +1,96 @@ + + + + + {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 + + + android_src + + + android_src + + + \ No newline at end of file diff --git a/RenderScript/build/Win32/jni/Android.mk b/RenderScript/build/Win32/jni/Android.mk new file mode 100644 index 0000000..d968fcc --- /dev/null +++ b/RenderScript/build/Win32/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/BlendStateDescParser.cpp ../../../src/BufferParser.cpp ../../../src/BufferViewParser.cpp ../../../src/DepthStencilStateDescParser.cpp ../../../src/DeviceContextFuncBindings.cpp ../../../src/DrawAttribsParser.cpp ../../../src/EngineObjectParserBase.cpp ../../../src/EnumMappings.cpp ../../../src/InputLayoutDescParser.cpp ../../../src/LuaBindings.cpp ../../../src/LuaFunctionBinding.cpp ../../../src/LuaWrappers.cpp ../../../src/ParsingErrors.cpp ../../../src/PSODescParser.cpp ../../../src/RasterizerStateDescParser.cpp ../../../src/ResourceMappingParser.cpp ../../../src/SamplerParser.cpp ../../../src/ScissorRectParser.cpp ../../../src/ScriptParser.cpp ../../../src/ShaderParser.cpp ../../../src/ShaderResourceBindingParser.cpp ../../../src/ShaderVariableParser.cpp ../../../src/TextureParser.cpp ../../../src/TextureViewParser.cpp ../../../src/ViewportParser.cpp + +include $(BUILD_STATIC_LIBRARY) diff --git a/RenderScript/build/Win32/jni/Application.mk b/RenderScript/build/Win32/jni/Application.mk new file mode 100644 index 0000000..1c80ded --- /dev/null +++ b/RenderScript/build/Win32/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 -- cgit v1.2.3