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

Small changes to the build process, no functional diff

Browse Source
internals
Eric Mellino 9 years ago
parent 14a6fc2172
commit 8a14ca6bb3
11 changed files with 80 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 58
      build/corebuild.props
  2. 22
      build/corebuild.targets
  3. 5
      build/vsdebug.targets
  4. 3
      dir.props
  5. 7
      src/ImGui.NET.SampleProgram.Net46/ImGui.NET.SampleProgram.Net46.csproj
  6. 7
      src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
  7. 2
      src/ImGui.NET.SampleProgram/Program.cs
  8. 2
      src/ImGui.NET.SampleProgram/SampleWindow.cs
  9. 11
      src/ImGui.NET.SampleProgram/project.json
  10. 3
      src/ImGui.NET/ImGui.NET.Net46.csproj
  11. 4
      src/ImGui.NET/project.json

58
build/corebuild.props
Unescape View File

@ -1,63 +1,59 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Import Microsoft.Common.Props --> <!-- Import Microsoft.Common.Props -->
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)/$(MSBuildToolsVersion)/Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)/$(MSBuildToolsVersion)/Microsoft.Common.props')" />
<!-- Project targeting defaults -->
<PropertyGroup>
<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v5.0</TargetFrameworkVersion>
</PropertyGroup>
<!-- Common repo directories --> <!-- Common repo directories -->
<PropertyGroup> <PropertyGroup>
<ProjectDir>$(MSBuildThisFileDirectory)..\</ProjectDir> <ProjectDir>$(MSBuildThisFileDirectory)../</ProjectDir>
<SourceDir>$(ProjectDir)src/</SourceDir> <SourceDir>$(ProjectDir)src/</SourceDir>
<DepsDir>$(ProjectDir)deps\</DepsDir>
</PropertyGroup> </PropertyGroup>
<!-- Set default Configuration and Platform --> <!-- Set Configuration and Platform Defaults -->
<PropertyGroup> <PropertyGroup>
<DefaultNuGetRuntimeIdentifier>win10</DefaultNuGetRuntimeIdentifier>
<Platform Condition="'$(Platform)'=='' and '$(OutputType)' == 'Exe'">x64</Platform> <Platform Condition="'$(Platform)'=='' and '$(OutputType)' == 'Exe'">x64</Platform>
<Platform Condition="'$(Platform)'==''">AnyCPU</Platform> <Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
<Configuration Condition="'$(Configuration)'=='' and '$(OutputType)' == 'Exe'">Windows_Debug</Configuration> <Configuration Condition="'$(Configuration)'=='' and '$(OutputType)' == 'Exe'">Windows_Debug</Configuration>
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration> <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
<ConfigurationGroup Condition="$(Configuration.EndsWith('Debug'))">Debug</ConfigurationGroup> <OptimizationGroup Condition="$(Configuration.EndsWith('Debug'))">Debug</OptimizationGroup>
<ConfigurationGroup Condition="$(Configuration.EndsWith('Release'))">Release</ConfigurationGroup> <OptimizationGroup Condition="$(Configuration.EndsWith('Release'))">Release</OptimizationGroup>
<ConfigurationGroup Condition="'$(ConfigurationGroup)'==''">$(Configuration)</ConfigurationGroup> <OptimizationGroup Condition="'$(OptimizationGroup)'==''">Debug</OptimizationGroup>
<TargetsWindows Condition="$(Configuration.StartsWith('Windows'))">true</TargetsWindows> <!-- Platform Helper Properties -->
<TargetsWindows>true</TargetsWindows>
<TargetsUbuntu Condition="$(Configuration.StartsWith('Ubuntu'))">true</TargetsUbuntu> <TargetsUbuntu Condition="$(Configuration.StartsWith('Ubuntu'))">true</TargetsUbuntu>
<TargetsOSX Condition="$(Configuration.StartsWith('OSX'))">true</TargetsOSX> <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> </PropertyGroup>
<!-- Set up Default symbol and optimization for Configuration --> <!-- Default OptimizationGroup Properties -->
<PropertyGroup Condition="'$(ConfigurationGroup)' == 'Debug'"> <PropertyGroup Condition="'$(OptimizationGroup)' == 'Debug'">
<DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols> <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
<Optimize Condition="'$(Optimize)' == ''">false</Optimize> <Optimize Condition="'$(Optimize)' == ''">false</Optimize>
<DebugType Condition="'$(DebugType)' == ''">full</DebugType> <DebugType Condition="'$(DebugType)' == ''">full</DebugType>
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants> <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(ConfigurationGroup)' == 'Release'"> <PropertyGroup Condition="'$(OptimizationGroup)' == 'Release'">
<DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols> <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
<Optimize Condition="'$(Optimize)' == ''">true</Optimize> <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
<DebugType Condition="'$(DebugType)' == ''">pdbonly</DebugType> <DebugType Condition="'$(DebugType)' == ''">pdbonly</DebugType>
<DefineConstants>$(DefineConstants);TRACE</DefineConstants> <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(TargetsWindows)' == 'true'"> <PropertyGroup >
<BaseNuGetRuntimeIdentifier>win10</BaseNuGetRuntimeIdentifier> <BaseNuGetRuntimeIdentifier Condition="'$(TargetsWindows)' == 'true'">win10</BaseNuGetRuntimeIdentifier>
</PropertyGroup> <BaseNuGetRuntimeIdentifier Condition="'$(TargetsUbuntu)' == 'true'">ubuntu.14.04</BaseNuGetRuntimeIdentifier>
<BaseNuGetRuntimeIdentifier Condition="'$(TargetsOSX)' == 'true'">osx.10.10</BaseNuGetRuntimeIdentifier>
<PropertyGroup Condition="'$(TargetsUbuntu)' == 'true'"> <BaseNuGetRuntimeIdentifier Condition="'$(BaseNuGetRuntimeIdentifier)' == ''">$(DefaultNuGetRuntimeIdentifier)</BaseNuGetRuntimeIdentifier>
<BaseNuGetRuntimeIdentifier>ubuntu.14.04</BaseNuGetRuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetsOSX)' == 'true'">
<BaseNuGetRuntimeIdentifier>osx.10.10</BaseNuGetRuntimeIdentifier>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Platform)' == 'x64'"> <PropertyGroup>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget Condition="'$(Platform)' == 'x64'">x64</PlatformTarget>
<PlatformTarget Condition="'$(PlatformTarget)' == ''">x64</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@ -65,8 +61,8 @@
<BinDir Condition="'$(BinDir)'==''">$(ProjectDir)bin/</BinDir> <BinDir Condition="'$(BinDir)'==''">$(ProjectDir)bin/</BinDir>
<ObjDir Condition="'$(ObjDir)'==''">$(BinDir)obj/</ObjDir> <ObjDir Condition="'$(ObjDir)'==''">$(BinDir)obj/</ObjDir>
<OutputPath>$(BinDir)$(Platform)/$(Configuration)/$(MSBuildProjectName)</OutputPath> <OutputPath>$(BinDir)$(OSTarget).$(Platform).$(OptimizationGroup)/$(MSBuildProjectName)</OutputPath>
<IntermediateOutputPath>$(ObjDir)$(Platform)/$(Configuration)/$(MSBuildProjectName)</IntermediateOutputPath> <IntermediateOutputPath>$(ObjDir)$(OSTarget).$(Platform).$(OptimizationGroup)/$(MSBuildProjectName)</IntermediateOutputPath>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

22
build/corebuild.targets
Unescape View File

@ -1,10 +1,22 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Import portable targets --> <!-- Project targeting defaults -->
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="$(MSBuildThisFileDirectory)\coreconsole.targets" />
<Import Project="$(MSBuildThisFileDirectory)\vsdebug.targets" />
<!-- Override this. -->
<PropertyGroup> <PropertyGroup>
<TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">None</TargetFrameworkIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'None'">
<NuGetTargetMoniker>DNXCore,Version=v5.0</NuGetTargetMoniker> <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> </PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildThisFileDirectory)\coreconsole.targets" />
<Import Project="$(MSBuildThisFileDirectory)\vsdebug.targets" />
</Project> </Project>

5
build/vsdebug.targets
Unescape View File

@ -1,7 +1,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Set up the debug target for portable executables --> <!-- Set up the debug target for CoreCLR executables -->
<PropertyGroup Condition="'$(OutputType)'=='Exe'"> <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'None'
And '$(OutputType)'=='Exe'">
<StartWorkingDirectory Condition="'$(StartWorkingDirectory)' == ''">$(OutDir)</StartWorkingDirectory> <StartWorkingDirectory Condition="'$(StartWorkingDirectory)' == ''">$(OutDir)</StartWorkingDirectory>
<StartAction Condition="'$(StartAction)' == ''">Program</StartAction> <StartAction Condition="'$(StartAction)' == ''">Program</StartAction>
<StartProgram Condition="'$(StartProgram)' == ''">$(TargetPath)</StartProgram> <StartProgram Condition="'$(StartProgram)' == ''">$(TargetPath)</StartProgram>

3
dir.props
Unescape View File

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

7
src/ImGui.NET.SampleProgram.Net46/ImGui.NET.SampleProgram.Net46.csproj
Unescape View File

@ -6,8 +6,9 @@
<Platform Condition=" '$(Platform)' == '' ">x64</Platform> <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<ProjectGuid>{47EF850E-D555-49E7-814B-68372123CB25}</ProjectGuid> <ProjectGuid>{47EF850E-D555-49E7-814B-68372123CB25}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>ImGui.NET.SampleProgram.Net46</RootNamespace> <RootNamespace>ImGuiNET</RootNamespace>
<AssemblyName>ImGui.NET.SampleProgram.Net46</AssemblyName> <AssemblyName>SampleGUIProgram</AssemblyName>
<TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@ -50,5 +51,5 @@
<None Include="App.config" /> <None Include="App.config" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project> </Project>

7
src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
Unescape View File

@ -5,10 +5,9 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<ProjectGuid>{AE9BC745-284F-42F3-8236-C43F00000000}</ProjectGuid> <ProjectGuid>{AE9BC745-284F-42F3-8236-C43F00000000}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>ImGui</RootNamespace> <RootNamespace>ImGuiNET</RootNamespace>
<AssemblyName>SampleGUIProgram</AssemblyName> <AssemblyName>SampleGUIProgram</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- To shut VS up -->
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -25,7 +24,9 @@
<None Include="project.json" /> <None Include="project.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="$(DepsDir)OpenTK\OpenTK.dll" /> <Reference Include="$(DepsDir)OpenTK\OpenTK.dll">
<Private>True</Private>
</Reference>
<ProjectReference Include="../ImGui.NET/ImGui.NET.csproj"> <ProjectReference Include="../ImGui.NET/ImGui.NET.csproj">
<Name>ImGUI.NET</Name> <Name>ImGUI.NET</Name>
</ProjectReference> </ProjectReference>

2
src/ImGui.NET.SampleProgram/Program.cs
Unescape View File

@ -1,4 +1,4 @@
namespace ImGui namespace ImGuiNET
{ {
public class Program public class Program
{ {

2
src/ImGui.NET.SampleProgram/SampleWindow.cs
Unescape View File

@ -10,7 +10,7 @@ using System.Threading;
using System.Drawing; using System.Drawing;
#endif #endif
namespace ImGui namespace ImGuiNET
{ {
public class SampleWindow public class SampleWindow
{ {

11
src/ImGui.NET.SampleProgram/project.json
Unescape View File

@ -1,13 +1,14 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Console": "1.0.0-beta-23430", "Microsoft.NETCore.Console": "1.0.0-beta-23504",
"System.Console": "4.0.0-beta-23430", "System.Console": "4.0.0-beta-23504",
"System.Reflection.Metadata": "1.1.1-beta-23430", "System.Reflection.Metadata": "1.1.1-beta-23504",
"System.Threading.Thread": "4.0.0-beta-23430" "System.Threading.Thread": "4.0.0-beta-23504"
}, },
"runtimes": { "runtimes": {
"win10-x64": { }, "win10-x64": { },
"ubuntu.14.04-x64": {} "ubuntu.14.04-x64": { },
"osx.10.10-x64": { }
}, },
"frameworks": { "frameworks": {
"dnxcore50": { } "dnxcore50": { }

3
src/ImGui.NET/ImGui.NET.Net46.csproj
Unescape View File

@ -8,6 +8,7 @@
<RootNamespace>ImGui</RootNamespace> <RootNamespace>ImGui</RootNamespace>
<AssemblyName>ImGui.NET</AssemblyName> <AssemblyName>ImGui.NET</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<ResolveNuGetPackages>false</ResolveNuGetPackages> <ResolveNuGetPackages>false</ResolveNuGetPackages>
</PropertyGroup> </PropertyGroup>
@ -44,5 +45,5 @@
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Numerics" /> <Reference Include="System.Numerics" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project> </Project>

4
src/ImGui.NET/project.json
Unescape View File

@ -2,10 +2,6 @@
"dependencies": { "dependencies": {
"Microsoft.NETCore.Console": "1.0.0-beta-23504" "Microsoft.NETCore.Console": "1.0.0-beta-23504"
}, },
"runtimes": {
"win10-x64": { },
"ubuntu.14.04-x64": { }
},
"frameworks": { "frameworks": {
"dnxcore50": { } "dnxcore50": { }
} }

Write Preview
Loading…
Cancel
Save