copygirl
/
ImGui.NET
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:mellinoe/imgui.net

Browse Source
internals
Eric Mellino 9 years ago
parent a7b296ae51 0711a270f9
commit 02115c46df
8 changed files with 6 additions and 125 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .gitmodules
  2. 68
      build/corebuild.props
  3. 22
      build/corebuild.targets
  4. 21
      build/coreconsole.targets
  5. 12
      build/vsdebug.targets
  6. 1
      corebuild
  7. 2
      dir.props
  8. 2
      dir.targets

3
.gitmodules vendored
Unescape View File

@ -0,0 +1,3 @@
[submodule "corebuild"]
path = corebuild
url = git@github.com:mellinoe/corebuild

68
build/corebuild.props
Unescape View File

@ -1,68 +0,0 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Import Microsoft.Common.Props -->
<Import Project="$(MSBuildExtensionsPath)/$(MSBuildToolsVersion)/Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)/$(MSBuildToolsVersion)/Microsoft.Common.props')" />
<!-- Common repo directories -->
<PropertyGroup>
<ProjectDir>$(MSBuildThisFileDirectory)../</ProjectDir>
<SourceDir>$(ProjectDir)src/</SourceDir>
</PropertyGroup>
<!-- Set Configuration and Platform Defaults -->
<PropertyGroup>
<DefaultNuGetRuntimeIdentifier>win10</DefaultNuGetRuntimeIdentifier>
<Platform Condition="'$(Platform)'=='' and '$(OutputType)' == 'Exe'">x64</Platform>
<Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
<Configuration Condition="'$(Configuration)'=='' and '$(OutputType)' == 'Exe'">Windows_Debug</Configuration>
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
<OptimizationGroup Condition="$(Configuration.EndsWith('Debug'))">Debug</OptimizationGroup>
<OptimizationGroup Condition="$(Configuration.EndsWith('Release'))">Release</OptimizationGroup>
<OptimizationGroup Condition="'$(OptimizationGroup)'==''">Debug</OptimizationGroup>
<!-- Platform Helper Properties -->
<TargetsWindows>true</TargetsWindows>
<TargetsUbuntu Condition="$(Configuration.StartsWith('Ubuntu'))">true</TargetsUbuntu>
<TargetsOSX Condition="$(Configuration.StartsWith('OSX'))">true</TargetsOSX>
<OSTarget Condition="'$(TargetsWindows)' == 'true'">Windows</OSTarget>
<OSTarget Condition="'$(TargetsUbuntu)' == 'true'">Ubuntu</OSTarget>
<OSTarget Condition="'$(TargetsOSX)' == 'true'">OSX</OSTarget>
</PropertyGroup>
<!-- Default OptimizationGroup Properties -->
<PropertyGroup Condition="'$(OptimizationGroup)' == 'Debug'">
<DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
<Optimize Condition="'$(Optimize)' == ''">false</Optimize>
<DebugType Condition="'$(DebugType)' == ''">full</DebugType>
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(OptimizationGroup)' == 'Release'">
<DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
<Optimize Condition="'$(Optimize)' == ''">true</Optimize>
<DebugType Condition="'$(DebugType)' == ''">pdbonly</DebugType>
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup >
<BaseNuGetRuntimeIdentifier Condition="'$(TargetsWindows)' == 'true'">win10</BaseNuGetRuntimeIdentifier>
<BaseNuGetRuntimeIdentifier Condition="'$(TargetsUbuntu)' == 'true'">ubuntu.14.04</BaseNuGetRuntimeIdentifier>
<BaseNuGetRuntimeIdentifier Condition="'$(TargetsOSX)' == 'true'">osx.10.10</BaseNuGetRuntimeIdentifier>
<BaseNuGetRuntimeIdentifier Condition="'$(BaseNuGetRuntimeIdentifier)' == ''">$(DefaultNuGetRuntimeIdentifier)</BaseNuGetRuntimeIdentifier>
</PropertyGroup>
<PropertyGroup>
<PlatformTarget Condition="'$(Platform)' == 'x64'">x64</PlatformTarget>
<PlatformTarget Condition="'$(PlatformTarget)' == ''">x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup>
<!-- Output directories -->
<BinDir Condition="'$(BinDir)'==''">$(ProjectDir)bin/</BinDir>
<ObjDir Condition="'$(ObjDir)'==''">$(BinDir)obj/</ObjDir>
<OutputPath>$(BinDir)$(OSTarget).$(Platform).$(OptimizationGroup)/$(MSBuildProjectName)</OutputPath>
<IntermediateOutputPath>$(ObjDir)$(OSTarget).$(Platform).$(OptimizationGroup)/$(MSBuildProjectName)</IntermediateOutputPath>
</PropertyGroup>
</Project>

22
build/corebuild.targets
Unescape View File

@ -1,22 +0,0 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Project targeting defaults -->
<PropertyGroup>
<TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">None</TargetFrameworkIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'None'">
<NuGetTargetMoniker>DNXCore,Version=v5.0</NuGetTargetMoniker>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
<NoStdLib>true</NoStdLib>
<!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two
properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and
to prevent it from outputting a warning (MSB3644).
-->
<_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>
<_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
<AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildThisFileDirectory)\coreconsole.targets" />
<Import Project="$(MSBuildThisFileDirectory)\vsdebug.targets" />
</Project>

21
build/coreconsole.targets
Unescape View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="RenameCoreConsole" AfterTargets="CopyFilesToOutputDirectory"
Condition="'$(OutputType)' == 'Exe' ">
<CallTarget Targets="RenameCoreConsoleWindows" Condition="Exists('$(Outdir)CoreConsole.exe')" />
<CallTarget Targets="RenameCoreConsoleUnix" Condition="Exists('$(Outdir)CoreConsole')" />
</Target>
<!-- If CoreConsole.exe is being used, rename it and the actual project's exe to their correct names -->
<Target Name="RenameCoreConsoleWindows">
<Move SourceFiles="$(Outdir)$(AssemblyName).exe" DestinationFiles="$(Outdir)$(AssemblyName).dll" />
<Move SourceFiles="$(Outdir)CoreConsole.exe" DestinationFiles="$(Outdir)$(AssemblyName).exe" />
</Target>
<Target Name="RenameCoreConsoleUnix">
<Move SourceFiles="$(Outdir)$(AssemblyName).exe" DestinationFiles="$(Outdir)$(AssemblyName).dll" />
<Move SourceFiles="$(Outdir)CoreConsole" DestinationFiles="$(Outdir)$(AssemblyName)" />
</Target>
</Project>

12
build/vsdebug.targets
Unescape View File

@ -1,12 +0,0 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Set up the debug target for CoreCLR executables -->
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'None'
And '$(OutputType)'=='Exe'">
<StartWorkingDirectory Condition="'$(StartWorkingDirectory)' == ''">$(OutDir)</StartWorkingDirectory>
<StartAction Condition="'$(StartAction)' == ''">Program</StartAction>
<StartProgram Condition="'$(StartProgram)' == ''">$(TargetPath)</StartProgram>
<DebugEngines>{2E36F1D4-B23C-435D-AB41-18E608940038}</DebugEngines>
</PropertyGroup>
</Project>

1
corebuild

@ -0,0 +1 @@
Subproject commit 6d52a02e4c81463cf89f1fefdebdaa5cfda46542

2
dir.props
Unescape View File

@ -1,5 +1,5 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisFileDirectory)\build\corebuild.props" />
<Import Project="$(MSBuildThisFileDirectory)\corebuild\corebuild.props" />
<PropertyGroup>
<DepsDir>$(ProjectDir)deps\</DepsDir>
</PropertyGroup>

2
dir.targets
Unescape View File

@ -1,3 +1,3 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisFileDirectory)\build\corebuild.targets" />
<Import Project="$(MSBuildThisFileDirectory)\corebuild\corebuild.targets" />
</Project>

Write Preview
Loading…
Cancel
Save