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/TextureLoader-Debug.vgdbsettings | 76 ++++++++ .../build/Win32/TextureLoader-Release.vgdbsettings | 76 ++++++++ TextureLoader/build/Win32/TextureLoader.vcxproj | 203 +++++++++++++++++++++ .../build/Win32/TextureLoader.vcxproj.filters | 37 ++++ TextureLoader/build/Win32/jni/Android.mk | 37 ++++ TextureLoader/build/Win32/jni/Application.mk | 7 + 6 files changed, 436 insertions(+) create mode 100644 TextureLoader/build/Win32/TextureLoader-Debug.vgdbsettings create mode 100644 TextureLoader/build/Win32/TextureLoader-Release.vgdbsettings create mode 100644 TextureLoader/build/Win32/TextureLoader.vcxproj create mode 100644 TextureLoader/build/Win32/TextureLoader.vcxproj.filters create mode 100644 TextureLoader/build/Win32/jni/Android.mk create mode 100644 TextureLoader/build/Win32/jni/Application.mk (limited to 'TextureLoader/build/Win32') diff --git a/TextureLoader/build/Win32/TextureLoader-Debug.vgdbsettings b/TextureLoader/build/Win32/TextureLoader-Debug.vgdbsettings new file mode 100644 index 0000000..3f5b24b --- /dev/null +++ b/TextureLoader/build/Win32/TextureLoader-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/TextureLoader/build/Win32/TextureLoader-Release.vgdbsettings b/TextureLoader/build/Win32/TextureLoader-Release.vgdbsettings new file mode 100644 index 0000000..669691f --- /dev/null +++ b/TextureLoader/build/Win32/TextureLoader-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/TextureLoader/build/Win32/TextureLoader.vcxproj b/TextureLoader/build/Win32/TextureLoader.vcxproj new file mode 100644 index 0000000..8da8c4f --- /dev/null +++ b/TextureLoader/build/Win32/TextureLoader.vcxproj @@ -0,0 +1,203 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + + true + true + true + true + + + true + true + true + true + + + Create + Create + Create + Create + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + + + {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F} + Win32Proj + TextureLoader + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + v120 + Makefile + + + v120 + Makefile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/TextureLoader/build/Win32/TextureLoader.vcxproj.filters b/TextureLoader/build/Win32/TextureLoader.vcxproj.filters new file mode 100644 index 0000000..cfb971d --- /dev/null +++ b/TextureLoader/build/Win32/TextureLoader.vcxproj.filters @@ -0,0 +1,37 @@ + + + + + {9aae993e-4783-459d-acd3-791162b94c61} + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + + + jni + + + jni + + + \ No newline at end of file diff --git a/TextureLoader/build/Win32/jni/Android.mk b/TextureLoader/build/Win32/jni/Android.mk new file mode 100644 index 0000000..2e99915 --- /dev/null +++ b/TextureLoader/build/Win32/jni/Android.mk @@ -0,0 +1,37 @@ +# Android NDK project makefile autogenerated by Premake + +# Preamble +DEPENDENCY_PATH := $(call my-dir) +LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) +include $(CLEAR_VARS) + + +# Project configuration +LOCAL_MODULE := TextureLoader +LOCAL_CFLAGS := -std=c++11 +LOCAL_CPP_FEATURES := exceptions +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 += $(PROJECT_ROOT)/interface +LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/include +LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/interface +LOCAL_C_INCLUDES += $(CORE_ROOT)/Platforms/interface +LOCAL_C_INCLUDES += $(GRAPHICS_ROOT)/GraphicsEngine/interface +LOCAL_C_INCLUDES += $(GRAPHICS_ROOT)/GraphicsTools/include +LOCAL_C_INCLUDES += $(REPO_ROOT)/External/libtiff-4.0.3/libtiff +LOCAL_C_INCLUDES += $(REPO_ROOT)/External/lpng-1.6.17 +LOCAL_C_INCLUDES += $(REPO_ROOT)/External/libjpeg-9a +LOCAL_C_INCLUDES += $(REPO_ROOT)/External/zlib-1.2.8 + +# Source files +#VisualGDBAndroid: AutoUpdateSourcesInNextLine +LOCAL_SRC_FILES := ../../../src/DDSLoader.cpp ../../../src/Image.cpp ../../../src/pch.cpp ../../../src/TextureLoader.cpp ../../../src/TextureUtilities.cpp + +include $(BUILD_STATIC_LIBRARY) diff --git a/TextureLoader/build/Win32/jni/Application.mk b/TextureLoader/build/Win32/jni/Application.mk new file mode 100644 index 0000000..221d4b0 --- /dev/null +++ b/TextureLoader/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 := TextureLoader \ No newline at end of file -- cgit v1.2.3