summaryrefslogtreecommitdiffstats
path: root/TextureLoader
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2017-12-18 18:49:46 +0000
committerEgor Yusov <egor.yusov@gmail.com>2017-12-18 18:49:46 +0000
commit291086bb5d14440ce8458d1217f76290af8db2dd (patch)
treee856780be00828d30c546da3c7098f986e2ae6c2 /TextureLoader
parentFixed Android warnings (diff)
downloadDiligentTools-291086bb5d14440ce8458d1217f76290af8db2dd.tar.gz
DiligentTools-291086bb5d14440ce8458d1217f76290af8db2dd.zip
Removed jni/Visual GDB build from legacy projects
Diffstat (limited to 'TextureLoader')
-rw-r--r--TextureLoader/build/Win32/TextureLoader-Debug.vgdbsettings76
-rw-r--r--TextureLoader/build/Win32/TextureLoader-Release.vgdbsettings76
-rw-r--r--TextureLoader/build/Win32/TextureLoader.vcxproj62
-rw-r--r--TextureLoader/build/Win32/TextureLoader.vcxproj.filters37
-rw-r--r--TextureLoader/build/Win32/jni/Android.mk37
-rw-r--r--TextureLoader/build/Win32/jni/Application.mk7
6 files changed, 1 insertions, 294 deletions
diff --git a/TextureLoader/build/Win32/TextureLoader-Debug.vgdbsettings b/TextureLoader/build/Win32/TextureLoader-Debug.vgdbsettings
deleted file mode 100644
index 3f5b24b..0000000
--- a/TextureLoader/build/Win32/TextureLoader-Debug.vgdbsettings
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <ConfigurationName>Debug</ConfigurationName>
- <Project xsi:type="com.visualgdb.project.android">
- <CustomSourceDirectories>
- <Directories />
- <PathStyle>MinGWWindowsSlash</PathStyle>
- </CustomSourceDirectories>
- <AndroidProjectPath>$(ProjectDir)</AndroidProjectPath>
- </Project>
- <Build xsi:type="com.visualgdb.build.android">
- <AndroidPlatform>android-19</AndroidPlatform>
- <IsDebugConfiguration>true</IsDebugConfiguration>
- <JNIOnlyBuild>true</JNIOnlyBuild>
- <AdditionalDirectoriesToDeleteOnClean>bin;obj</AdditionalDirectoriesToDeleteOnClean>
- <DeleteANTFilesOnClean>false</DeleteANTFilesOnClean>
- <DoNotEditAndroidManifest>false</DoNotEditAndroidManifest>
- <CustomActions />
- </Build>
- <Debug xsi:type="com.visualgdb.debug.android">
- <AdditionalStartupCommands />
- <AdditionalGDBSettings>
- <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
- <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
- <PendingBreakpointsSupported>true</PendingBreakpointsSupported>
- <DisableChildRanges>false</DisableChildRanges>
- <UseAppleExtensions>false</UseAppleExtensions>
- <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
- <MakeLogFile>false</MakeLogFile>
- <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
- <UseRelativePathsOnly>false</UseRelativePathsOnly>
- <ExitAction>KillApp</ExitAction>
- <Features>
- <DisableAutoDetection>false</DisableAutoDetection>
- <UseFrameParameter>false</UseFrameParameter>
- <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
- <ListLocalsSupported>false</ListLocalsSupported>
- <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
- <ThreadInfoSupported>false</ThreadInfoSupported>
- <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
- <SupportTargetCommand>false</SupportTargetCommand>
- </Features>
- <DisableDisassembly>false</DisableDisassembly>
- <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
- <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
- <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
- </AdditionalGDBSettings>
- <LaunchGDBSettings xsi:type="GDBLaunchParametersAndroid" />
- <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
- <UseDefaultInstallDir>false</UseDefaultInstallDir>
- <RemotePort>5039</RemotePort>
- <LocalPort>5039</LocalPort>
- <GDBServerStartupTimeout>10000</GDBServerStartupTimeout>
- <AdditionalGDBServerStartupDelay>0</AdditionalGDBServerStartupDelay>
- <DoubleSlashWorkaround>false</DoubleSlashWorkaround>
- <AlreadyRunningDecision>Ask</AlreadyRunningDecision>
- <ShowLogCat>true</ShowLogCat>
- <EnableThreadNameWatcher>true</EnableThreadNameWatcher>
- </Debug>
- <CustomBuild>
- <PreBuildActions />
- <PostBuildActions />
- <PreCleanActions />
- <PostCleanActions />
- </CustomBuild>
- <CustomDebug>
- <PreDebugActions />
- <PostDebugActions />
- <BreakMode>Default</BreakMode>
- </CustomDebug>
- <CustomShortcuts>
- <Shortcuts />
- <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
- </CustomShortcuts>
- <UserDefinedVariables />
-</VisualGDBProjectSettings2> \ No newline at end of file
diff --git a/TextureLoader/build/Win32/TextureLoader-Release.vgdbsettings b/TextureLoader/build/Win32/TextureLoader-Release.vgdbsettings
deleted file mode 100644
index 669691f..0000000
--- a/TextureLoader/build/Win32/TextureLoader-Release.vgdbsettings
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <ConfigurationName>Release</ConfigurationName>
- <Project xsi:type="com.visualgdb.project.android">
- <CustomSourceDirectories>
- <Directories />
- <PathStyle>MinGWWindowsSlash</PathStyle>
- </CustomSourceDirectories>
- <AndroidProjectPath>$(ProjectDir)</AndroidProjectPath>
- </Project>
- <Build xsi:type="com.visualgdb.build.android">
- <AndroidPlatform>android-19</AndroidPlatform>
- <IsDebugConfiguration>false</IsDebugConfiguration>
- <JNIOnlyBuild>true</JNIOnlyBuild>
- <AdditionalDirectoriesToDeleteOnClean>bin;obj</AdditionalDirectoriesToDeleteOnClean>
- <DeleteANTFilesOnClean>false</DeleteANTFilesOnClean>
- <DoNotEditAndroidManifest>false</DoNotEditAndroidManifest>
- <CustomActions />
- </Build>
- <Debug xsi:type="com.visualgdb.debug.android">
- <AdditionalStartupCommands />
- <AdditionalGDBSettings>
- <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
- <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
- <PendingBreakpointsSupported>true</PendingBreakpointsSupported>
- <DisableChildRanges>false</DisableChildRanges>
- <UseAppleExtensions>false</UseAppleExtensions>
- <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
- <MakeLogFile>false</MakeLogFile>
- <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
- <UseRelativePathsOnly>false</UseRelativePathsOnly>
- <ExitAction>KillApp</ExitAction>
- <Features>
- <DisableAutoDetection>false</DisableAutoDetection>
- <UseFrameParameter>false</UseFrameParameter>
- <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
- <ListLocalsSupported>false</ListLocalsSupported>
- <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
- <ThreadInfoSupported>false</ThreadInfoSupported>
- <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
- <SupportTargetCommand>false</SupportTargetCommand>
- </Features>
- <DisableDisassembly>false</DisableDisassembly>
- <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
- <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
- <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
- </AdditionalGDBSettings>
- <LaunchGDBSettings xsi:type="GDBLaunchParametersAndroid" />
- <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
- <UseDefaultInstallDir>false</UseDefaultInstallDir>
- <RemotePort>5039</RemotePort>
- <LocalPort>5039</LocalPort>
- <GDBServerStartupTimeout>10000</GDBServerStartupTimeout>
- <AdditionalGDBServerStartupDelay>0</AdditionalGDBServerStartupDelay>
- <DoubleSlashWorkaround>false</DoubleSlashWorkaround>
- <AlreadyRunningDecision>Ask</AlreadyRunningDecision>
- <ShowLogCat>true</ShowLogCat>
- <EnableThreadNameWatcher>true</EnableThreadNameWatcher>
- </Debug>
- <CustomBuild>
- <PreBuildActions />
- <PostBuildActions />
- <PreCleanActions />
- <PostCleanActions />
- </CustomBuild>
- <CustomDebug>
- <PreDebugActions />
- <PostDebugActions />
- <BreakMode>Default</BreakMode>
- </CustomDebug>
- <CustomShortcuts>
- <Shortcuts />
- <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
- </CustomShortcuts>
- <UserDefinedVariables />
-</VisualGDBProjectSettings2> \ No newline at end of file
diff --git a/TextureLoader/build/Win32/TextureLoader.vcxproj b/TextureLoader/build/Win32/TextureLoader.vcxproj
index 8da8c4f..04f6d31 100644
--- a/TextureLoader/build/Win32/TextureLoader.vcxproj
+++ b/TextureLoader/build/Win32/TextureLoader.vcxproj
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|ARM">
- <Configuration>Debug</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -13,10 +9,6 @@
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release|ARM">
- <Configuration>Release</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -26,46 +18,6 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\src\DDSLoader.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\src\Image.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\src\pch.cpp">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\src\TextureLoader.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\src\TextureUtilities.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="jni\Android.mk" />
- <None Include="jni\Application.mk" />
- </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
@@ -98,14 +50,6 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
- <PlatformToolset>v120</PlatformToolset>
- <ConfigurationType>Makefile</ConfigurationType>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
- <PlatformToolset>v120</PlatformToolset>
- <ConfigurationType>Makefile</ConfigurationType>
- </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="..\Windows.Shared\TextureLoader.Shared.vcxitems" Label="Shared" Condition="Exists('..\WindowsStore\TextureLoader.Shared\TextureLoader.Shared.vcxitems')" />
@@ -133,12 +77,6 @@
<Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Win64r.props" />
<Import Project="..\Windows.Shared\TextureLoader.props" />
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
- <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Android32d.props" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
- <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Android32r.props" />
- </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/TextureLoader/build/Win32/TextureLoader.vcxproj.filters b/TextureLoader/build/Win32/TextureLoader.vcxproj.filters
index cfb971d..9cd8510 100644
--- a/TextureLoader/build/Win32/TextureLoader.vcxproj.filters
+++ b/TextureLoader/build/Win32/TextureLoader.vcxproj.filters
@@ -1,37 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="jni">
- <UniqueIdentifier>{9aae993e-4783-459d-acd3-791162b94c61}</UniqueIdentifier>
- </Filter>
- <Filter Include="android_src">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\src\pch.cpp">
- <Filter>android_src</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\TextureLoader.cpp">
- <Filter>android_src</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\Image.cpp">
- <Filter>android_src</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\DDSLoader.cpp">
- <Filter>android_src</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\TextureUtilities.cpp">
- <Filter>android_src</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="jni\Application.mk">
- <Filter>jni</Filter>
- </None>
- <None Include="jni\Android.mk">
- <Filter>jni</Filter>
- </None>
- </ItemGroup>
-</Project> \ No newline at end of file
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" /> \ No newline at end of file
diff --git a/TextureLoader/build/Win32/jni/Android.mk b/TextureLoader/build/Win32/jni/Android.mk
deleted file mode 100644
index 2e99915..0000000
--- a/TextureLoader/build/Win32/jni/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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
deleted file mode 100644
index 221d4b0..0000000
--- a/TextureLoader/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 := TextureLoader \ No newline at end of file