Code

Conan dep manager#320

Code

Draft

winterheart wants to merge 22 commits intoInterrupt:masterInterrupt/systemshock:masterfrom

winterheart:conan-dep-managerwinterheart/systemshock:conan-dep-managerCopy head branch name to clipboard

Commits

Commits on Jan 20, 2020

• Add experimental conan support

  Show description for 1e0db49
  winterheart

  committed
  1e0db49

  Copy full SHA for 1e0db49

• Updates to travis

  Show description for 9053388
  winterheart

  committed
  9053388

  Copy full SHA for 9053388

• Unify settings for osx and linux

  winterheart

  committed
  abe362e

  Copy full SHA for abe362e

Commits on Jan 21, 2020

• Swith to conanfile.py

  winterheart

  committed
  274a84e

  Copy full SHA for 274a84e

• Redefine building matrix

  winterheart

  committed
  f28eae6

  Copy full SHA for f28eae6

• Redefine building matrix

  winterheart

  committed
  d6e8f73

  Copy full SHA for d6e8f73

• Update to appveyor with conan

  Show description for 577eb9b
  winterheart

  committed
  577eb9b

  Copy full SHA for 577eb9b

• appveyor fixup

  winterheart

  committed
  0ca7d8b

  Copy full SHA for 0ca7d8b

• appveyor fixup

  winterheart

  committed
  93d7456

  Copy full SHA for 93d7456

• appveyor fixup

  winterheart

  committed
  2264377

  Copy full SHA for 2264377

• appveyor fixup

  winterheart

  committed
  4f8b67b

  Copy full SHA for 4f8b67b

• appveyor fixup

  winterheart

  committed
  901d879

  Copy full SHA for 901d879

• appveyor fixup

  winterheart

  committed
  5c597be

  Copy full SHA for 5c597be

• appveyor fixup

  winterheart

  committed
  799a089

  Copy full SHA for 799a089

• cmake fixup

  winterheart

  committed
  878302c

  Copy full SHA for 878302c

• appveyor fixup

  winterheart

  committed
  3e06481

  Copy full SHA for 3e06481

Commits on Feb 9, 2020

• Update conanfile.py

  winterheart

  committed
  b57de28

  Copy full SHA for b57de28

• Reorganize includes in OpenGL.cc

  winterheart

  committed
  b388f19

  Copy full SHA for b388f19

• Add Windows log console option

  Show description for 511795f
  winterheart

  committed
  511795f

  Copy full SHA for 511795f

Commits on Feb 10, 2020

• Updates to CI

  winterheart

  committed
  feb6bc4

  Copy full SHA for feb6bc4

• update appveyor

  winterheart

  committed
  0e12b35

  Copy full SHA for 0e12b35

• Update appveyor

  winterheart

  committed
  0d2e0fb

  Copy full SHA for 0d2e0fb