diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2017-12-18 19:05:03 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2017-12-18 19:05:03 +0000 |
| commit | af1e3842b7986a9b0840e4f79823279f77ccd386 (patch) | |
| tree | c4934f8b8e8964143be1ca271144d638f0ba64db /unityplugin/UnityEmulator | |
| parent | Minor update to readme (diff) | |
| download | DiligentEngine-af1e3842b7986a9b0840e4f79823279f77ccd386.tar.gz DiligentEngine-af1e3842b7986a9b0840e4f79823279f77ccd386.zip | |
Removed jni/Visual GDB Android build from legacy project files
Diffstat (limited to 'unityplugin/UnityEmulator')
6 files changed, 1 insertions, 331 deletions
diff --git a/unityplugin/UnityEmulator/build/Win32/UnityEmulator-Debug.vgdbsettings b/unityplugin/UnityEmulator/build/Win32/UnityEmulator-Debug.vgdbsettings deleted file mode 100644 index 3f5b24b..0000000 --- a/unityplugin/UnityEmulator/build/Win32/UnityEmulator-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/unityplugin/UnityEmulator/build/Win32/UnityEmulator-Release.vgdbsettings b/unityplugin/UnityEmulator/build/Win32/UnityEmulator-Release.vgdbsettings deleted file mode 100644 index 669691f..0000000 --- a/unityplugin/UnityEmulator/build/Win32/UnityEmulator-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/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj b/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj index d3dd0b6..736d6d6 100644 --- a/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj +++ b/unityplugin/UnityEmulator/build/Win32/UnityEmulator.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> @@ -59,14 +51,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\UnityEmulator.Shared.vcxitems" Label="Shared" Condition="Exists('..\WindowsStore\UnityEmulator.Shared\UnityEmulator.Shared.vcxitems')" /> @@ -94,27 +78,11 @@ <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Win64r.props" /> <Import Project="..\Windows.Shared\UnityEmulator.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 Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <NMakeForcedIncludes>$(ProjectDir)..\..\..\..\Common\Android\gcc_Debug.h;$(NMakeForcedIncludes)</NMakeForcedIncludes> - <NMakeOutput> - </NMakeOutput> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <NMakeForcedIncludes>$(ProjectDir)..\..\..\..\Common\Android\gcc_Release.h;$(NMakeForcedIncludes)</NMakeForcedIncludes> - <NMakeOutput> - </NMakeOutput> - </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <WarningLevel>Level3</WarningLevel> @@ -188,40 +156,7 @@ </PostBuildEvent> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\src\Android\AndroidMainImpl.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\Android\UnityGraphicsGLESAndroid_Impl.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="..\..\src\DiligentGraphicsAdapterGL.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\UnityGraphicsEmulator.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\UnityGraphicsGLCoreES_Emulator.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\Windows\WinMain.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - </ClCompile> + <ClCompile Include="..\..\src\Windows\WinMain.cpp" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\..\..\diligentcore\Common\build\Win32\Common.vcxproj"> @@ -249,16 +184,6 @@ <Project>{58f32677-436b-412a-bbf8-2b1310d82cd8}</Project> </ProjectReference> </ItemGroup> - <ItemGroup> - <None Include="..\..\src\Android\Java\helper\NDKHelper.java" /> - <None Include="..\..\src\Android\Java\UnityEmulator\UnityEmulatorNativeActivity.java" /> - <None Include="..\..\src\Android\Java\UnityEmulator\UnityEmulatorApplication.java" /> - <None Include="jni\Android.mk" /> - <None Include="jni\Application.mk" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\src\Android\UnityGraphicsGLESAndroid_Impl.h" /> - </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj.filters b/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj.filters index 6952802..1395a81 100644 --- a/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj.filters +++ b/unityplugin/UnityEmulator/build/Win32/UnityEmulator.vcxproj.filters @@ -1,18 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="Android"> - <UniqueIdentifier>{154722cc-8c82-4869-8e51-fb073a87f966}</UniqueIdentifier> - </Filter> - <Filter Include="Android\Java"> - <UniqueIdentifier>{fe07d990-c5ac-488d-b7df-b3c66018d0b3}</UniqueIdentifier> - </Filter> - <Filter Include="Android\jni"> - <UniqueIdentifier>{31c218a8-0b04-4224-97ad-909aeff5c135}</UniqueIdentifier> - </Filter> - <Filter Include="Android\src"> - <UniqueIdentifier>{90e91db8-8be2-446b-abee-0365b7dc18a8}</UniqueIdentifier> - </Filter> <Filter Include="Windows"> <UniqueIdentifier>{e9f1e7cd-5112-4fb6-854a-3ebfd5efa88b}</UniqueIdentifier> </Filter> @@ -24,42 +12,5 @@ <ClCompile Include="..\..\src\Windows\WinMain.cpp"> <Filter>Windows\src</Filter> </ClCompile> - <ClCompile Include="..\..\src\Android\AndroidMainImpl.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - <ClCompile Include="..\..\src\Android\UnityGraphicsGLESAndroid_Impl.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - <ClCompile Include="..\..\src\UnityGraphicsGLCoreES_Emulator.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - <ClCompile Include="..\..\src\DiligentGraphicsAdapterGL.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - <ClCompile Include="..\..\src\UnityGraphicsEmulator.cpp"> - <Filter>Android\src</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <None Include="..\..\src\Android\Java\helper\NDKHelper.java"> - <Filter>Android\Java</Filter> - </None> - <None Include="jni\Android.mk"> - <Filter>Android\jni</Filter> - </None> - <None Include="jni\Application.mk"> - <Filter>Android\jni</Filter> - </None> - <None Include="..\..\src\Android\Java\UnityEmulator\UnityEmulatorNativeActivity.java"> - <Filter>Android\Java</Filter> - </None> - <None Include="..\..\src\Android\Java\UnityEmulator\UnityEmulatorApplication.java"> - <Filter>Android\Java</Filter> - </None> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\src\Android\UnityGraphicsGLESAndroid_Impl.h"> - <Filter>Android\src</Filter> - </ClInclude> </ItemGroup> </Project>
\ No newline at end of file diff --git a/unityplugin/UnityEmulator/build/Win32/jni/Android.mk b/unityplugin/UnityEmulator/build/Win32/jni/Android.mk deleted file mode 100644 index 44ece36..0000000 --- a/unityplugin/UnityEmulator/build/Win32/jni/Android.mk +++ /dev/null @@ -1,47 +0,0 @@ - -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) - -include $(CLEAR_VARS) -# Project configuration -LOCAL_MODULE := UnityEmulator -LOCAL_CFLAGS := -std=c++11 -DENGINE_DLL -LOCAL_CPP_FEATURES := exceptions - -LOCAL_STATIC_LIBRARIES := cpufeatures android_native_app_glue - -# Include paths -PROJECT_ROOT := $(LOCAL_PATH)/../../.. -ENGINE_ROOT := $(PROJECT_ROOT)/../.. -CORE_ROOT := $(ENGINE_ROOT)/diligentcore -TOOLS_ROOT := $(ENGINE_ROOT)/diligenttools -# include directories for static libraries are declared in corresponding LOCAL_EXPORT_C_INCLUDES sections -LOCAL_C_INCLUDES += $(PROJECT_ROOT)/include -LOCAL_C_INCLUDES += $(PROJECT_ROOT)/src -LOCAL_C_INCLUDES += $(PROJECT_ROOT)/../GhostCubePlugin/PluginSource/src/Unity -LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/include -LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/Platforms/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/Graphics/GraphicsEngine/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/Graphics/GraphicsEngine/include -LOCAL_C_INCLUDES += $(CORE_ROOT)/Graphics/GraphicsEngineD3DBase/include -LOCAL_C_INCLUDES += $(CORE_ROOT)/Graphics/GraphicsEngineOpenGL/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/Graphics/HLSL2GLSLConverterLib/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/External/Android/ndk_helper/include -LOCAL_C_INCLUDES += $(TOOLS_ROOT)/Graphics/GraphicsTools/include - -# Source files -#VisualGDBAndroid: AutoUpdateSourcesInNextLine -LOCAL_SRC_FILES := ../../../src/Android/AndroidMainImpl.cpp ../../../src/Android/UnityGraphicsGLESAndroid_Impl.cpp ../../../src/DiligentGraphicsAdapterGL.cpp ../../../src/UnityGraphicsEmulator.cpp ../../../src/UnityGraphicsGLCoreES_Emulator.cpp ../../../src/Windows/WinMain.cpp - -# Build instructions -#VisualGDBAndroid: VSExcludeListLocation -VISUALGDB_VS_EXCLUDED_FILES_Release := ../../../Src/Win32/WinMain.cpp -VISUALGDB_VS_EXCLUDED_FILES_Debug := ../../../src/Windows/WinMain.cpp -LOCAL_SRC_FILES := $(filter-out $(VISUALGDB_VS_EXCLUDED_FILES_$(VGDB_VSCONFIG)),$(LOCAL_SRC_FILES)) - -include $(BUILD_STATIC_LIBRARY) - -$(call import-module,android/ndk_helper) -$(call import-module,android/native_app_glue) -$(call import-module,android/cpufeatures) diff --git a/unityplugin/UnityEmulator/build/Win32/jni/Application.mk b/unityplugin/UnityEmulator/build/Win32/jni/Application.mk deleted file mode 100644 index e8ef4b4..0000000 --- a/unityplugin/UnityEmulator/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 := UnityEmulator
\ No newline at end of file |
