diff --git a/bk-deps b/bk-deps
new file mode 100644
index 0000000000..169660c451
--- /dev/null
+++ b/bk-deps
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# This script is part of Bakefile (http://www.bakefile.org) autoconf
+# script. It is used to track C/C++ files dependencies in portable way.
+#
+# Permission is given to use this file in any way.
+
+DEPSMODE=gcc
+DEPSFLAG="-MMD"
+DEPSDIRBASE=.deps
+
+if test $DEPSMODE = gcc ; then
+    $* ${DEPSFLAG}
+    status=$?
+
+    # determine location of created files:
+    while test $# -gt 0; do
+        case "$1" in
+            -o )
+                shift
+                objfile=$1
+            ;;
+            -* )
+            ;;
+            * )
+                srcfile=$1
+            ;;
+        esac
+        shift
+    done
+    objfilebase=`basename $objfile`
+    builddir=`dirname $objfile`
+    depfile=`basename $srcfile | sed -e 's/\..*$/.d/g'`
+    depobjname=`echo $depfile |sed -e 's/\.d/.o/g'`
+    depsdir=$builddir/$DEPSDIRBASE
+    mkdir -p $depsdir
+
+    # if the compiler failed, we're done:
+    if test ${status} != 0 ; then
+        rm -f $depfile
+        exit ${status}
+    fi
+
+    # move created file to the location we want it in:
+    if test -f $depfile ; then
+        sed -e "s,$depobjname:,$objfile:,g" $depfile >${depsdir}/${objfilebase}.d
+        rm -f $depfile
+    else
+        # "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d
+        depfile=`echo "$objfile" | sed -e 's/\..*$/.d/g'`
+        if test ! -f $depfile ; then
+            # "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++)
+            depfile="$objfile.d"
+        fi
+        if test -f $depfile ; then
+            sed -e "\,^$objfile,!s,$depobjname:,$objfile:,g" $depfile >${depsdir}/${objfilebase}.d
+            rm -f $depfile
+        fi
+    fi
+    exit 0
+
+elif test $DEPSMODE = unixcc; then
+    $* || exit $?
+    # Run compiler again with deps flag and redirect into the dep file.
+    # It doesn't work if the '-o FILE' option is used, but without it the
+    # dependency file will contain the wrong name for the object. So it is
+    # removed from the command line, and the dep file is fixed with sed.
+    cmd=""
+    while test $# -gt 0; do
+        case "$1" in
+            -o )
+                shift
+                objfile=$1
+            ;;
+            * )
+                eval arg$#=\$1
+                cmd="$cmd \$arg$#"
+            ;;
+        esac
+        shift
+    done
+
+    objfilebase=`basename $objfile`
+    builddir=`dirname $objfile`
+    depsdir=$builddir/$DEPSDIRBASE
+    mkdir -p $depsdir
+
+    eval "$cmd $DEPSFLAG" | sed "s|.*:|$objfile:|" >${depsdir}/${objfilebase}.d
+    exit 0
+
+else
+    $*
+    exit $?
+fi
diff --git a/change-install-names b/change-install-names
new file mode 100644
index 0000000000..1d5231ddcd
--- /dev/null
+++ b/change-install-names
@@ -0,0 +1,5 @@
+install_name_tool ${changes} ${2}/wxrc-3.1
+install_name_tool ${changes} ${2}/wxrc-3.1
+install_name_tool ${changes} ${2}/wxrc-3.1
+install_name_tool ${changes} ${2}/wxrc-3.1
+install_name_tool ${changes} ${2}/wxrc-3.1
diff --git a/compile_log b/compile_log
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/configure b/configure
index 8a93a931a5..a902cfd417 100755
--- a/configure
+++ b/configure
@@ -16926,828 +16926,8 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
   ac_success=no
 
-    if test x$ac_success = xno; then
-    for alternative in ${ax_cxx_compile_alternatives}; do
-      switch="-std=gnu++${alternative}"
-      cachevar=`$as_echo "ax_cv_cxx_compile_cxx17_$switch" | $as_tr_sh`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5
-$as_echo_n "checking whether $CXX supports C++17 features with $switch... " >&6; }
-if eval \${$cachevar+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
 
-// If the compiler admits that it is not ready for C++11, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201103L
-
-#error "This is not a C++11 compiler"
-
-#else
-
-namespace cxx11
-{
-
-  namespace test_static_assert
-  {
-
-    template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-  }
-
-  namespace test_final_override
-  {
-
-    struct Base
-    {
-      virtual ~Base() {}
-      virtual void f() {}
-    };
-
-    struct Derived : public Base
-    {
-      virtual ~Derived() override {}
-      virtual void f() override {}
-    };
-
-  }
-
-  namespace test_double_right_angle_brackets
-  {
-
-    template < typename T >
-    struct check {};
-
-    typedef check<void> single_type;
-    typedef check<check<void>> double_type;
-    typedef check<check<check<void>>> triple_type;
-    typedef check<check<check<check<void>>>> quadruple_type;
-
-  }
-
-  namespace test_decltype
-  {
-
-    int
-    f()
-    {
-      int a = 1;
-      decltype(a) b = 2;
-      return a + b;
-    }
-
-  }
-
-  namespace test_type_deduction
-  {
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static const bool value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static const bool value = true;
-    };
-
-    template < typename T1, typename T2 >
-    auto
-    add(T1 a1, T2 a2) -> decltype(a1 + a2)
-    {
-      return a1 + a2;
-    }
-
-    int
-    test(const int c, volatile int v)
-    {
-      static_assert(is_same<int, decltype(0)>::value == true, "");
-      static_assert(is_same<int, decltype(c)>::value == false, "");
-      static_assert(is_same<int, decltype(v)>::value == false, "");
-      auto ac = c;
-      auto av = v;
-      auto sumi = ac + av + 'x';
-      auto sumf = ac + av + 1.0;
-      static_assert(is_same<int, decltype(ac)>::value == true, "");
-      static_assert(is_same<int, decltype(av)>::value == true, "");
-      static_assert(is_same<int, decltype(sumi)>::value == true, "");
-      static_assert(is_same<int, decltype(sumf)>::value == false, "");
-      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
-      return (sumf > 0.0) ? sumi : add(c, v);
-    }
-
-  }
-
-  namespace test_noexcept
-  {
-
-    int f() { return 0; }
-    int g() noexcept { return 0; }
-
-    static_assert(noexcept(f()) == false, "");
-    static_assert(noexcept(g()) == true, "");
-
-  }
-
-  namespace test_constexpr
-  {
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-    {
-      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-    }
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c(const CharT *const s) noexcept
-    {
-      return strlen_c_r(s, 0UL);
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("1") == 1UL, "");
-    static_assert(strlen_c("example") == 7UL, "");
-    static_assert(strlen_c("another\0example") == 7UL, "");
-
-  }
-
-  namespace test_rvalue_references
-  {
-
-    template < int N >
-    struct answer
-    {
-      static constexpr int value = N;
-    };
-
-    answer<1> f(int&)       { return answer<1>(); }
-    answer<2> f(const int&) { return answer<2>(); }
-    answer<3> f(int&&)      { return answer<3>(); }
-
-    void
-    test()
-    {
-      int i = 0;
-      const int c = 0;
-      static_assert(decltype(f(i))::value == 1, "");
-      static_assert(decltype(f(c))::value == 2, "");
-      static_assert(decltype(f(0))::value == 3, "");
-    }
-
-  }
-
-  namespace test_uniform_initialization
-  {
-
-    struct test
-    {
-      static const int zero {};
-      static const int one {1};
-    };
-
-    static_assert(test::zero == 0, "");
-    static_assert(test::one == 1, "");
-
-  }
-
-  namespace test_lambdas
-  {
-
-    void
-    test1()
-    {
-      auto lambda1 = [](){};
-      auto lambda2 = lambda1;
-      lambda1();
-      lambda2();
-    }
-
-    int
-    test2()
-    {
-      auto a = [](int i, int j){ return i + j; }(1, 2);
-      auto b = []() -> int { return '0'; }();
-      auto c = [=](){ return a + b; }();
-      auto d = [&](){ return c; }();
-      auto e = [a, &b](int x) mutable {
-        const auto identity = [](int y){ return y; };
-        for (auto i = 0; i < a; ++i)
-          a += b--;
-        return x + identity(a + b);
-      }(0);
-      return a + b + c + d + e;
-    }
-
-    int
-    test3()
-    {
-      const auto nullary = [](){ return 0; };
-      const auto unary = [](int x){ return x; };
-      using nullary_t = decltype(nullary);
-      using unary_t = decltype(unary);
-      const auto higher1st = [](nullary_t f){ return f(); };
-      const auto higher2nd = [unary](nullary_t f1){
-        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-      };
-      return higher1st(nullary) + higher2nd(nullary)(unary);
-    }
-
-  }
-
-  namespace test_variadic_templates
-  {
-
-    template <int...>
-    struct sum;
-
-    template <int N0, int... N1toN>
-    struct sum<N0, N1toN...>
-    {
-      static constexpr auto value = N0 + sum<N1toN...>::value;
-    };
-
-    template <>
-    struct sum<>
-    {
-      static constexpr auto value = 0;
-    };
-
-    static_assert(sum<>::value == 0, "");
-    static_assert(sum<1>::value == 1, "");
-    static_assert(sum<23>::value == 23, "");
-    static_assert(sum<1, 2>::value == 3, "");
-    static_assert(sum<5, 5, 11>::value == 21, "");
-    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-
-  }
-
-  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-  // because of this.
-  namespace test_template_alias_sfinae
-  {
-
-    struct foo {};
-
-    template<typename T>
-    using member = typename T::member_type;
-
-    template<typename T>
-    void func(...) {}
-
-    template<typename T>
-    void func(member<T>*) {}
-
-    void test();
-
-    void test() { func<foo>(0); }
-
-  }
-
-}  // namespace cxx11
-
-#endif  // __cplusplus >= 201103L
-
-
-
-
-// If the compiler admits that it is not ready for C++14, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201402L
-
-#error "This is not a C++14 compiler"
-
-#else
-
-namespace cxx14
-{
-
-  namespace test_polymorphic_lambdas
-  {
-
-    int
-    test()
-    {
-      const auto lambda = [](auto&&... args){
-        const auto istiny = [](auto x){
-          return (sizeof(x) == 1UL) ? 1 : 0;
-        };
-        const int aretiny[] = { istiny(args)... };
-        return aretiny[0];
-      };
-      return lambda(1, 1L, 1.0f, '1');
-    }
-
-  }
-
-  namespace test_binary_literals
-  {
-
-    constexpr auto ivii = 0b0000000000101010;
-    static_assert(ivii == 42, "wrong value");
-
-  }
-
-  namespace test_generalized_constexpr
-  {
-
-    template < typename CharT >
-    constexpr unsigned long
-    strlen_c(const CharT *const s) noexcept
-    {
-      auto length = 0UL;
-      for (auto p = s; *p; ++p)
-        ++length;
-      return length;
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("x") == 1UL, "");
-    static_assert(strlen_c("test") == 4UL, "");
-    static_assert(strlen_c("another\0test") == 7UL, "");
-
-  }
-
-  namespace test_lambda_init_capture
-  {
-
-    int
-    test()
-    {
-      auto x = 0;
-      const auto lambda1 = [a = x](int b){ return a + b; };
-      const auto lambda2 = [a = lambda1(x)](){ return a; };
-      return lambda2();
-    }
-
-  }
-
-  namespace test_digit_separators
-  {
-
-    constexpr auto ten_million = 100'000'000;
-    static_assert(ten_million == 100000000, "");
-
-  }
-
-  namespace test_return_type_deduction
-  {
-
-    auto f(int& x) { return x; }
-    decltype(auto) g(int& x) { return x; }
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static constexpr auto value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static constexpr auto value = true;
-    };
-
-    int
-    test()
-    {
-      auto x = 0;
-      static_assert(is_same<int, decltype(f(x))>::value, "");
-      static_assert(is_same<int&, decltype(g(x))>::value, "");
-      return x;
-    }
-
-  }
-
-}  // namespace cxx14
-
-#endif  // __cplusplus >= 201402L
-
-
-
-
-// If the compiler admits that it is not ready for C++17, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201703L
-
-#error "This is not a C++17 compiler"
-
-#else
-
-#include <initializer_list>
-#include <utility>
-#include <type_traits>
-
-namespace cxx17
-{
-
-  namespace test_constexpr_lambdas
-  {
-
-    constexpr int foo = [](){return 42;}();
-
-  }
-
-  namespace test::nested_namespace::definitions
-  {
-
-  }
-
-  namespace test_fold_expression
-  {
-
-    template<typename... Args>
-    int multiply(Args... args)
-    {
-      return (args * ... * 1);
-    }
-
-    template<typename... Args>
-    bool all(Args... args)
-    {
-      return (args && ...);
-    }
-
-  }
-
-  namespace test_extended_static_assert
-  {
-
-    static_assert (true);
-
-  }
-
-  namespace test_auto_brace_init_list
-  {
-
-    auto foo = {5};
-    auto bar {5};
-
-    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
-    static_assert(std::is_same<int, decltype(bar)>::value);
-  }
-
-  namespace test_typename_in_template_template_parameter
-  {
-
-    template<template<typename> typename X> struct D;
-
-  }
-
-  namespace test_fallthrough_nodiscard_maybe_unused_attributes
-  {
-
-    int f1()
-    {
-      return 42;
-    }
-
-    [[nodiscard]] int f2()
-    {
-      [[maybe_unused]] auto unused = f1();
-
-      switch (f1())
-      {
-      case 17:
-        f1();
-        [[fallthrough]];
-      case 42:
-        f1();
-      }
-      return f1();
-    }
-
-  }
-
-  namespace test_extended_aggregate_initialization
-  {
-
-    struct base1
-    {
-      int b1, b2 = 42;
-    };
-
-    struct base2
-    {
-      base2() {
-        b3 = 42;
-      }
-      int b3;
-    };
-
-    struct derived : base1, base2
-    {
-        int d;
-    };
-
-    derived d1 {{1, 2}, {}, 4};  // full initialization
-    derived d2 {{}, {}, 4};      // value-initialized bases
-
-  }
-
-  namespace test_general_range_based_for_loop
-  {
-
-    struct iter
-    {
-      int i;
-
-      int& operator* ()
-      {
-        return i;
-      }
-
-      const int& operator* () const
-      {
-        return i;
-      }
-
-      iter& operator++()
-      {
-        ++i;
-        return *this;
-      }
-    };
-
-    struct sentinel
-    {
-      int i;
-    };
-
-    bool operator== (const iter& i, const sentinel& s)
-    {
-      return i.i == s.i;
-    }
-
-    bool operator!= (const iter& i, const sentinel& s)
-    {
-      return !(i == s);
-    }
-
-    struct range
-    {
-      iter begin() const
-      {
-        return {0};
-      }
-
-      sentinel end() const
-      {
-        return {5};
-      }
-    };
-
-    void f()
-    {
-      range r {};
-
-      for (auto i : r)
-      {
-        [[maybe_unused]] auto v = i;
-      }
-    }
-
-  }
-
-  namespace test_lambda_capture_asterisk_this_by_value
-  {
-
-    struct t
-    {
-      int i;
-      int foo()
-      {
-        return [*this]()
-        {
-          return i;
-        }();
-      }
-    };
-
-  }
-
-  namespace test_enum_class_construction
-  {
-
-    enum class byte : unsigned char
-    {};
-
-    byte foo {42};
-
-  }
-
-  namespace test_constexpr_if
-  {
-
-    template <bool cond>
-    int f ()
-    {
-      if constexpr(cond)
-      {
-        return 13;
-      }
-      else
-      {
-        return 42;
-      }
-    }
-
-  }
-
-  namespace test_selection_statement_with_initializer
-  {
-
-    int f()
-    {
-      return 13;
-    }
-
-    int f2()
-    {
-      if (auto i = f(); i > 0)
-      {
-        return 3;
-      }
-
-      switch (auto i = f(); i + 4)
-      {
-      case 17:
-        return 2;
-
-      default:
-        return 1;
-      }
-    }
-
-  }
-
-  namespace test_template_argument_deduction_for_class_templates
-  {
-
-    template <typename T1, typename T2>
-    struct pair
-    {
-      pair (T1 p1, T2 p2)
-        : m1 {p1},
-          m2 {p2}
-      {}
-
-      T1 m1;
-      T2 m2;
-    };
-
-    void f()
-    {
-      [[maybe_unused]] auto p = pair{13, 42u};
-    }
-
-  }
-
-  namespace test_non_type_auto_template_parameters
-  {
-
-    template <auto n>
-    struct B
-    {};
-
-    B<5> b1;
-    B<'a'> b2;
-
-  }
-
-  namespace test_structured_bindings
-  {
-
-    int arr[2] = { 1, 2 };
-    std::pair<int, int> pr = { 1, 2 };
-
-    auto f1() -> int(&)[2]
-    {
-      return arr;
-    }
-
-    auto f2() -> std::pair<int, int>&
-    {
-      return pr;
-    }
-
-    struct S
-    {
-      int x1 : 2;
-      volatile double y1;
-    };
-
-    S f3()
-    {
-      return {};
-    }
-
-    auto [ x1, y1 ] = f1();
-    auto& [ xr1, yr1 ] = f1();
-    auto [ x2, y2 ] = f2();
-    auto& [ xr2, yr2 ] = f2();
-    const auto [ x3, y3 ] = f3();
-
-  }
-
-  namespace test_exception_spec_type_system
-  {
-
-    struct Good {};
-    struct Bad {};
-
-    void g1() noexcept;
-    void g2();
-
-    template<typename T>
-    Bad
-    f(T*, T*);
-
-    template<typename T1, typename T2>
-    Good
-    f(T1*, T2*);
-
-    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
-
-  }
-
-  namespace test_inline_variables
-  {
-
-    template<class T> void f(T)
-    {}
-
-    template<class T> inline T g(T)
-    {
-      return T{};
-    }
-
-    template<> inline void f<>(int)
-    {}
-
-    template<> int g<>(int)
-    {
-      return 5;
-    }
-
-  }
-
-}  // namespace cxx17
-
-#endif  // __cplusplus < 201703L
-
-
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  eval $cachevar=yes
-else
-  eval $cachevar=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         CXX="$ac_save_CXX"
-fi
-eval ac_res=\$$cachevar
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi
-
     if test x$ac_success = xno; then
                 for alternative in ${ax_cxx_compile_alternatives}; do
       for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
@@ -27601,7 +26781,7 @@ $as_echo "found in $ac_find_includes" >&6; }
     fi
   fi
 
-            CPPFLAGS="$ac_path_to_include $CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $ac_path_to_include"
         else
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
@@ -29229,7 +28409,7 @@ $as_echo "$wx_cv_cc_visibility_workaround" >&6; }
 
       *-*-solaris2* )
 
-                        CPPFLAGS="-isystem /usr/openwin/include $CPPFLAGS"
+                        CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
 
                         saveLdflags="$LDFLAGS"
         LDFLAGS="$saveLdflags -Wl,-rpath,/"
@@ -38264,10 +37444,12 @@ WXCONFIG_CFLAGS=`echo $WXCONFIG_CFLAGS`
 WXCONFIG_CXXFLAGS=`echo $WXCONFIG_CFLAGS $WXCONFIG_CXXFLAGS`
 
 
-CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \
+CPPFLAGS=`echo \
  -I\\${wx_top_builddir}/lib/wx/include/${TOOLCHAIN_FULLNAME} \
- -I\\${top_srcdir}/include $TOOLKIT_INCLUDE \
- $CPPFLAGS `
+ -I\\${top_srcdir}/include \
+ $CPPFLAGS \
+ $WXCONFIG_CPPFLAGS \
+ $TOOLKIT_INCLUDE`
 
 C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS"
 CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS `
diff --git a/configure.in b/configure.in
index ca43a6f487..8a7d54ad3b 100644
--- a/configure.in
+++ b/configure.in
@@ -1137,7 +1137,7 @@ if test -n "$wxWITH_CXX"; then
 
         17)
             dnl This is similar to 14 above.
-            AX_CXX_COMPILE_STDCXX(17)
+            AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
             HAVE_CXX11=1
             ;;
 
diff --git a/demos/Makefile b/demos/Makefile
new file mode 100644
index 0000000000..87e42dbf65
--- /dev/null
+++ b/demos/Makefile
@@ -0,0 +1,68 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+
+### Variables: ###
+
+DESTDIR = 
+
+### Conditionally set variables: ###
+
+
+### Targets: ###
+
+all: bombs forty fractal life poem
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	-(cd bombs && $(MAKE) clean)
+	-(cd forty && $(MAKE) clean)
+	-(cd fractal && $(MAKE) clean)
+	-(cd life && $(MAKE) clean)
+	-(cd poem && $(MAKE) clean)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+	-(cd bombs && $(MAKE) distclean)
+	-(cd forty && $(MAKE) distclean)
+	-(cd fractal && $(MAKE) distclean)
+	-(cd life && $(MAKE) distclean)
+	-(cd poem && $(MAKE) distclean)
+
+bombs: 
+	(cd bombs && $(MAKE) all)
+
+forty: 
+	(cd forty && $(MAKE) all)
+
+fractal: 
+	(cd fractal && $(MAKE) all)
+
+life: 
+	(cd life && $(MAKE) all)
+
+poem: 
+	(cd poem && $(MAKE) all)
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean bombs forty fractal life poem
diff --git a/demos/bombs/Makefile b/demos/bombs/Makefile
new file mode 100644
index 0000000000..780a348bf5
--- /dev/null
+++ b/demos/bombs/Makefile
@@ -0,0 +1,198 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+BOMBS_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+BOMBS_OBJECTS =  \
+	bombs_bombs.o \
+	bombs_bombs1.o \
+	bombs_game.o \
+	$(__bombs___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___bombs___os2_emxbindcmd = $(NM) bombs$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep bombs$(EXEEXT) ; fi
+#__bombs___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___bombs___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__bombs_app_Contents_PkgInfo___depname \
+#	= bombs.app/Contents/PkgInfo
+#__bombs_bundle___depname = bombs_bundle
+#____bombs_BUNDLE_TGT_REF_DEP = \
+#	$(__bombs_app_Contents_PkgInfo___depname)
+#____bombs_BUNDLE_TGT_REF_DEP \
+#	= $(__bombs_app_Contents_PkgInfo___depname)
+#____bombs_BUNDLE_TGT_REF_DEP \
+#	= $(__bombs_app_Contents_PkgInfo___depname)
+#____bombs_BUNDLE_TGT_REF_DEP \
+#	= $(__bombs_app_Contents_PkgInfo___depname)
+#____bombs_BUNDLE_TGT_REF_DEP = \
+#	$(__bombs_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__bombs___win32rc = bombs_bombs_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: bombs$(EXEEXT) $(__bombs_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f bombs$(EXEEXT)
+	rm -rf bombs.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
+	$(CXX) -o $@ $(BOMBS_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__bombs___os2_emxbindcmd)
+
+#bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p bombs.app/Contents
+#	mkdir -p bombs.app/Contents/MacOS
+#	mkdir -p bombs.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/bombs/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >bombs.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >bombs.app/Contents/PkgInfo
+#	
+#	
+#	ln -f bombs$(EXEEXT) bombs.app/Contents/MacOS/bombs
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns bombs.app/Contents/Resources/wxmac.icns
+
+#bombs_bundle: $(____bombs_BUNDLE_TGT_REF_DEP)
+
+bombs_bombs.o: $(srcdir)/bombs.cpp
+	$(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $(srcdir)/bombs.cpp
+
+bombs_bombs1.o: $(srcdir)/bombs1.cpp
+	$(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $(srcdir)/bombs1.cpp
+
+bombs_game.o: $(srcdir)/game.cpp
+	$(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $(srcdir)/game.cpp
+
+bombs_bombs_rc.o: $(srcdir)/bombs.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean bombs_bundle
diff --git a/demos/forty/Makefile b/demos/forty/Makefile
new file mode 100644
index 0000000000..f9e569d546
--- /dev/null
+++ b/demos/forty/Makefile
@@ -0,0 +1,237 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+FORTY_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+FORTY_OBJECTS =  \
+	forty_forty.o \
+	forty_canvas.o \
+	forty_card.o \
+	forty_game.o \
+	forty_pile.o \
+	forty_playerdg.o \
+	forty_scoredg.o \
+	forty_scorefil.o \
+	$(__forty___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___forty___os2_emxbindcmd = $(NM) forty$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep forty$(EXEEXT) ; fi
+#__forty___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___forty___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__forty_app_Contents_PkgInfo___depname \
+#	= forty.app/Contents/PkgInfo
+#__forty_bundle___depname = forty_bundle
+#____forty_BUNDLE_TGT_REF_DEP = \
+#	$(__forty_app_Contents_PkgInfo___depname)
+#____forty_BUNDLE_TGT_REF_DEP \
+#	= $(__forty_app_Contents_PkgInfo___depname)
+#____forty_BUNDLE_TGT_REF_DEP \
+#	= $(__forty_app_Contents_PkgInfo___depname)
+#____forty_BUNDLE_TGT_REF_DEP \
+#	= $(__forty_app_Contents_PkgInfo___depname)
+#____forty_BUNDLE_TGT_REF_DEP = \
+#	$(__forty_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_XML_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__forty___win32rc = forty_forty_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: forty$(EXEEXT) $(__forty_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f forty$(EXEEXT)
+	rm -rf forty.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
+	$(CXX) -o $@ $(FORTY_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__forty___os2_emxbindcmd)
+
+#forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p forty.app/Contents
+#	mkdir -p forty.app/Contents/MacOS
+#	mkdir -p forty.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/forty/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >forty.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >forty.app/Contents/PkgInfo
+#	
+#	
+#	ln -f forty$(EXEEXT) forty.app/Contents/MacOS/forty
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns forty.app/Contents/Resources/wxmac.icns
+
+#forty_bundle: $(____forty_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in about.htm; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+forty_forty.o: $(srcdir)/forty.cpp
+	$(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/forty.cpp
+
+forty_canvas.o: $(srcdir)/canvas.cpp
+	$(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/canvas.cpp
+
+forty_card.o: $(srcdir)/card.cpp
+	$(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/card.cpp
+
+forty_game.o: $(srcdir)/game.cpp
+	$(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/game.cpp
+
+forty_pile.o: $(srcdir)/pile.cpp
+	$(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/pile.cpp
+
+forty_playerdg.o: $(srcdir)/playerdg.cpp
+	$(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/playerdg.cpp
+
+forty_scoredg.o: $(srcdir)/scoredg.cpp
+	$(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/scoredg.cpp
+
+forty_scorefil.o: $(srcdir)/scorefil.cpp
+	$(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/scorefil.cpp
+
+forty_forty_rc.o: $(srcdir)/forty.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean forty_bundle data
diff --git a/demos/fractal/Makefile b/demos/fractal/Makefile
new file mode 100644
index 0000000000..352c9a308b
--- /dev/null
+++ b/demos/fractal/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+FRACTAL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+FRACTAL_OBJECTS =  \
+	fractal_fractal.o \
+	$(__fractal___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___fractal___os2_emxbindcmd = $(NM) fractal$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep fractal$(EXEEXT) ; fi
+#__fractal___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fractal___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__fractal_app_Contents_PkgInfo___depname \
+#	= fractal.app/Contents/PkgInfo
+#__fractal_bundle___depname = fractal_bundle
+#____fractal_BUNDLE_TGT_REF_DEP = \
+#	$(__fractal_app_Contents_PkgInfo___depname)
+#____fractal_BUNDLE_TGT_REF_DEP \
+#	= $(__fractal_app_Contents_PkgInfo___depname)
+#____fractal_BUNDLE_TGT_REF_DEP \
+#	= $(__fractal_app_Contents_PkgInfo___depname)
+#____fractal_BUNDLE_TGT_REF_DEP \
+#	= $(__fractal_app_Contents_PkgInfo___depname)
+#____fractal_BUNDLE_TGT_REF_DEP = \
+#	$(__fractal_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__fractal___win32rc = fractal_fractal_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: fractal$(EXEEXT) $(__fractal_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f fractal$(EXEEXT)
+	rm -rf fractal.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
+	$(CXX) -o $@ $(FRACTAL_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__fractal___os2_emxbindcmd)
+
+#fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p fractal.app/Contents
+#	mkdir -p fractal.app/Contents/MacOS
+#	mkdir -p fractal.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/fractal/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >fractal.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >fractal.app/Contents/PkgInfo
+#	
+#	
+#	ln -f fractal$(EXEEXT) fractal.app/Contents/MacOS/fractal
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns fractal.app/Contents/Resources/wxmac.icns
+
+#fractal_bundle: $(____fractal_BUNDLE_TGT_REF_DEP)
+
+fractal_fractal.o: $(srcdir)/fractal.cpp
+	$(CXXC) -c -o $@ $(FRACTAL_CXXFLAGS) $(srcdir)/fractal.cpp
+
+fractal_fractal_rc.o: $(srcdir)/fractal.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean fractal_bundle
diff --git a/demos/life/Makefile b/demos/life/Makefile
new file mode 100644
index 0000000000..961949bac5
--- /dev/null
+++ b/demos/life/Makefile
@@ -0,0 +1,214 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+LIFE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+LIFE_OBJECTS =  \
+	life_life.o \
+	life_dialogs.o \
+	life_game.o \
+	life_reader.o \
+	$(__life___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___life___os2_emxbindcmd = $(NM) life$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep life$(EXEEXT) ; fi
+#__life___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___life___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__life_app_Contents_PkgInfo___depname \
+#	= life.app/Contents/PkgInfo
+#__life_bundle___depname = life_bundle
+#____life_BUNDLE_TGT_REF_DEP = \
+#	$(__life_app_Contents_PkgInfo___depname)
+#____life_BUNDLE_TGT_REF_DEP \
+#	= $(__life_app_Contents_PkgInfo___depname)
+#____life_BUNDLE_TGT_REF_DEP \
+#	= $(__life_app_Contents_PkgInfo___depname)
+#____life_BUNDLE_TGT_REF_DEP \
+#	= $(__life_app_Contents_PkgInfo___depname)
+#____life_BUNDLE_TGT_REF_DEP = \
+#	$(__life_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__life___win32rc = life_life_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: life$(EXEEXT) $(__life_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f life$(EXEEXT)
+	rm -rf life.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
+	$(CXX) -o $@ $(LIFE_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__life___os2_emxbindcmd)
+
+#life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p life.app/Contents
+#	mkdir -p life.app/Contents/MacOS
+#	mkdir -p life.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/life/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >life.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >life.app/Contents/PkgInfo
+#	
+#	
+#	ln -f life$(EXEEXT) life.app/Contents/MacOS/life
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns life.app/Contents/Resources/wxmac.icns
+
+#life_bundle: $(____life_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in breeder.lif; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+life_life.o: $(srcdir)/life.cpp
+	$(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $(srcdir)/life.cpp
+
+life_dialogs.o: $(srcdir)/dialogs.cpp
+	$(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $(srcdir)/dialogs.cpp
+
+life_game.o: $(srcdir)/game.cpp
+	$(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $(srcdir)/game.cpp
+
+life_reader.o: $(srcdir)/reader.cpp
+	$(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $(srcdir)/reader.cpp
+
+life_life_rc.o: $(srcdir)/life.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean life_bundle data
diff --git a/demos/poem/Makefile b/demos/poem/Makefile
new file mode 100644
index 0000000000..6a222ad552
--- /dev/null
+++ b/demos/poem/Makefile
@@ -0,0 +1,206 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+WXPOEM_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+WXPOEM_OBJECTS =  \
+	wxpoem_wxpoem.o \
+	$(__wxpoem___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___wxpoem___os2_emxbindcmd = $(NM) wxpoem$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep wxpoem$(EXEEXT) ; fi
+#__wxpoem___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wxpoem___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__wxpoem_app_Contents_PkgInfo___depname \
+#	= wxpoem.app/Contents/PkgInfo
+#__wxpoem_bundle___depname = wxpoem_bundle
+#____wxpoem_BUNDLE_TGT_REF_DEP = \
+#	$(__wxpoem_app_Contents_PkgInfo___depname)
+#____wxpoem_BUNDLE_TGT_REF_DEP \
+#	= $(__wxpoem_app_Contents_PkgInfo___depname)
+#____wxpoem_BUNDLE_TGT_REF_DEP \
+#	= $(__wxpoem_app_Contents_PkgInfo___depname)
+#____wxpoem_BUNDLE_TGT_REF_DEP \
+#	= $(__wxpoem_app_Contents_PkgInfo___depname)
+#____wxpoem_BUNDLE_TGT_REF_DEP = \
+#	$(__wxpoem_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__wxpoem___win32rc = wxpoem_wxpoem_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: wxpoem$(EXEEXT) $(__wxpoem_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f wxpoem$(EXEEXT)
+	rm -rf wxpoem.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc)
+	$(CXX) -o $@ $(WXPOEM_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__wxpoem___os2_emxbindcmd)
+
+#wxpoem.app/Contents/PkgInfo: wxpoem$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p wxpoem.app/Contents
+#	mkdir -p wxpoem.app/Contents/MacOS
+#	mkdir -p wxpoem.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/wxpoem/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >wxpoem.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >wxpoem.app/Contents/PkgInfo
+#	
+#	
+#	ln -f wxpoem$(EXEEXT) wxpoem.app/Contents/MacOS/wxpoem
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns wxpoem.app/Contents/Resources/wxmac.icns
+
+#wxpoem_bundle: $(____wxpoem_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in wxpoem.txt wxpoem.dat wxpoem.idx; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+wxpoem_wxpoem.o: $(srcdir)/wxpoem.cpp
+	$(CXXC) -c -o $@ $(WXPOEM_CXXFLAGS) $(srcdir)/wxpoem.cpp
+
+wxpoem_wxpoem_rc.o: $(srcdir)/wxpoem.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean wxpoem_bundle data
diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index dc41795ee9..03feabce2c 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -513,13 +513,13 @@
 #   endif
 #endif /* !defined(wxUSE_BUTTON) */
 
-#ifndef wxUSE_CAIRO
+#if !defined(wxUSE_CAIRO) && defined(__WXGTK__) 
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_CAIRO must be defined, please read comment near the top of this file."
 #   else
 #       define wxUSE_CAIRO 0
 #   endif
-#endif /* !defined(wxUSE_CAIRO) */
+#endif /* !defined(wxUSE_CAIRO) && defined(__WXGTK__)  */
 
 #ifndef wxUSE_CALENDARCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
diff --git a/lib/abicheck.sh b/lib/abicheck.sh
deleted file mode 100755
index 1e66ac4f65..0000000000
--- a/lib/abicheck.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-# Script originally based on GTK+'s own abicheck.sh; it should be run anytime
-# there is a change in the stable branch of wxWidgets which could lead to an
-# ABI breakage and thus result in a binary-incompatible change (see tech docs).
-#
-
-
-expected_abi_file="expected_abi"
-actual_abi_file="actual_abi"
-
-if [[ "$(uname)" == "Darwin" ]]; then
-   file_mask=*.dylib
-   nm_options="-g -U"
-else
-   file_mask=*.so
-   nm_options="-D -g --defined-only"
-fi
-
-if [[ "$1" == "--generate" ]]; then
-
-    # IMPORTANT: we need a shared build of wxWidgets to proceed
-    if [[ $(echo $file_mask) == "$file_mask" ]]; then
-        echo "No shared objects ($file_mask) were found... aborting"
-        exit 1
-    fi
-
-    # generated the "expected ABI" for later comparison
-    rm -f $expected_abi_file
-    for library in $file_mask; do
-        # NOTE: don't use -C option as otherwise cut won't work correctly
-        nm $nm_options $library | cut -d ' ' -f 2,3 | sort >>$expected_abi_file
-    done
-
-    echo "Expected wxWidgets ABI generated in \"$expected_abi_file\"..."
-
-elif [[ -z "$1" ]]; then
-
-    if [[ ! -f "$expected_abi_file" ]]; then
-        echo "The file containing the expected wxWidgets ABI '$expected_abi_file' does not exist!"
-        echo "Please generate it first using the '--generate' option"
-        exit 1
-    fi
-
-    echo "Comparing actual ABI with the expected ABI (loading it from \"$expected_abi_file\")..."
-
-    # IMPORTANT: we need a shared build of wxWidgets to do the check
-    if [[ $(echo $file_mask) == "*$file_mask" ]]; then
-        echo "No shared objects ($file_mask) were found... aborting"
-        exit 1
-    fi
-
-    rm -f $actual_abi_file
-    for library in $file_mask; do
-        # NOTE: don't use -C option as otherwise cut won't work correctly
-        nm $nm_options $library | cut -d ' ' -f 2,3 | sort >>$actual_abi_file
-    done
-
-    result=`diff -u $expected_abi_file $actual_abi_file`
-
-    if [[ -z "$result" ]]; then
-        echo "No binary (in)compatible changes were found."
-    else
-        echo "========================================================="
-        echo "WARNING: Possible binary-incompatible changes were found:"
-        echo "========================================================="
-        echo
-        echo "$result"
-
-        # this doesn't necessarly indicate that binary compatibility was surely
-        # broken; e.g. adding non-virtual methods will generate a new line in the
-        # $actual_abi_file but that's a compatible change.
-    fi
-
-else
-
-    echo "Usage: $0 [--generate]"
-    echo "When running without options, compares the wxWidgets ABI saved in '$expected_abi_file'"
-    echo "with the current ABI of the .so files of the working directory."
-    echo "When --generate is given, saves in '$expected_abi_file' the ABI of the .so files"
-    echo "(for later comparisons)."
-
-fi
-
diff --git a/lib/vms.opt b/lib/vms.opt
deleted file mode 100644
index a589086c99..0000000000
--- a/lib/vms.opt
+++ /dev/null
@@ -1,11 +0,0 @@
-wx_root:[wxwidgets.lib]libwx_motif.olb/lib
-sys$library:libjpeg.olb/lib
-sys$library:libpng.olb/lib
-sys$library:libz.olb/lib
-sys$share:tiff$shr/share
-X11:libxpm.olb/lib
-sys$library:decw$xextlibshr.exe/share
-sys$library:decw$xlibshr.exe/share
-sys$library:decw$xtlibshrr5.exe/share
-sys$library:decw$xmlibshr12.exe/share
-sys$library:decw$xmulibshrr5.exe/share
diff --git a/lib/vms_gtk.opt b/lib/vms_gtk.opt
deleted file mode 100644
index d38927153e..0000000000
--- a/lib/vms_gtk.opt
+++ /dev/null
@@ -1,14 +0,0 @@
-wx_root:[wxwidgets.lib]libwx_gtk.olb/lib
-sys$library:gthread.obj
-sys$library:libjpeg.olb/lib
-sys$library:libpng.olb/lib
-sys$library:libz.olb/lib
-sys$share:tiff$shr/share
-sys$library:expat.olb/lib
-X11:libxpm.olb/lib
-sys$share:libgtk.exe/share
-sys$share:libgdk.exe/share
-sys$share:libglib.exe/share
-sys$share:pthread$rtl.exe/share
-sys$library:decw$xextlibshr.exe/share
-sys$library:decw$xlibshr.exe/share
diff --git a/lib/vms_gtk2.opt b/lib/vms_gtk2.opt
deleted file mode 100644
index ecb88e5bbb..0000000000
--- a/lib/vms_gtk2.opt
+++ /dev/null
@@ -1,20 +0,0 @@
-wx_root:[wxwidgets.lib]libwx_gtk2.olb/lib
-sys$library:libcairo.olb/lib
-sys$library:libpixman.olb/lib
-sys$library:libjpeg.olb/lib
-sys$library:libpng.olb/lib
-sys$library:libz.olb/lib
-sys$share:tiff$shr/share
-X11:libxpm.olb/lib
-sys$library:expat.olb/lib
-sys$share:libgtk2.exe/share
-sys$share:libgdk-pixbuf.exe/share
-sys$share:libgdk2.exe/share
-sys$share:libpango.exe/share
-sys$share:libglib2.exe/share
-sys$share:freetype2shr/share
-sys$share:libfontconfig/share
-sys$share:pthread$rtl.exe/share
-sys$share:libXrender.exe/share
-sys$library:decw$xextlibshr.exe/share
-sys$library:decw$xlibshr.exe/share
diff --git a/lib/vms_x11_univ.opt b/lib/vms_x11_univ.opt
deleted file mode 100644
index dcf95c810a..0000000000
--- a/lib/vms_x11_univ.opt
+++ /dev/null
@@ -1,15 +0,0 @@
-wx_root:[wxwidgets.lib]libwx_x11_univ.olb/lib
-sys$library:libcairo.olb/lib
-sys$library:libpixman.olb/lib
-sys$library:libjpeg.olb/lib
-sys$library:libpng.olb/lib
-sys$library:libz.olb/lib
-sys$share:tiff$shr/share
-sys$library:expat.olb/lib
-X11:libxpm.olb/lib
-sys$share:freetype2shr/share
-sys$share:libfontconfig/share
-sys$share:pthread$rtl.exe/share
-sys$share:libXrender.exe/share
-sys$library:decw$xextlibshr.exe/share
-sys$library:decw$xlibshr.exe/share
diff --git a/lib/wx/config/gtk3-unicode-static-3.1 b/lib/wx/config/gtk3-unicode-static-3.1
new file mode 100644
index 0000000000..4f3cc6ee21
--- /dev/null
+++ b/lib/wx/config/gtk3-unicode-static-3.1
@@ -0,0 +1,1397 @@
+#!/bin/sh
+#
+# Name:        wx-config{.in,}
+# Purpose:     wx configuration search and query tool {template,}
+# Author:      Ron <ron@debian.org>
+# Modified by:
+# Created:     8/9/2004
+# Copyright:   (c) 2004 Ron <ron@debian.org>
+#              Essentially a fresh start this time around, but for maximum
+#              compatibility basic code was taken from, and heavy reference
+#              made to, the previously unattributed wx-config from cvs.
+#              All the usual suspects contributed to the dicussion that led
+#              to this new work and likewise to the ideas and content in the
+#              original (which was probably influenced by gtk), among them:
+#              Robert Roebling, Vadim Zeitlin, Vaclav Slavik, Robin Dunn
+# Licence:     wxWindows licence
+############################################################################
+
+# Extra^2 debug mode, for if things ever get really weird.
+[ -z "$WXDEBUG_X" ] || set -x
+
+
+# On with some basic stuff, like the ability to die gracefully,
+# and to tell people what we are about.
+# ------------------------------------------------------------------
+
+# decho _message
+# Output a message to stderr.
+decho() { echo "$*" 1>&2; }
+
+# usage _exitcode
+# Outputs a usage message to stderr and exits with _exitcode.
+# Try to keep this to a single page (ie. < 25 lines).  We can add
+# alternate or interactive help targets if people want more detail.
+#
+# Exit codes are now subject to a more strict interpretation.
+# wx-config should return 0 upon successful operation, 1 if the
+# reqested operation could not be completed successfully, and 2
+# if the requested operation is not supported by this version of
+# wx-config.
+usage()
+{
+    cat 1>&2 <<EOF
+
+ wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--release] [--version-full]
+           [--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]
+           [--universal[=yes|no]] [--unicode[=yes|no]] [--static[=yes|no]]
+           [--debug[=yes|no]] [--version[=VERSION]] [--flavour=FLAVOUR]
+           [--basename] [--cc] [--cxx]
+           [--cppflags [base]] [--cxxflags [base]] [--cflags]
+           [--rescomp] [--linkdeps] [--ld] [--utility=UTIL]
+           [--libs [LIBS...]] [--optional-libs [LIBS...]]
+
+    wx-config returns information about the wxWidgets libraries available on
+  your system.  It may be used to retrieve the information required to build
+  applications using these libraries using --cppflags, --cxxflags, --cflags,
+  and --libs options. And you may query the properties of this configuration
+  using  --query-{host,toolkit,widgetset,chartype,debugtype,version,flavour,
+  linkage}.
+
+    NOTE:    Usage of --debug and --query-debugtype are only relevant if you
+  have any  versions prior to 2.9 installed  and use the --version option to
+  select an earlier version.
+
+    If multiple builds of wxWidgets  are available,  you can use the options
+  --prefix, --host, --toolkit,  --unicode, --static, --universal,  --version
+  or --flavour to select from them.  The --selected-config option shows  the
+  name of the current configuration and --list  shows available alternatives
+  which match specified criteria.  The --utility option  returns the correct
+  version of  UTIL to use with  the selected build.  The  --linkdeps  option
+  returns only static libraries for your makefile link rule dependencies.
+
+    The LIBS arguments (comma or space separated) may be used to specify the
+  wxWidgets libraries that  you wish to use. The "std" label may be used  to
+  import all libraries that would be used by default if none were  specified
+  explicitly, e.g. wx-config --libs core,base. The "all" label may  be  used
+  to  import  all libraries that have been compiled which are shown  in  the
+  list  below.  The  --optional-libs parameter should be followed by  a list
+  of  libs that should be linked to, but only if they are available.
+
+  Available libraries in this build are:
+  webview stc richtext ribbon propgrid aui gl html qa adv core net base
+
+EOF
+
+    exit $1
+}
+
+# Unfussy people are the easiest to deal with, get them out of the way now.
+[ $# -gt 0 ] || usage 1
+
+
+# Contentious tools determined by configure.
+EGREP="/usr/bin/grep -E"
+
+
+# For the people who know what they want, or think they do:
+# Divide the valid arguments into functional groups for later examination,
+# then parse all command line arguments completely, deferring action on
+# output options until all significant input has been processed and any
+# decision about delegation has been taken.
+
+# Note early, that '-' is a complete no-no for use in option names below.
+# It totally falls apart as soon as it becomes part of a variable name.
+# Use '_' instead, and by the magic of it all just being bits, you'll
+# be able to use --my-option or --my_option from the command line at
+# your discretion.  They are synonymous as user input, but _ALWAYS_ use
+# underscores for compound names in the code here, never a dash.
+
+
+# The list of all options we recognise.  If it is not in here, then
+# it is not something we want to handle.
+# ------------------------------------------------------------------
+
+# Options that specify a distinct library build.
+#
+# Note also that order in this list is significant later on, as this sets
+# the precedence with which we will try to gauge the similarity of other
+# configs to this one.  Options earlier in the list should be more crucial
+# to match well than those that follow.  Options specified by the user will
+# always take precedence and are not subject to any partial ordering here.
+wxconfig_schema="host toolkit widgetset chartype debugtype flavour version linkage"
+
+# Options that are expected to generate some output.
+wxconfig_output_options="prefix exec_prefix
+                         list
+                         release version version_full
+                         basename
+                         cppflags cflags cxxflags
+                         rescomp
+                         rezflags
+                         libs
+                         optional_libs
+                         linkdeps
+                         cc cxx ld
+                         gl_libs"
+
+# Options that permit the user to supply hints that may affect the output.
+# These options all accept arbitrary values, to interpret as they please.
+wxconfig_input_options="prefix exec_prefix utility $wxconfig_schema"
+
+# Input options that accept only a yes or no argument.
+#
+# Notice that this includes "debug" but it is done only for compatibility, this
+# options (i.e. --debug[=yes] or --debug=no) is completely ignored as there is
+# no distinction between debug and release builds in wx any more
+wxconfig_yesno_options="universal unicode debug static"
+
+# Boolean options that do something or not.
+wxconfig_flag_options="$wxconfig_yesno_options selected_config no_rpath inplace"
+
+
+
+# Some simple sugar coating to keep things more readable below.
+# --------------------------------------------------------------
+
+# option_name _string
+# Returns NAME if _string is of the form: --NAME[=...]
+option_name()
+{
+    echo "$1" | sed -e 's/^--//' -e 's/=.*//' -e s/-/_/g
+}
+
+# option_value _string
+# Returns FOO if _string is of the form: --option=FOO
+option_value()
+{
+    echo "$1" | sed 's/^[^=]*=//'
+}
+
+# match_field _value _list
+# Returns true if _value is a field in _list
+match_field()
+{
+    _match_field_match="$1"
+    shift
+    for _match_field_i do
+        [ "x$_match_field_i" != "x$_match_field_match" ] || return 0
+    done
+    false
+}
+
+# remove_field _value _list
+# Returns _list minus any field(s) that match _value.
+remove_field()
+{
+    _remf_value="$1"
+    _remf_list=''
+    shift
+    if [ -n "$_remf_value" ]; then
+        for _remf_item do
+            [ "x$_remf_item" = "x$_remf_value" ] ||
+                _remf_list="${_remf_list:+$_remf_list }$_remf_item"
+        done
+        echo "$_remf_list"
+    else
+        echo $*
+    fi
+}
+
+# validate_arg _domain _set _name _value
+# Boilerplate to validate an argument and initialise a pseudo-hash.
+# This one is almost reduction into absurdity, and perhaps makes the
+# precise action of the argument parser below just a little more
+# obscure, but oh so neat and compact to use for multiple option
+# groups.  It expands to replace repetitive clauses of the form:
+#
+#        i="$(option_name $arg)"
+#        if match_field "$i" $wxconfig_input_options; then
+#            input_options="${input_options:+$input_options }$i"
+#            eval "input_option_$i=$(option_value $arg)"
+#            continue
+#        fi
+#
+# with the one liners you see on the page below.
+validate_arg()
+{
+    if match_field "$3" `eval echo \"\\\$$1_$2_options\"`; then
+        eval "$2_options=\"\${$2_options:+\$$2_options }$3\""
+        eval "$2_option_$3=\"$4\""
+        return
+    fi
+    false
+}
+
+# check_yesno_option _ynoption _option _yesval _noval
+# This one might be made more generic and/or incorporated into
+# validate_arg above at some later stage, but right now we just
+# condition any specialist options into a generic one for later
+# handling.  Once they are sanity checked there is no difference
+# in any case.
+check_yesno_option()
+{
+    eval "case \${yesno_option_$1-\${flag_option_$1-unset}} in
+            unset)                          ;;
+            y*|Y*)  input_option_$2=\"$3\"  ;;
+            n*|N*)  input_option_$2=\"$4\"  ;;
+            *)
+                decho
+                decho \" *** Error: Invalid request '--$1=\$yesno_option_$1'\"
+                decho \" Valid arguments for --$1 are: [ yes, no ]\"
+                decho
+                exit 1
+                ;;
+         esac"
+}
+
+
+MAC_FRAMEWORK=
+MAC_FRAMEWORK_PREFIX=
+
+
+# Now we are ready to find out what the user wants from us.
+# --------------------------------------------------------------
+
+# With just a little more complexity here we could have shortest
+# unique string matching for options, but that is probably overkill
+# today, so let's just get the job done.
+#
+# The important thing now then is that we simply read all input from
+# the user and don't try to act prematurely on partial information.
+# --help or an illegal argument are the only shortcuts out of here
+# at this point, otherwise, it's time to just shut up and listen for
+# a moment.
+
+for arg do
+  case "$arg" in
+    --help|-h)
+        usage
+        ;;
+
+    --*=*)
+        _name=`option_name $arg`
+        _value=`option_value $arg`
+        if validate_arg wxconfig input "$_name" "$_value" ||
+           validate_arg wxconfig yesno "$_name" "$_value"
+        then
+            continue
+        fi
+        ;;
+
+    --query-*)
+        _name=`echo $arg | sed 's/^--query-//'`
+        if match_field "$_name" $wxconfig_schema
+        then
+            query_options="${query_options:+$query_options }$_name"
+            continue
+        fi
+        ;;
+
+    --*)
+        _name=`option_name $arg`
+        if validate_arg wxconfig flag   "$_name" yes ||
+           validate_arg wxconfig output "$_name" yes
+        then
+            continue
+        fi
+        ;;
+
+    *)
+        # We validate the parameters later ...
+
+        if [ "$_name" = "cxxflags" ] || [ "$_name" = "cppflags" ] || [ "$_name" = "cflags" ]; then
+            cxx_parameters="${cxx_parameters:+$cxx_parameters }$arg"
+        elif [ "$_name" = "libs" ]; then
+            libs_parameters="${libs_parameters:+$libs_parameters }$arg"
+        elif [ "$_name" = "optional_libs" ]; then
+            optional_libs_parameters="${optional_libs_parameters:+$optional_libs_parameters }$arg"
+        else
+            # normally anything here are unattached arguments and signify an
+            # error but for compatibility with the 2.8 wx-config and,
+            # especially, configure scripts generated using 2.8 wxwin.m4 and
+            # hence doing `wx-config --version base,std`, we ignore anything
+            # following this option, just as 2.8 version used to do
+            if [ "$_name" != "version" ]; then
+                input_parameters="${input_parameters:+$input_parameters }$arg"
+            fi
+        fi
+        continue
+        ;;
+  esac
+  decho "  *** Error: Unrecognised option: '$arg'"
+  decho "Use wx-config --help for information on command line options."
+  exit 2
+done
+
+# validate_arg only checks and decomposes form.  Sanity check the yes/no
+# options now too and push their respective mask values into place.
+
+check_yesno_option universal widgetset univ
+check_yesno_option unicode chartype unicode ansi
+check_yesno_option static linkage static
+check_yesno_option debug debugtype debug release
+
+# Dump everything we just read in debug mode.
+if [ -n "$WXDEBUG" ]; then
+
+    decho
+    decho "  input parameters          = $input_parameters"
+    decho "  libs parameters           = $libs_parameters"
+    decho "  optional-libs parameters  = $optional_libs_parameters"
+    decho "  input options     = $input_options"
+    for i in $input_options; do
+        decho "    $i = `eval echo \"\\\$input_option_$i\"`"
+    done
+    decho "  yes/no options    = $yesno_options"
+    for y in $yesno_options; do
+        decho "    $y = `eval echo \"\\\$yesno_option_$y\"`"
+    done
+    decho "  flag options      = $flag_options"
+    for f in $flag_options; do
+        decho "    $f = `eval echo \"\\\$flag_option_$f\"`"
+    done
+    decho "  output options    = $output_options"
+    for o in $output_options; do
+        decho "    $o = `eval echo \"\\\$output_option_$o\"`"
+    done
+    decho "  query options     = $query_options"
+
+fi
+
+
+
+# Everything came in as a legal argument then, let's put some of
+# the pieces together with a little self knowledge to see what
+# we should do next.
+# --------------------------------------------------------------
+
+# get_mask [ _hash ]
+# Construct a config filename mask from a pseudo-hash of component variables.
+# The optional argument is the prefix of the hash to use.  If not specified
+# this will return a mask derived from the command line options that were used.
+get_mask()
+{
+    [ $# -gt 0 ] || set m
+
+    case "$m_ourversion" in
+        2.9)
+            is29orlater=1
+            ;;
+        2.*)
+            # there is no 2.10 so currently everything else is <= 2.8
+            is29orlater=0
+            ;;
+        *)
+            # 3.x and later "is29orlater" too
+            is29orlater=1
+            ;;
+    esac
+
+    # use 2.8 or 2.9 version of the mask: the difference is the presence of
+    # debug type in pre-2.9
+    if [ $is29orlater = 1 ]; then
+        eval echo "\${$1_host:+\$$1_host-}\${$1_toolkit}\${$1_widgetset}-\${$1_chartype}\${$1_linkage:+-\$$1_linkage}-\${$1_version}\${$1_flavour}"
+    else
+        eval echo "\${$1_host:+\$$1_host-}\${$1_toolkit}\${$1_widgetset}-\${$1_chartype}-\${$1_debugtype}\${$1_linkage:+-\$$1_linkage}-\${$1_version}\${$1_flavour}"
+    fi
+}
+
+# Returns true if this script is for a cross compiled config.
+is_cross()  { [ "xno" = "xyes" ]; }
+
+
+# Determine the base directories we require.
+prefix=${input_option_prefix-${this_prefix:-/usr/local}}
+exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-${prefix}}}}
+wxconfdir="${exec_prefix}/lib/wx/config"
+
+installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"`
+
+is_cross && target=""
+
+# Define a pseudo-hash to contain the specification of this wx-config
+# instance and its associated library.
+this_host="${target:+${target}}"
+this_toolkit="gtk3"
+this_widgetset=""
+this_chartype="unicode"
+this_debugtype="release"
+this_flavour=""
+this_version="3.1"
+this_linkage=`[ "x0" = "x1" ] || echo 'static'`
+
+
+# Extract the user specification from the options parsed.
+m_host=${input_option_host:+"${input_option_host}-?"}
+m_host=${m_host:-$this_host}
+m_toolkit=${input_option_toolkit:-'[^-]+'}
+m_widgetset=${input_option_widgetset-'(univ)?'}
+m_chartype=${input_option_chartype:-'(unicode|ansi)'}
+m_debugtype=${input_option_debugtype:-'(debug|release)'}
+m_flavour=${input_option_flavour:+-$input_option_flavour}
+m_flavour=${m_flavour:-${input_option_flavour-'(-[^-]+)?'}}
+m_version=${input_option_version:-'[0-9]+\.[0-9]+'}
+m_linkage=${input_option_linkage-'?(static)?'}
+
+# Test whether or not --version has been specified
+#
+# This must be done after getting the input options so get_mask works correctly
+# since it is version-dependent
+
+if [ -z "$input_option_version" ]; then
+    m_ourversion="2.9"
+else
+    m_ourversion=$m_version
+fi
+
+this_config=`get_mask this`
+
+configmask="^`get_mask`$"
+
+
+# Dump the user specification in debug mode.
+if [ -n "$WXDEBUG" ]; then
+
+    decho
+    decho "  prefix       = '$prefix'"
+    decho "  exec_prefix  = '$exec_prefix'"
+    decho "  wxconfdir    = '$wxconfdir'"
+
+    decho "  m_host       = '$m_host'"
+    decho "  m_toolkit    = '$m_toolkit'"
+    decho "  m_widgetset  = '$m_widgetset'"
+    decho "  m_chartype   = '$m_chartype'"
+    decho "  m_debugtype  = '$m_debugtype'"
+    decho "  m_flavour    = '$m_flavour'"
+    decho "  m_version    = '$m_version'"
+    decho "  m_linkage    = '$m_linkage'"
+
+    decho "  configmask   = '$configmask'"
+    decho "  this config  = '$this_config'"
+    decho
+
+fi
+
+
+
+# From here on, we'll need to be able to figure out a delegation target.
+# -----------------------------------------------------------------------
+
+# The rules for delegation are:
+#
+# 1. If the specification is so general that it matches the default config
+#    (ie. this one on a first pass), then the default config will be used
+#    even if other installed libs would also match the spec.
+#
+# 2. If the default config does not match, find a list of all installed
+#    libraries that do match.
+#       a. If that list is empty, the specification is incompatible
+#          with any installed lib.  Warn and abort.
+#       b. If that list contains exactly one candidate.  Delegate to
+#          that candidate.
+#       c. If the list contains multiple candidates, pass on to step 3.
+#
+# 3. Attempt to discriminate among rival candidates by their similarity
+#    to the default configuration (ie. this one).  If we can find a unique
+#    candidate in this way, delegate to it.  If not, present a list of
+#    options to the user and request that they disambiguate it with one or
+#    more additional fields.
+#
+#    To refine the specified pattern, we specialise each unbound field
+#    using the default value from this config file.  If that results in
+#    no matches, we unbind it again and try the next field.  If it still
+#    results in multiple matches we try binding the next field as well
+#    until a unique or null result again occurs.
+#
+# A more general way to look at this, is the feature specifiers are all
+# modifiers of the wx-config you are calling.  If you supply none, the
+# default for that build configuration will be used.  If you supply one
+# or more that the default build cannot satisfy, it will try to find the
+# config most like itself with the desired feature(s) enabled.
+# The features configured into the first wx-config called will be taken
+# as implicitly specified if it is necessary to disambiguate likely
+# candidates from the information that was explicitly provided.
+
+
+# But first, more sugar to keep what follows clear and legible.
+# --------------------------------------------------------------
+
+# find_eligible_delegates _mask
+# Outputs all the config files installed which match the
+# (extended regex) _mask passed as an argument.
+find_eligible_delegates() { echo "$installed_configs" | $EGREP "$1" 2> /dev/null; }
+
+# user_mask_fits _config
+# Returns true if the string _config satisfies the user specified mask.
+user_mask_fits()          { echo "$1" | $EGREP "$configmask" > /dev/null 2>&1; }
+
+# count_fields _word
+# Returns the number of IFS split fields in _word
+count_fields()      { return $#; }
+
+# count_delegates _mask
+# Return the number of eligible config files that match _mask
+count_delegates()   { count_fields `find_eligible_delegates $1`; }
+
+# is_set _variablename
+# Returns true if $_variablename is initialised.
+is_set()            { [ "x`eval echo \"\\\${$1-unset}\"`" != "xunset" ]; }
+
+# not _cmd _args...
+# true iff _cmd is false
+not()               { if "$@"; then false; else true; fi; }
+
+# do_find_best_delegate _unbound-options
+# The real worker part of find_best_delegate below.  Recurses though all
+# unbound options binding them one at a time to the default derived from
+# this file until a unique match is made or no alternatives remain that
+# may be sensibly guessed at.  It will preferentially bind the unspecified
+# options in the order they are listed in wxconfig_schema.  Using this
+# partial ordering it should find the first match with the most significant
+# similarity to this file that unambiguously meets the user specification.
+# If such a match exists it will be output to stdout.
+#
+# Be careful if you modify this function.  If the pruning logic is rendered
+# inoperative it will simply recurse over every permutation in the search
+# space, which may still appear to work, but add a couple more options (or
+# explicitly specify a few less) and you may not live long enough to learn
+# the result.  WXDEBUG=findprogress is your friend here, it will show you
+# how many nodes get searched before a result.  If you start seeing
+# increases in that number for the same input, check your work.
+# Raising the number of discriminating options from 6 to 8 raised the worst
+# case time for this to run (without pruning) from 3 to nearly 15 seconds
+# and its downhill fast from here if we have to ride that boat.
+# Early pruning still gets that down to under half a second (up from about
+# .25), so we have some breathing space yet before a different search method
+# will be called for, but let's not squander it.
+do_find_best_delegate()
+{
+  (
+    if [ "x$WXDEBUG" = "xverbose" ]; then
+        _fbd_indent="${_fbd_indent}. "
+        decho "  $_fbd_indent---> unbound options: $*"
+    fi
+
+    for i do
+
+        if [ "x$WXDEBUG" = "xverbose" ]; then
+            decho "  ${_fbd_indent}binding '$i' with '`remove_field $i $*`' still free"
+            [ -z "$_pruned" ] || decho "  ${_fbd_indent}  --- pruned: $_pruned ---"
+        fi
+
+        if (
+            eval m_$i=\$this_$i
+            _mask="^`get_mask`$"
+
+            if [ "x$WXDEBUG" = "xverbose" ]; then
+                decho "  ${_fbd_indent}  checking: $_mask"
+                count_delegates "$_mask"
+                decho "  $_fbd_indent  $? eligible delegates"
+                for d in `find_eligible_delegates "$_mask"`; do
+                    decho "  ${_fbd_indent}    $d"
+                done
+            fi
+
+            count_delegates "$_mask"
+            _still_eligible=$?
+
+            if [ $_still_eligible -eq 1 ]; then
+                echo `find_eligible_delegates "$_mask"`
+                return
+            fi
+
+            [ "x$WXDEBUG" != "xfindprogress" ] || printf "." 1>&2
+
+            [ $_still_eligible -gt 1 ] && [ $# -gt 1 ] &&
+                do_find_best_delegate `remove_field $i $*`
+           )
+        then
+
+            return
+
+        elif [ $# -gt 1 ]; then
+
+            if [ "x$WXDEBUG" = "xverbose" ]; then
+                decho "  ${_fbd_indent}pruning: $i"
+                _pruned="${_pruned:+$_pruned }$i"
+            fi
+            set `remove_field $i $*`
+
+        fi
+
+    done
+    false
+  )
+}
+
+# find_best_delegate
+# A simple wrapper around do_find_best_delegate that first determines
+# the unbound options (ie. the ones that the user did not explicitly
+# declare a preference for on the command line)
+find_best_delegate()
+{
+    for _fbdi in $wxconfig_schema; do
+        is_set input_option_$_fbdi ||
+            _unbound_options="${_unbound_options:+$_unbound_options }$_fbdi"
+    done
+    do_find_best_delegate $_unbound_options
+}
+
+
+# Legacy wx-config helpers.
+# -------------------------
+
+# get_legacy_mask
+# Returns a mask in the format used by wx2.4.
+get_legacy_mask()
+{
+    [ $# -gt 0 ] || set m
+    eval [ "x\${$1_chartype}" != "xunicode" ] || _unicode_flag=u
+    eval echo "wx\${$1_toolkit}${_unicode_flag}-\${$1_version}\${$1_host}-config"
+}
+
+# find_legacy_configs
+# Returns a list of configs installed by wx2.4 releases.
+find_legacy_configs()
+{
+  (
+    cd "$prefix/bin" &&
+      {
+        ls wx*-2.4-config | grep -v ^wxbase
+        ls wx*-2.4-config | grep ^wxbase
+      }
+  ) 2> /dev/null
+}
+
+# find_best_legacy_config
+# Returns the best legacy config for a given specification.
+# This assumes no matching new style config has been found.
+find_best_legacy_config()
+{
+    _legacy_configs=`find_legacy_configs`
+    if [ -n "$_legacy_configs" ]; then
+        _legacy_mask=`get_legacy_mask`
+        for d in $_legacy_configs; do
+            if echo $d | $EGREP $_legacy_mask > /dev/null 2>&1 ; then
+                echo "$d"
+                return
+            fi
+        done
+    fi
+    false
+}
+
+
+
+# The only action we can perform authoritatively prior to delegation
+# is to list all the possible delegates.
+# --------------------------------------------------------------
+
+config_spec="$0 $*"
+[ -z "$WXDEBUG" ] || config_spec=$configmask
+
+# Next chance for another satisfied customer then
+#
+# If we want to get really polished here we can do plural checking,
+# but we should probably leave that until the day we gettextise it.
+if [ -n "$output_option_list" ]; then
+
+    _remains_in_prefix=$installed_configs
+    _delegates=`find_eligible_delegates $configmask`
+    _best_delegate=`find_best_delegate`
+
+    if [ "x$WXDEBUG" = "xverbose" ]; then
+        decho
+        decho " all      = $_remains_in_prefix"
+        decho " matching = $_delegates"
+        decho " best     = $_best_delegate"
+        decho " this     = $this_config"
+    fi
+
+    for d in $_delegates; do
+        _remains_in_prefix=`remove_field $d $_remains_in_prefix`
+    done
+
+    echo
+    echo "    Default config is $this_config"
+    echo
+
+    if user_mask_fits "$this_config" ; then
+
+        echo "  Default config ${this_exec_prefix+in $this_exec_prefix }will be used for output"
+
+        if match_field "$this_config" $_delegates ; then
+            _delegates=`remove_field $this_config $_delegates`
+        else
+            echo "  though it is not installed in: $prefix"
+            if [ -n "$_best_delegate" ] && [ "x$_best_delegate" != "x$this_config" ]; then
+                echo
+                echo "  Best alternate in $prefix:"
+                echo "    $_best_delegate"
+            fi
+        fi
+
+    elif [ -n "$_best_delegate" ]; then
+
+        echo "  Specification best match: $_best_delegate"
+
+    elif [ -z "$_delegates" ]; then
+
+        _last_chance=`find_best_legacy_config`
+        if [ -n "$_last_chance" ]; then
+
+            echo "  Specification matches legacy config: $_last_chance"
+
+        else
+
+            cat <<-EOF
+          No config found to match: $config_spec
+          in $wxconfdir
+
+          Please install the desired library build, or specify a different
+          prefix where it may be found.  If the library is not installed
+          you may call its wx-config directly by specifying its full path.
+
+EOF
+
+        fi
+
+    else
+        echo " Specification was ambiguous.  Use additional feature options"
+        echo " to choose between alternate matches."
+    fi
+
+    _delegates=`remove_field "$_best_delegate" $_delegates`
+
+    if [ -n "$_delegates" ]; then
+        echo
+        echo "  Alternate matches:"
+        for d in $_delegates; do
+            echo "    $d"
+        done
+    fi
+    if [ -n "$_remains_in_prefix" ]; then
+        echo
+        echo "  Also available in $prefix:"
+        for d in $_remains_in_prefix; do
+            echo "    $d"
+        done
+    fi
+
+    _legacy_configs=`find_legacy_configs`
+    if [ -n "$_legacy_configs" ]; then
+        echo
+        echo "  Legacy configs available in $prefix:"
+        for d in $_legacy_configs; do
+            echo "    $d" | sed 's/-config$//'
+        done
+    fi
+
+    echo
+    exit
+fi
+
+
+
+# ... so if that wasn't what they wanted, then we need to know for
+# certain, can this config satisfy the user specification?
+# --------------------------------------------------------------
+
+if not user_mask_fits "$this_config" ; then
+
+    # No?  Then let's see if it knows anybody who can.
+    # But first, just be sure someone hasn't typo'd us into a loop.
+    # In present day wx, correct delegation should never need more
+    # than one hop so this is trivial to detect.
+
+    if [ -n "$WXCONFIG_DELEGATED" ]; then
+        decho
+        decho " *** Error: Bad config delegation"
+        decho
+        decho " to: $0"
+        decho " ($this_config) cannot satisfy:"
+        decho " $config_spec"
+        decho " Someone has been terribly careless."
+        decho
+        exit 1
+    fi
+
+    count_delegates "$configmask"
+    _numdelegates=$?
+
+    if [ -n "$WXDEBUG" ]; then
+        decho "  must delegate to an alternate config"
+        decho "  potential delegates ($_numdelegates):"
+        for i in `find_eligible_delegates "$configmask"`; do
+            decho "    $i"
+        done
+    fi
+
+    if [ $_numdelegates -eq 0 ]; then
+
+        _last_chance=`find_best_legacy_config`
+        if [ -n "$_last_chance" ]; then
+
+            for arg do
+                case "$arg" in
+                    --prefix*|--exec-prefix*|               \
+                    --version|--release|--basename|         \
+                    --static|--libs|--gl_libs|              \
+                    --cppflags|--cflags|--cxxflags|         \
+                    --cc|--cxx|--ld|                        \
+                    --rezflags|--inplace)
+                        _legacy_args="$_legacy_args $arg"
+                        ;;
+
+                    --static|--static=y*|--static=Y*)
+                        _legacy_args="$_legacy_args --static"
+                        ;;
+                esac
+            done
+
+            if [ -n "$WXDEBUG" ]; then
+                decho "  found a suitable legacy delegate: $_last_chance"
+                decho "--> $prefix/bin/$_last_chance $_legacy_args"
+            fi
+
+            WXCONFIG_DELEGATED=yes
+            export WXCONFIG_DELEGATED
+            $prefix/bin/$_last_chance $_legacy_args
+            exit
+
+        else
+
+            cat 1>&2 <<-EOF
+
+          Warning: No config found to match: $config_spec
+                   in $wxconfdir
+          If you require this configuration, please install the desired
+          library build.  If this is part of an automated configuration
+          test and no other errors occur, you may safely ignore it.
+          You may use wx-config --list to see all configs available in
+          the default prefix.
+
+EOF
+
+            # PIPEDREAM: from here we are actually just a teensy step
+            # from simply building the missing config for the user
+            # on the fly if this is an in tree wx-config.
+
+            exit 1
+        fi
+    fi
+
+    if [ $_numdelegates -gt 1 ]; then
+
+        [ -z "$WXDEBUG" ] || decho "  must prune the list of eligible delegates"
+
+        best_delegate=`find_best_delegate`
+
+        if [ -n "$best_delegate" ]; then
+
+            if [ -n "$WXDEBUG" ]; then
+                decho "  found a suitable delegate: $best_delegate"
+                decho "--> $wxconfdir/$best_delegate $*"
+            fi
+
+            WXCONFIG_DELEGATED=yes
+            export WXCONFIG_DELEGATED
+            $wxconfdir/$best_delegate $*
+            exit
+        fi
+
+        decho
+        decho " *** Error: Specification is ambiguous"
+        decho "            as $config_spec"
+        decho " Use additional feature options to choose between:"
+        for i in `find_eligible_delegates "$configmask"`; do
+            decho "  $i"
+        done
+        decho
+
+        exit 1
+    fi
+
+    if [ -n "$WXDEBUG" ]; then
+        decho "  using the only suitable delegate"
+        decho "--> $wxconfdir/`find_eligible_delegates $configmask` $*"
+    fi
+
+    WXCONFIG_DELEGATED=yes
+    export WXCONFIG_DELEGATED
+    $wxconfdir/`find_eligible_delegates $configmask` $*
+    exit
+fi
+
+
+
+# If we are still here, then from now on we are responsible for
+# all the user's needs.  Time to rustle up some output for them.
+# --------------------------------------------------------------
+
+[ -z "$WXDEBUG" ] || decho "  using this config"
+
+# If the user supplied a prefix, and the in tree config did not
+# delegate out to anything in that prefix, then reset the build
+# tree prefix to provide the correct output for using this
+# uninstalled wx build.  Or put more simply:
+prefix=${this_prefix-$prefix}
+exec_prefix=${this_exec_prefix-$exec_prefix}
+
+includedir="${prefix}/include"
+libdir="${exec_prefix}/lib"
+bindir="${exec_prefix}/bin"
+
+# Trivial queries we can answer now.
+[ -z "$output_option_prefix"        ] || echo $prefix
+[ -z "$output_option_exec_prefix"   ] || echo $exec_prefix
+[ -z "$output_option_release"       ] || echo "3.1"
+[ -z "$output_option_version"       ] || echo "3.1.5"
+[ -z "$output_option_version_full"  ] || echo "3.1.5.0"
+[ -z "$output_option_basename"      ] || echo "wx_gtk3u"
+[ -z "$output_option_cc"            ] || echo "clang"
+[ -z "$output_option_cxx"           ] || echo "clang++ -std=c++17"
+[ -z "$output_option_ld"            ] || echo "clang++ -std=c++17 -o"
+[ -z "$flag_option_selected_config" ] || echo "$this_config"
+
+for q in $query_options; do
+    eval echo "\$this_$q"
+done
+
+# --rezflags is deprecated and disabled (2005/11/29)
+if [ -n "$output_option_rezflags" ]; then
+    echo "@true"
+    decho "Warning: --rezflags, along with Mac OS classic resource building" \
+          "is deprecated.  You should remove this from your Makefile and" \
+          "build .app bundles instead."
+fi
+
+
+# The rest are going to need a little more work.
+# --------------------------------------------------------------
+
+is_monolithic() { [ "x0" = "x1" ]; }
+is_static()     { [ -n "$this_linkage" ]; }
+is_installed()  { [ -z "$this_prefix" ]; }
+
+
+# Is the user after a support utility?
+# If this is a cross build, we need to find and return a suitable
+# native utility for the job, so we search:
+#
+#   1. local build dir (for native uninstalled builds only).
+#   2. (optional) user supplied prefix.
+#   3. configured install prefix.
+#   4. environment $PATH.
+#
+# and if such a thing still cannot be found, exit signalling an error.
+if [ -n "$input_option_utility" ]; then
+
+    # This is dumb, in tree binaries should be in a standard location
+    # like the libs, but work with what we've got for now.
+    is_cross || _util="$exec_prefix/utils/$input_option_utility/$input_option_utility"
+
+    if not is_installed && [ -x "$_util" ]; then
+        is_static || _preload="eval LD_LIBRARY_PATH=$exec_prefix/lib"
+        echo $_preload $_util
+        exit
+    fi
+
+    IFS=':'
+    _user_prefix=${input_option_exec_prefix:-$input_option_prefix}
+
+    for _util in "${input_option_utility}-3.1" \
+                 "${input_option_utility}-3.1"             \
+                 "${input_option_utility}"
+    do
+        for p in ${_user_prefix:+$_user_prefix/bin} $bindir $PATH; do
+
+            [ -z "$WXDEBUG" ] || decho "  checking for: '$p/$_util'"
+
+            if [ -x "$p/$_util" ]; then
+                echo "$p/$_util"
+                exit
+            fi
+
+        done
+    done
+    exit 1
+
+fi
+
+
+# Still here?  Then get the options together for building an app.
+# ----------------------------------------------------------------
+
+# Additional configuration for individual library components.
+ldflags_gl=""
+
+ldlibs_base="-lwxregexu-3.1 -lwxscintilla-3.1  -lz  -lpng -lz -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm"
+ldlibs_core="-lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz "
+ldlibs_gl="-lGL -lGLU -lEGL  -lwayland-egl -lwayland-client "
+ldlibs_html=""
+ldlibs_media="-lgstplayer-1.0 -lgstvideo-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 "
+ldlibs_xml=""
+ldlibs_stc=""
+ldlibs_webview="-lwebkit2gtk-4.0 -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lsoup-2.4 -lgio-2.0 -ljavascriptcoregtk-4.0 -lgobject-2.0 -lglib-2.0 "
+
+
+# Order the libraries passed to us correctly for static linking.
+#
+# While the libraries order doesn't matter when linking dynamically, we must
+# put the libraries depending on other libraries in front of their dependencies
+# when linking statically or the dependencies wouldn't be resolved by the
+# standard UNIX linkers.
+order_libs()
+{
+    if is_static; then
+        for lib do
+            # Distinguish between the libraries that may need to be moved to
+            # the end of the list (because other ones may depend on them) and
+            # those that can be output immediately because no other libraries
+            # depend on them.
+            case "$lib" in
+                base|core|html|xml) eval "use_$lib=1" ;;
+                *)                  libs="$libs $lib" ;;
+            esac
+        done
+
+        # Add the libraries that we postponed adding above.
+        # Order of the checks here is important.
+        [ -z "$use_html" ] || libs="$libs html"
+        [ -z "$use_core" ] || libs="$libs core"
+        [ -z "$use_xml" ] || libs="$libs xml"
+        [ -z "$use_base" ] || libs="$libs base"
+    else
+        # No need to order them.
+        libs="$@"
+    fi
+
+    echo $libs
+}
+
+# lib_flags_for _liblist
+# This function returns a list of flags suitable to return with the
+# output of --libs for all of the libraries in _liblist.  You can
+# add support for a new library by adding an entry for it in the
+# psuedo-hashes above if it requires additional linker options.
+lib_flags_for()
+{
+    [ -z "$WXDEBUG" ] || decho "  fetching lib flags for: '$*'"
+
+    _all_ldflags=''
+    _all_libs=''
+    _wxlibs=''
+
+    is_cross && _target="-${target}"
+
+    for lib do
+
+        # We evidently can't trust people not to duplicate things in
+        # configure, or to keep them in any sort of sane order overall,
+        # so only add unique new fields here even if it takes us a while.
+        # In the case of libs, we bubble any duplicates to the end,
+        # because if multiple libs require it, static linking at least
+        # will require it to come after all of them.  So long as local
+        # order is ok in configure then we should always be able to
+        # massage a correct result here like this.
+        #
+        # FIXME: ldlibs_core is totally bogus.  Fix the duplication
+        # there independently of this.  This covers for it, but we
+        # want to do this anyway because some libs may share common
+        # deps without a common ancestor in wx.  This is not a licence
+        # for sloppy work elsewhere though and @GUI_TK_LIBRARY should
+        # be fixed.
+
+        for f in `eval echo \"\\\$ldflags_$lib\"`; do
+            match_field "$f" $_all_ldflags || _all_ldflags="$_all_ldflags $f"
+        done
+
+        if match_field "$lib" net base ; then
+            _libname="wx_baseu"
+        else
+            _libname="wx_gtk3u"
+        fi
+        [ $lib = base ] || _libname="${_libname}_$lib"
+        _libname="${_libname}-3.1$_target"
+
+        if is_static; then
+            _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a"
+            for f in `eval echo \"\\\$ldlibs_$lib\"`; do
+
+                # Only propagate duplicate -libraries to their latest
+                # possible position.  Do not eliminate any other
+                # duplicates that might occur.  They should be fixed
+                # in configure long before they get here.
+                # This started as a workaround for Mac -framework,
+                # but it seems like a better policy in general, which
+                # will let the more heinous bugs in configure shake out.
+                # We should maybe filter *.a here too, but not unless
+                # we have to.
+                case "$f" in
+                  -l*)  _all_libs="`remove_field $f $_all_libs` $f"     ;;
+                    *)  _all_libs="$_all_libs $f"                       ;;
+                esac
+
+            done
+        else
+            _wxlibs="$_wxlibs -l${_libname}"
+        fi
+
+    done
+
+    if [ -n "$WXDEBUG" ]; then
+        decho "  retrieved: ldflags = $_all_ldflags"
+        decho "             wxlibs  = $_wxlibs"
+        decho "             alllibs = $_all_libs"
+    fi
+
+    echo $_all_ldflags $_wxlibs $_all_libs
+}
+
+# this is the strict subset of the above function which returns only the
+# (static) libraries themselves: this is used for linkdeps output which should
+# output the list of libraries the main program should depend on
+#
+# of course, this duplication is bad but I'll leave to somebody else the care
+# of refactoring this as I don't see any way to do it - VZ.
+
+# This (and the other cruft to support it) should be removed with
+# reference to the FIXME above when configure stops piping us a slurry
+# of options that need to be decomposed again for most practical uses - RL.
+link_deps_for()
+{
+    _wxlibs=''
+
+    is_cross && _target="-${target}"
+
+    for lib do
+        if match_field "$lib" net base ; then
+            _libname="wx_baseu"
+        else
+            _libname="wx_gtk3u"
+        fi
+        [ $lib = base ] || _libname="${_libname}_$lib"
+        _libname="${_libname}-3.1$_target"
+
+        _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a"
+    done
+
+    echo $_wxlibs
+}
+
+# Sanity check the list of libs the user provided us, if any.
+# --------------------------------------------------------------
+
+wx_libs=`echo "$libs_parameters" | tr ',' ' '`
+wx_optional_libs=`echo "$optional_libs_parameters" | tr ',' ' '`
+
+# Add the --optional-libs, if they've been compiled and aren't already added
+for i in $wx_optional_libs; do
+    if match_field $i webview stc richtext ribbon propgrid aui gl html qa adv core net base; then
+        if not match_field $i $wx_libs; then
+            wx_libs="${wx_libs:+$wx_libs }$i"
+        fi
+    fi
+done
+
+[ -z "$WXDEBUG" ] || decho "  user supplied libs: '$wx_libs'"
+
+# Assume we are using the GUI, unless --libs was specified with no GUI libs
+using_gui=yes
+
+if is_monolithic; then
+
+    # Only add additional info if --libs was specified and not just --optional-libs
+    if [ -n "$output_option_libs" ]; then
+        # The only library we need to add when using monolithic build is the gl
+        # one as all the others are already included into the main one.
+        if match_field gl $wx_libs; then
+            wx_libs=gl
+        else
+            wx_libs=
+        fi
+
+        wx_libs=" `lib_flags_for $wx_libs`"
+
+        # We still need the core lib deps for a static build though
+        if is_static; then
+            link_deps="${libdir}/libwx_gtk3u-3.1.a"
+            wx_libs="$wx_libs $link_deps $ldlibs_core $ldlibs_base"
+        else
+            wx_libs="$wx_libs -lwx_gtk3u-3.1"
+        fi
+    fi
+else    # MONOLITHIC = 0
+
+    # Import core libs by default, expand std if specified, or add base if omitted.
+    if [ -n "$output_option_libs" ] && [ -z "$libs_parameters" ]; then
+        wx_libs="html qa adv core net base"
+    elif match_field all $wx_libs; then
+        wx_libs="webview stc richtext ribbon propgrid aui gl html qa adv core net base"
+    elif match_field std $wx_libs; then
+        # Bubble any libs that were already specified to the end
+        # of the list and ensure static linking order is retained.
+        wx_libs=`remove_field std $wx_libs`
+        for i in html qa adv core net base; do
+            wx_libs="`remove_field $i $wx_libs` $i"
+        done
+    elif not match_field base $wx_libs ; then
+        # Only add base if --libs was specified and not just --optional-libs
+        if [ -n "$output_option_libs" ]; then
+            wx_libs="$wx_libs base"
+        fi
+    fi
+
+    # Existing scripts may use "wx-config --libs std,adv" or similar, but "adv"
+    # library is not used any longer.
+    wx_libs=`remove_field adv $wx_libs`
+
+    if [ -n "$output_option_libs" ]; then
+        using_gui=no
+        for i in $wx_libs ; do
+            if match_field "$i" html qa adv core; then
+                _guildflags=""
+                using_gui=yes
+                break
+            fi
+            match_field "$i" net base || using_gui=yes
+        done
+    fi
+
+    if is_static; then
+        link_deps=`link_deps_for $wx_libs`
+    fi
+    wx_libs=`order_libs $wx_libs`
+    wx_libs="$_guildflags `lib_flags_for $wx_libs`"
+fi
+
+
+# If they explicitly set "--cxx(pp)flags base" then they don't want the GUI
+if [ "$cxx_parameters" = "base" ]; then
+    using_gui=no
+fi
+
+
+if [ -n "$WXDEBUG" ]; then
+    decho
+    decho "  using libs: '$wx_libs'"
+    decho "  using_gui = $using_gui"
+    decho
+fi
+
+
+# Endgame.  Nothing left to discover now.
+# --------------------------------------------------------------
+
+[ "$using_gui" = "yes" ] || _gui_cppflags="-DwxUSE_GUI=0"
+
+if is_installed; then
+    _include_cppflags="-I${includedir}/wx-3.1"
+else
+    _include_cppflags="-I${includedir}"
+fi
+
+_cppflags=`echo "-I${libdir}/wx/include/gtk3-unicode-static-3.1" $_include_cppflags " -D_FILE_OFFSET_BITS=64  -D__WXGTK__" $_gui_cppflags`
+
+# now without further ado, we can answer these too.
+[ -z "$output_option_cppflags" ] || echo $_cppflags
+[ -z "$output_option_cflags"   ] || echo $_cppflags "-pthread"
+[ -z "$output_option_cxxflags" ] || echo $_cppflags "-pthread"
+[ -z "$output_option_gl_libs"  ] || echo `lib_flags_for gl`
+[ -z "$output_option_linkdeps" ] || echo $link_deps
+
+if [ -n "$output_option_libs" ]; then
+    # if --libs [--optional-libs] then output the full linker information
+
+    is_cross                                    &&
+        [ "x$libdir" = "x/usr/${target}/lib" ]  ||
+        [ "x$libdir" = "x/usr/lib" ]            ||
+        _ldflags="-L$libdir"
+
+    if [ -n "$MAC_FRAMEWORK" ]; then
+	wx_libs="-framework $MAC_FRAMEWORK"
+	if [ -n "$MAC_FRAMEWORK_PREFIX" ]; then
+	    _ldflags="-F$MAC_FRAMEWORK_PREFIX"
+	else
+	    _ldflags=""
+	fi
+    fi
+
+    is_installed || [ -n "$flag_option_no_rpath" ] || _rpath=""
+
+    echo $_ldflags "-pthread  " $_rpath $wx_libs ""
+
+elif [ -n "$output_option_optional_libs" ]; then
+    # if only --optional-libs then output just the libs
+
+    echo $wx_libs
+fi
+
+
+# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+#
+# Beyond here reside only machine or tool specific workarounds
+# that require knowlege not obtainable prior to this comment.
+#
+# Please.  Avoid addding things here, wx-config should avoid
+# hard coding tool specific details.  Do not use things here
+# as an example of other things that should be here,  These
+# shouldn't be here either.  This is a place of last resort
+# for interim workarounds.  I can but stress as strongly as
+# the censor will allow, there are only bad examples of things
+# that belong at this level of abstraction to follow.  It is
+# a limbo for glitches awaiting the Next Design Repair.  Ok.
+#
+# With that firmly in mind, our debut dilemma is:
+
+# Resource compilers.  An elusive term that covers some pretty
+# dissimilar concepts on various platforms.  The good news is,
+# each platform has only one definition of 'resource', compiled
+# or not, and so we can abstract that neatly to return a platform
+# specific invocation of the appropriate tool.  The bad news is,
+# windres (at least) requires knowledge of the wx header files
+# location(s) that cannot be predicted reliably before the call to
+# wx-config is made.  Currently for all known resource compilers,
+# we can simply return a command and some salient configuration
+# options in response to a request for --rescomp.  So here we
+# top up the options for any tools that may require information
+# that was only just determined in the last few machine cycles,
+# then output the necessary incantation for the platform.
+#
+# Most things should already be constant by the time configure
+# has run.  Do not add anything here that is already known there.
+
+if [ -n "$output_option_rescomp" ]; then
+
+    case "" in
+      *windres|wrc)
+        # Note that with late model windres, we could just insert
+        # _include_cppflags here, but use the old notation for now
+        # as it is more universally accepted.
+        if is_installed; then
+            echo " --include-dir" \
+                           "${includedir}/wx-3.1" \
+                           ""
+        else
+            echo " --include-dir ${includedir}" \
+                           ""
+        fi
+        ;;
+
+      # rez doesn't have any specific needs so just output what was
+      # determined by configure.
+      *)
+        echo  
+        ;;
+    esac
+
+fi
+
+#
+# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+# And so that's it, we're done.  Have a nice build.
+
+exit 0
diff --git a/lib/wx/config/inplace-gtk3-unicode-static-3.1 b/lib/wx/config/inplace-gtk3-unicode-static-3.1
new file mode 100644
index 0000000000..25e9a6bb7b
--- /dev/null
+++ b/lib/wx/config/inplace-gtk3-unicode-static-3.1
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# Name:        wx-config-inplace
+# Purpose:     wx configuration in tree search and query tool
+# Author:      Ron <ron@debian.org>
+# Modified by: VZ on 2005-09-20 to make it work with Bourne shell
+# Created:     14/9/2004
+# Copyright:   (c) 2004 Ron <ron@debian.org>
+# Licence:     wxWindows licence
+############################################################################
+
+# Not much to do here.  Just initialise prefix to point things into the
+# local tree by default and then source the real wx-config if it all still
+# looks sane.
+
+check_dirname()
+{
+    if [ ! -d "$1" ]; then
+        printf "\n  *** Error: Directory '$1'\n"    1>&2
+        printf "             no longer exists.\n\n" 1>&2
+        exit 1
+    fi
+    ( cd $1 && pwd )
+}
+
+# set the variables which allow the real wx-config to check if we're using it
+# in place or after installation
+this_prefix=`check_dirname "/run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets"`
+if [ "x$this_prefix" = "x" ]; then
+    exit 1
+fi
+this_exec_prefix=`check_dirname "/run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets"`
+if [ "x$this_exec_prefix" = "x" ]; then
+    exit 1
+fi
+
+. "$this_exec_prefix/lib/wx/config/gtk3-unicode-static-3.1"
+
diff --git a/lib/wx/include/gtk3-unicode-static-3.1/wx/setup.h b/lib/wx/include/gtk3-unicode-static-3.1/wx/setup.h
new file mode 100644
index 0000000000..1a3c73467d
--- /dev/null
+++ b/lib/wx/include/gtk3-unicode-static-3.1/wx/setup.h
@@ -0,0 +1,1315 @@
+/* lib/wx/include/gtk3-unicode-static-3.1/wx/setup.h.  Generated from setup.h.in by configure.  */
+/* This define (__WX_SETUP_H__) is used both to ensure setup.h is included
+ * only once and to indicate that we are building using configure. */
+#ifndef __WX_SETUP_H__
+#define __WX_SETUP_H__
+
+/* never undefine inline or const keywords for C++ compilation */
+#ifndef __cplusplus
+
+/* Define to empty if the keyword does not work.  */
+/* #undef const */
+
+/* Define as __inline if that's what the C compiler calls it.  */
+/* #undef inline */
+
+#endif /* __cplusplus */
+
+/* the installation location prefix from configure */
+#define wxINSTALL_PREFIX "/usr/local"
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+/* #undef gid_t */
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+/* #undef mode_t */
+
+/* Define to `long' if <sys/types.h> doesn't define.  */
+/* #undef off_t */
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+/* #undef pid_t */
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+/* #undef size_t */
+
+/* Define if ssize_t type is available.  */
+#define HAVE_SSIZE_T 1
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS 1
+
+/* Define this to get extra features from GNU libc. */
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+/* #undef uid_t */
+
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+/* #undef WORDS_BIGENDIAN */
+
+/* Define this if your version of GTK+ is greater than 1.2.7 */
+/* #undef __WXGTK127__ */
+
+/* Define this if your version of GTK+ is greater than 2.0 */
+#define __WXGTK20__ 1
+
+/* Define this if your version of GTK+ is greater than 2.10 */
+#define __WXGTK210__ 1
+
+/* Define this if your version of GTK+ is greater than 2.18 */
+#define __WXGTK218__ 1
+
+/* Define this if your version of GTK+ is greater than 2.20 */
+#define __WXGTK220__ 1
+
+/* Define this if your version of GTK+ is >= 3.0 */
+#define __WXGTK3__ 1
+
+/* Define this if your version of GTK+ is >= 3.90.0 */
+/* #undef __WXGTK4__ */
+
+/* Define this if you want to use GPE features */
+/* #undef __WXGPE__ */
+
+/* Define this if your version of Motif is greater than 2.0 */
+/* #undef __WXMOTIF20__ */
+
+/* Define this if you are using Lesstif */
+/* #undef __WXLESSTIF__ */
+
+/*
+ * Define to 1 for Unix[-like] system
+ */
+#define wxUSE_UNIX 1
+
+#define __UNIX__ 1
+
+/* #undef __AIX__ */
+/* #undef __BSD__ */
+/* #undef __DARWIN__ */
+/* #undef __EMX__ */
+/* #undef __FREEBSD__ */
+/* #undef __HPUX__ */
+#define __LINUX__ 1
+/* #undef __NETBSD__ */
+/* #undef __OPENBSD__ */
+/* #undef __OSF__ */
+/* #undef __QNX__ */
+/* #undef __SGI__ */
+/* #undef __SOLARIS__ */
+/* #undef __SUN__ */
+/* #undef __SUNOS__ */
+/* #undef __SVR4__ */
+/* #undef __SYSV__ */
+/* #undef __ULTRIX__ */
+/* #undef __UNIXWARE__ */
+/* #undef __VMS__ */
+
+/* #undef __IA64__ */
+/* #undef __ALPHA__ */
+
+/* NanoX (with wxX11) */
+#define wxUSE_NANOX 0
+
+/* PowerPC Darwin & Mac OS X */
+/* #undef __POWERPC__ */
+
+/* Hack to make IOGraphicsTypes.h not define Point conflicting with MacTypes */
+/* #undef __Point__ */
+
+/* MS-DOS with DJGPP */
+/* #undef __DOS__ */
+
+/* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
+#ifndef __WINDOWS__
+/* #undef __WINDOWS__ */
+#endif
+
+#ifndef __WIN32__
+/* #undef __WIN32__ */
+#endif
+#ifndef __GNUWIN32__
+/* #undef __GNUWIN32__ */
+#endif
+#ifndef STRICT
+/* #undef STRICT */
+#endif
+#ifndef WINVER
+/* #undef WINVER */
+#endif
+
+/* --- start common options --- */
+
+#ifndef wxUSE_GUI
+    #define wxUSE_GUI 1
+#endif
+
+
+#define WXWIN_COMPATIBILITY_2_8 0
+
+#define WXWIN_COMPATIBILITY_3_0 1
+
+#define wxDIALOG_UNIT_COMPATIBILITY   0
+
+#define wxUSE_UNSAFE_WXSTRING_CONV 1
+
+#define wxUSE_REPRODUCIBLE_BUILD 0
+
+
+
+#define wxUSE_ON_FATAL_EXCEPTION 1
+
+#define wxUSE_STACKWALKER 1
+
+#define wxUSE_DEBUGREPORT 1
+
+
+
+#define wxUSE_DEBUG_CONTEXT 0
+
+#define wxUSE_MEMORY_TRACING 0
+
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+
+#define wxUSE_DEBUG_NEW_ALWAYS 0
+
+
+
+#ifndef wxUSE_UNICODE
+    #define wxUSE_UNICODE 1
+#endif
+
+
+#define wxUSE_EXCEPTIONS 1
+
+#define wxUSE_EXTENDED_RTTI 0
+
+#define wxUSE_LOG 1
+
+#define wxUSE_LOGWINDOW 1
+
+#define wxUSE_LOGGUI 1
+
+#define wxUSE_LOG_DIALOG 1
+
+#define wxUSE_CMDLINE_PARSER 1
+
+#define wxUSE_THREADS 1
+
+#define wxUSE_STREAMS 1
+
+#define wxUSE_PRINTF_POS_PARAMS 1
+
+#define wxUSE_COMPILER_TLS 1
+
+
+#define wxUSE_STL 1
+
+#define wxUSE_STD_DEFAULT  0
+
+#define wxUSE_STD_CONTAINERS_COMPATIBLY 1
+
+#define wxUSE_STD_CONTAINERS 1
+
+#define wxUSE_STD_IOSTREAM 1
+
+#define wxUSE_STD_STRING 1
+
+#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
+
+
+#define wxUSE_LONGLONG 1
+
+#define wxUSE_BASE64 1
+
+#define wxUSE_CONSOLE_EVENTLOOP 1
+
+#define wxUSE_FILE 1
+#define wxUSE_FFILE 1
+
+#define wxUSE_FSVOLUME 1
+
+#define wxUSE_SECRETSTORE 1
+
+#define wxUSE_STDPATHS 1
+
+#define wxUSE_TEXTBUFFER 1
+
+#define wxUSE_TEXTFILE 1
+
+#define wxUSE_INTL 1
+
+#define wxUSE_XLOCALE 1
+
+#define wxUSE_DATETIME 1
+
+#define wxUSE_TIMER 1
+
+#define wxUSE_STOPWATCH 1
+
+#define wxUSE_FSWATCHER 1
+
+#define wxUSE_CONFIG 1
+
+#define wxUSE_CONFIG_NATIVE 1
+
+#define wxUSE_DIALUP_MANAGER 1
+
+#define wxUSE_DYNLIB_CLASS 1
+
+#define wxUSE_DYNAMIC_LOADER 1
+
+#define wxUSE_SOCKETS 1
+
+#define wxUSE_IPV6          0
+
+#define wxUSE_FILESYSTEM 1
+
+#define wxUSE_FS_ZIP 1
+
+#define wxUSE_FS_ARCHIVE 1
+
+#define wxUSE_FS_INET 1
+
+#define wxUSE_ARCHIVE_STREAMS 1
+
+#define wxUSE_ZIPSTREAM 1
+
+#define wxUSE_TARSTREAM 1
+
+#define wxUSE_ZLIB 1
+
+#define wxUSE_LIBLZMA       0
+
+#define wxUSE_APPLE_IEEE 1
+
+#define wxUSE_JOYSTICK 1
+
+#define wxUSE_FONTENUM 1
+
+#define wxUSE_FONTMAP 1
+
+#define wxUSE_MIMETYPE 1
+
+#define wxUSE_PROTOCOL 1
+
+#define wxUSE_PROTOCOL_FILE 1
+#define wxUSE_PROTOCOL_FTP 1
+#define wxUSE_PROTOCOL_HTTP 1
+
+#define wxUSE_URL 1
+
+#define wxUSE_URL_NATIVE 0
+
+#define wxUSE_VARIANT 1
+
+#define wxUSE_ANY 1
+
+#define wxUSE_REGEX 1
+
+#define wxUSE_SYSTEM_OPTIONS 1
+
+#define wxUSE_SOUND 1
+
+#define wxUSE_MEDIACTRL 1
+
+#define wxUSE_XRC       0
+
+#define wxUSE_XML       wxUSE_XRC
+
+#define wxUSE_AUI 1
+
+#define wxUSE_RIBBON 1
+
+#define wxUSE_PROPGRID 1
+
+#define wxUSE_STC 1
+
+#define wxUSE_WEBVIEW 1
+
+#ifdef __WXMSW__
+#define wxUSE_WEBVIEW_IE 0
+#else
+#define wxUSE_WEBVIEW_IE 0
+#endif
+
+#define wxUSE_WEBVIEW_EDGE 0
+
+#if (defined(__WXGTK__) && !defined(__WXGTK3__)) || defined(__WXOSX__)
+#define wxUSE_WEBVIEW_WEBKIT 0
+#else
+#define wxUSE_WEBVIEW_WEBKIT 0
+#endif
+
+#if defined(__WXGTK3__)
+#define wxUSE_WEBVIEW_WEBKIT2 1
+#else
+#define wxUSE_WEBVIEW_WEBKIT2 1
+#endif
+
+
+#if defined(_MSC_VER) || \
+    (defined(__MINGW32__) && (__GNUC__ > 4 || __GNUC_MINOR__ >= 8))
+#define wxUSE_GRAPHICS_CONTEXT 1
+#else
+#define wxUSE_GRAPHICS_CONTEXT 1
+#endif
+
+#define wxUSE_CAIRO 1
+
+
+
+#define wxUSE_CONTROLS 1
+
+#define wxUSE_MARKUP 1
+
+#define wxUSE_POPUPWIN 1
+
+#define wxUSE_TIPWINDOW 1
+
+#define wxUSE_ACTIVITYINDICATOR 1
+#define wxUSE_ANIMATIONCTRL 1
+#define wxUSE_BANNERWINDOW 1
+#define wxUSE_BUTTON 1
+#define wxUSE_BMPBUTTON 1
+#define wxUSE_CALENDARCTRL 1
+#define wxUSE_CHECKBOX 1
+#define wxUSE_CHECKLISTBOX 1
+#define wxUSE_CHOICE 1
+#define wxUSE_COLLPANE 1
+#define wxUSE_COLOURPICKERCTRL 1
+#define wxUSE_COMBOBOX 1
+#define wxUSE_COMMANDLINKBUTTON 1
+#define wxUSE_DATAVIEWCTRL 1
+#define wxUSE_DATEPICKCTRL 1
+#define wxUSE_DIRPICKERCTRL 1
+#define wxUSE_EDITABLELISTBOX 1
+#define wxUSE_FILECTRL 1
+#define wxUSE_FILEPICKERCTRL 1
+#define wxUSE_FONTPICKERCTRL 1
+#define wxUSE_GAUGE 1
+#define wxUSE_HEADERCTRL 1
+#define wxUSE_HYPERLINKCTRL 1
+#define wxUSE_LISTBOX 1
+#define wxUSE_LISTCTRL 1
+#define wxUSE_RADIOBOX 1
+#define wxUSE_RADIOBTN 1
+#define wxUSE_RICHMSGDLG 1
+#define wxUSE_SCROLLBAR 1
+#define wxUSE_SEARCHCTRL 1
+#define wxUSE_SLIDER 1
+#define wxUSE_SPINBTN 1
+#define wxUSE_SPINCTRL 1
+#define wxUSE_STATBOX 1
+#define wxUSE_STATLINE 1
+#define wxUSE_STATTEXT 1
+#define wxUSE_STATBMP 1
+#define wxUSE_TEXTCTRL 1
+#define wxUSE_TIMEPICKCTRL 1
+#define wxUSE_TOGGLEBTN 1
+#define wxUSE_TREECTRL 1
+#define wxUSE_TREELISTCTRL 1
+
+#define wxUSE_NATIVE_DATAVIEWCTRL 1
+
+#define wxUSE_STATUSBAR 1
+
+#define wxUSE_NATIVE_STATUSBAR 1
+
+#define wxUSE_TOOLBAR 1
+#define wxUSE_TOOLBAR_NATIVE 1
+
+#define wxUSE_NOTEBOOK 1
+
+#define wxUSE_LISTBOOK 1
+
+#define wxUSE_CHOICEBOOK 1
+
+#define wxUSE_TREEBOOK 1
+
+#define wxUSE_TOOLBOOK 1
+
+#define wxUSE_TASKBARICON 1
+
+#define wxUSE_GRID 1
+
+#define wxUSE_MINIFRAME 1
+
+#define wxUSE_COMBOCTRL 1
+
+#define wxUSE_ODCOMBOBOX 1
+
+#define wxUSE_BITMAPCOMBOBOX 1
+
+#define wxUSE_REARRANGECTRL 1
+
+#define wxUSE_ADDREMOVECTRL 1
+
+
+#define wxUSE_ACCEL 1
+
+#define wxUSE_ARTPROVIDER_STD 1
+
+#define wxUSE_ARTPROVIDER_TANGO 0
+
+#define wxUSE_HOTKEY 0
+
+#define wxUSE_CARET 1
+
+#define wxUSE_DISPLAY 1
+
+#define wxUSE_GEOMETRY 1
+
+#define wxUSE_IMAGLIST 1
+
+#define wxUSE_INFOBAR 1
+
+#define wxUSE_MENUS 1
+
+#define wxUSE_MENUBAR 1
+
+#define wxUSE_NOTIFICATION_MESSAGE 1
+
+#define wxUSE_PREFERENCES_EDITOR 1
+
+#define wxUSE_PRIVATE_FONTS 1
+
+#define wxUSE_RICHTOOLTIP 1
+
+#define wxUSE_SASH 1
+
+#define wxUSE_SPLITTER 1
+
+#define wxUSE_TOOLTIPS 1
+
+#define wxUSE_VALIDATORS 1
+
+#ifdef __WXMSW__
+#define wxUSE_AUTOID_MANAGEMENT 0
+#else
+#define wxUSE_AUTOID_MANAGEMENT 0
+#endif
+
+
+#define wxUSE_COMMON_DIALOGS 0
+
+#define wxUSE_BUSYINFO 1
+
+#define wxUSE_CHOICEDLG 1
+
+#define wxUSE_COLOURDLG 1
+
+#define wxUSE_DIRDLG 1
+
+
+#define wxUSE_FILEDLG 1
+
+#define wxUSE_FINDREPLDLG 1
+
+#define wxUSE_FONTDLG 1
+
+#define wxUSE_MSGDLG 1
+
+#define wxUSE_PROGRESSDLG 1
+
+#define wxUSE_NATIVE_PROGRESSDLG 1
+
+#define wxUSE_STARTUP_TIPS 1
+
+#define wxUSE_TEXTDLG 1
+
+#define wxUSE_NUMBERDLG 1
+
+#define wxUSE_SPLASH 1
+
+#define wxUSE_WIZARDDLG 1
+
+#define wxUSE_ABOUTDLG 1
+
+#define wxUSE_FILE_HISTORY 1
+
+
+#define wxUSE_METAFILE              0
+#define wxUSE_ENH_METAFILE          0
+#define wxUSE_WIN_METAFILES_ALWAYS  0
+
+
+#define wxUSE_MDI 1
+
+#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+
+#define wxUSE_MDI_ARCHITECTURE 1
+
+#define wxUSE_PRINTING_ARCHITECTURE 1
+
+#define wxUSE_HTML 1
+
+#define wxUSE_GLCANVAS 1
+
+#define wxUSE_GLCANVAS_EGL 1
+
+#define wxUSE_RICHTEXT 1
+
+
+#define wxUSE_CLIPBOARD 1
+
+#define wxUSE_DATAOBJ 1
+
+#define wxUSE_DRAG_AND_DROP 1
+
+#ifdef __WXMSW__
+#define wxUSE_ACCESSIBILITY 0
+#else
+#define wxUSE_ACCESSIBILITY 0
+#endif
+
+
+#define wxUSE_SNGLINST_CHECKER 1
+
+#define wxUSE_DRAGIMAGE 1
+
+#define wxUSE_IPC         0
+
+#define wxUSE_HELP 1
+
+
+#define wxUSE_MS_HTML_HELP 0
+
+
+#define wxUSE_WXHTML_HELP 1
+
+#define wxUSE_CONSTRAINTS 1
+
+
+#define wxUSE_SPLINES 1
+
+
+#define wxUSE_MOUSEWHEEL 1
+
+
+#define wxUSE_UIACTIONSIMULATOR 0
+
+
+#define wxUSE_POSTSCRIPT 1
+
+#define wxUSE_AFM_FOR_POSTSCRIPT 1
+
+#define wxUSE_SVG 1
+
+#define wxUSE_DC_TRANSFORM_MATRIX 1
+
+
+
+#define wxUSE_IMAGE 1
+
+#define wxUSE_LIBPNG 1
+
+#define wxUSE_LIBJPEG       0
+
+#define wxUSE_LIBTIFF       0
+
+#define wxUSE_TGA 1
+
+#define wxUSE_GIF 1
+
+#define wxUSE_PNM 1
+
+#define wxUSE_PCX 1
+
+#define wxUSE_IFF 1
+
+#define wxUSE_XPM 1
+
+#define wxUSE_ICO_CUR 1
+
+#define wxUSE_PALETTE 1
+
+
+#define wxUSE_ALL_THEMES    0
+
+#define wxUSE_THEME_GTK     0
+#define wxUSE_THEME_METAL   0
+#define wxUSE_THEME_MONO    0
+#define wxUSE_THEME_WIN32   0
+
+/* --- end common options --- */
+
+/*
+ * Unix-specific options
+ */
+#define wxUSE_SELECT_DISPATCHER 1
+#define wxUSE_EPOLL_DISPATCHER 1
+
+#define wxUSE_UNICODE_UTF8 1
+#define wxUSE_UTF8_LOCALE_ONLY 0
+
+/*
+   Use GStreamer for Unix.
+
+   Default is 0 as this requires a lot of dependencies which might not be
+   available.
+
+   Recommended setting: 1 (wxMediaCtrl won't work by default without it).
+ */
+#define wxUSE_GSTREAMER 1
+
+#define wxUSE_GSTREAMER_PLAYER 1
+
+/*
+   Use XTest extension to implement wxUIActionSimulator?
+
+   Default is 1, it is set to 0 if the necessary headers/libraries are not
+   found by configure.
+
+   Recommended setting: 1, wxUIActionSimulator won't work in wxGTK3 without it.
+ */
+#define wxUSE_XTEST 0
+
+/* --- start MSW options --- */
+
+
+#define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT
+
+#if defined(_MSC_VER) && _MSC_VER >= 1600
+    #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
+#else
+    #define wxUSE_GRAPHICS_DIRECT2D 0
+#endif
+
+
+#define wxUSE_OLE           0
+
+#define wxUSE_OLE_AUTOMATION 0
+
+#define wxUSE_ACTIVEX 0
+
+#if defined(_MSC_VER) && _MSC_VER >= 1700 && !defined(_USING_V110_SDK71_)
+    #define wxUSE_WINRT 0
+#else
+    #define wxUSE_WINRT 0
+#endif
+
+#define wxUSE_DC_CACHEING 0
+
+#define wxUSE_WXDIB 0
+
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
+
+#define wxUSE_REGKEY 0
+
+#define wxUSE_RICHEDIT 1
+
+#define wxUSE_RICHEDIT2 1
+
+#define wxUSE_OWNER_DRAWN 0
+
+#define wxUSE_TASKBARICON_BALLOONS 1
+
+#define wxUSE_TASKBARBUTTON 0
+
+#define wxUSE_UXTHEME           0
+
+#define wxUSE_INKEDIT  0
+
+#define wxUSE_INICONF 0
+
+#define wxUSE_WINSOCK2 0
+
+
+#define wxUSE_DATEPICKCTRL_GENERIC 0
+
+#define wxUSE_TIMEPICKCTRL_GENERIC 0
+
+
+#if defined(__VISUALC__) || defined(__MINGW64_TOOLCHAIN__)
+    #define wxUSE_DBGHELP 0
+#else
+    #define wxUSE_DBGHELP 0
+#endif
+
+#define wxUSE_CRASHREPORT 0
+/* --- end MSW options --- */
+
+/*
+ * Define if your compiler has C99 va_copy
+ */
+#define HAVE_VA_COPY 1
+
+/*
+ * Define if va_list type is an array
+ */
+/* #undef VA_LIST_IS_ARRAY */
+
+/*
+ * Define if the compiler supports variadic macros
+ */
+#define HAVE_VARIADIC_MACROS 1
+
+/*
+ * Define if you don't want variadic macros to be used even if they are
+ * supported by the compiler.
+ */
+/* #undef wxNO_VARIADIC_MACROS */
+
+/*
+ * Define if your compiler has std::wstring
+ */
+#define HAVE_STD_WSTRING 1
+/*
+ * Define if your compiler has compliant std::string::compare
+ */
+#define HAVE_STD_STRING_COMPARE 1
+/*
+ * Define if your compiler has <hash_map>
+ */
+/* #undef HAVE_HASH_MAP */
+/*
+ * Define if your compiler has <ext/hash_map>
+ */
+/* #undef HAVE_EXT_HASH_MAP */
+/*
+ * Define if your compiler has std::hash_map/hash_set
+ */
+/* #undef HAVE_STD_HASH_MAP */
+/*
+ * Define if your compiler has __gnu_cxx::hash_map/hash_set
+ */
+/* #undef HAVE_GNU_CXX_HASH_MAP */
+
+/*
+ * Define if your compiler has std::unordered_map
+ */
+#define HAVE_STD_UNORDERED_MAP 1
+
+/*
+ * Define if your compiler has std::unordered_set
+ */
+#define HAVE_STD_UNORDERED_SET 1
+
+/*
+ * Define if your compiler has std::tr1::unordered_map
+ */
+/* #undef HAVE_TR1_UNORDERED_MAP */
+
+/*
+ * Define if your compiler has std::tr1::unordered_set
+ */
+/* #undef HAVE_TR1_UNORDERED_SET */
+
+/*
+ * Define if your compiler has <tr1/type_traits>
+ */
+/* #undef HAVE_TR1_TYPE_TRAITS */
+
+/*
+ * Define if your compiler has <type_traits>
+ */
+#define HAVE_TYPE_TRAITS 1
+
+/*
+ * Define if the compiler supports simple visibility declarations.
+ */
+/* #undef HAVE_VISIBILITY */
+
+/*
+ * Define if the compiler supports GCC's atomic memory access builtins
+ */
+#define HAVE_GCC_ATOMIC_BUILTINS 1
+
+/*
+ * Define if compiler's visibility support in libstdc++ is broken
+ */
+/* #undef HAVE_BROKEN_LIBSTDCXX_VISIBILITY */
+
+/*
+ * The built-in regex supports advanced REs in additional to POSIX's basic
+ * and extended. Your system regex probably won't support this, and in this
+ * case WX_NO_REGEX_ADVANCED should be defined.
+ */
+/* #undef WX_NO_REGEX_ADVANCED */
+/*
+ * On GNU systems use re_search instead of regexec, since the latter does a
+ * strlen on the search text affecting the performance of some operations.
+ */
+/* #undef HAVE_RE_SEARCH */
+/*
+ * Use SDL for audio (Unix)
+ */
+#define wxUSE_LIBSDL 0
+
+/*
+ * Compile sound backends as plugins
+ */
+#define wxUSE_PLUGINS 0
+
+/*
+ * Use GTK print for printing under GTK+ 2.10+
+ */
+#define wxUSE_GTKPRINT 0
+/*
+ * Use GNOME VFS for MIME types
+ */
+#define wxUSE_LIBGNOMEVFS 0
+/*
+ * Use libnotify library.
+ */
+#define wxUSE_LIBNOTIFY 0
+/*
+ * Use libnotify 0.7+ API.
+ */
+#define wxUSE_LIBNOTIFY_0_7 0
+/*
+ * Use libXpm
+ */
+#define wxHAVE_LIB_XPM 0
+/*
+ * Define if you have pthread_cleanup_push/pop()
+ */
+#define wxHAVE_PTHREAD_CLEANUP 1
+/*
+ * Define if compiler has __thread keyword.
+ */
+/* #undef HAVE___THREAD_KEYWORD */
+/*
+ * Define if large (64 bit file offsets) files are supported.
+ */
+#define HAVE_LARGEFILE_SUPPORT 1
+
+/*
+ * Use OpenGL
+ */
+#define wxUSE_OPENGL 1
+
+/*
+ * Use MS HTML Help via libmspack (Unix)
+ */
+#define wxUSE_LIBMSPACK 0
+
+/*
+ * Matthews garbage collection (used for MrEd?)
+ */
+#define WXGARBAGE_COLLECTION_ON 0
+
+/*
+ * wxWebKitCtrl
+ */
+#define wxUSE_WEBKIT 0
+
+/*
+ * The const keyword is being introduced more in wxWindows.
+ * You can use this setting to maintain backward compatibility.
+ * If 0: will use const wherever possible.
+ * If 1: will use const only where necessary
+ *       for precompiled headers to work.
+ * If 2: will be totally backward compatible, but precompiled
+ *       headers may not work and program size will be larger.
+ */
+#define CONST_COMPATIBILITY 0
+
+/*
+ * use the session manager to detect KDE/GNOME
+ */
+#define wxUSE_DETECT_SM 1
+
+
+/* define with the name of timezone variable */
+#define WX_TIMEZONE timezone
+
+/* The type of 3rd argument to getsockname() - usually size_t or int */
+#define WX_SOCKLEN_T socklen_t
+
+/* The type of 5th argument to getsockopt() - usually size_t or int */
+#define SOCKOPTLEN_T socklen_t
+
+/* The type of statvfs(2) argument */
+#define WX_STATFS_T struct statfs
+
+/* The signal handler prototype */
+#define wxTYPE_SA_HANDLER int
+
+/* gettimeofday() usually takes 2 arguments, but some really old systems might
+ * have only one, in which case define WX_GETTIMEOFDAY_NO_TZ */
+/* #undef WX_GETTIMEOFDAY_NO_TZ */
+
+/* struct tm doesn't always have the tm_gmtoff field, define this if it does */
+#define WX_GMTOFF_IN_TM 1
+
+/* check if nl_langinfo() can be called with argument _NL_TIME_FIRST_WEEKDAY */
+#define HAVE_NL_TIME_FIRST_WEEKDAY 1
+
+/* Define if you have poll(2) function */
+/* #undef HAVE_POLL */
+
+/* Define if you have pw_gecos field in struct passwd */
+#define HAVE_PW_GECOS 1
+
+/* Define if you have __cxa_demangle() in <cxxabi.h> */
+#define HAVE_CXA_DEMANGLE 1
+
+/* Define if you have dlopen() */
+#define HAVE_DLOPEN 1
+
+/* Define if you have gettimeofday() */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define if fsync() is available */
+#define HAVE_FSYNC 1
+
+/* Define if round() is available */
+#define HAVE_ROUND 1
+
+/* Define if you have ftime() */
+/* #undef HAVE_FTIME */
+
+/* Define if you have nanosleep() */
+#define HAVE_NANOSLEEP 1
+
+/* Define if you have sched_yield */
+#define HAVE_SCHED_YIELD 1
+
+/* Define if you have pthread_mutexattr_t and functions to work with it */
+#define HAVE_PTHREAD_MUTEXATTR_T 1
+
+/* Define if you have pthread_mutexattr_settype() declaration */
+#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1
+
+/* Define if you have PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP */
+/* #undef HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER */
+
+/* Define if you have pthread_cancel */
+#define HAVE_PTHREAD_CANCEL 1
+
+/* Define if you have pthread_mutex_timedlock */
+#define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1
+
+/* Define if you have pthread_attr_setstacksize */
+#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
+
+/* Define if you have snprintf() */
+#define HAVE_SNPRINTF 1
+
+/* Define if you have snprintf() declaration in the header */
+#define HAVE_SNPRINTF_DECL 1
+
+/* Define if you have a snprintf() which supports positional arguments
+   (defined in the unix98 standard) */
+#define HAVE_UNIX98_PRINTF 1
+
+/* define if you have statfs function */
+#define HAVE_STATFS 1
+
+/* define if you have statfs prototype */
+#define HAVE_STATFS_DECL 1
+
+/* define if you have statvfs function */
+/* #undef HAVE_STATVFS */
+
+/* Define if you have strtoull() and strtoll() */
+/* #undef HAVE_STRTOULL */
+
+/* Define if you have all functions to set thread priority */
+#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
+
+/* Define if you have vsnprintf() */
+#define HAVE_VSNPRINTF 1
+
+/* Define if you have vsnprintf() declaration in the header */
+#define HAVE_VSNPRINTF_DECL 1
+
+/* Define if you have a _broken_ vsnprintf() declaration in the header,
+ * with 'char*' for the 3rd parameter instead of 'const char*' */
+/* #undef HAVE_BROKEN_VSNPRINTF_DECL */
+
+/* Define if you have a _broken_ vsscanf() declaration in the header,
+ * with 'char*' for the 1st parameter instead of 'const char*' */
+/* #undef HAVE_BROKEN_VSSCANF_DECL */
+
+/* Define if you have vsscanf() */
+#define HAVE_VSSCANF 1
+
+/* Define if you have vsscanf() declaration in the header */
+#define HAVE_VSSCANF_DECL 1
+
+/* Define if you have usleep() */
+/* #undef HAVE_USLEEP */
+
+/* Define if you have wcscasecmp() function  */
+#define HAVE_WCSCASECMP 1
+
+/* Define if you have wcsncasecmp() function  */
+#define HAVE_WCSNCASECMP 1
+
+/* Define if you have wcslen function  */
+#define HAVE_WCSLEN 1
+
+/* Define if you have wcsdup function  */
+#define HAVE_WCSDUP 1
+
+/* Define if you have wcsftime() function  */
+#define HAVE_WCSFTIME 1
+
+/* Define if you have strnlen() function */
+#define HAVE_STRNLEN 1
+
+/* Define if you have wcsnlen() function */
+#define HAVE_WCSNLEN 1
+
+/* Define if you have wcstoull() and wcstoll() */
+/* #undef HAVE_WCSTOULL */
+
+/* The number of bytes in a wchar_t.  */
+#define SIZEOF_WCHAR_T 4
+
+/* The number of bytes in a int.  */
+#define SIZEOF_INT 4
+
+/* The number of bytes in a pointer.  */
+#define SIZEOF_VOID_P 8
+
+/* The number of bytes in a long.  */
+#define SIZEOF_LONG 8
+
+/* The number of bytes in a long long.  */
+#define SIZEOF_LONG_LONG 8
+
+/* The number of bytes in a short.  */
+#define SIZEOF_SHORT 2
+
+/* The number of bytes in a size_t.  */
+#define SIZEOF_SIZE_T 8
+
+/* Define if size_t on your machine is the same type as unsigned int. */
+/* #undef wxSIZE_T_IS_UINT */
+
+/* Define if size_t on your machine is the same type as unsigned long. */
+#define wxSIZE_T_IS_ULONG 1
+
+/* Define if wchar_t is distinct type in your compiler. */
+#define wxWCHAR_T_IS_REAL_TYPE 1
+
+/* Define if you have the dladdr function.  */
+#define HAVE_DLADDR 1
+
+/* Define if you have Posix fnctl() function. */
+#define HAVE_FCNTL 1
+
+/* Define if you have BSD flock() function. */
+/* #undef HAVE_FLOCK */
+
+/* Define if you have getaddrinfo function. */
+/* #undef HAVE_GETADDRINFO */
+
+/* Define if you have a gethostbyname_r function taking 6 arguments. */
+#define HAVE_FUNC_GETHOSTBYNAME_R_6 1
+
+/* Define if you have a gethostbyname_r function taking 5 arguments. */
+/* #undef HAVE_FUNC_GETHOSTBYNAME_R_5 */
+
+/* Define if you have a gethostbyname_r function taking 3 arguments. */
+/* #undef HAVE_FUNC_GETHOSTBYNAME_R_3 */
+
+/* Define if you only have a gethostbyname function */
+/* #undef HAVE_GETHOSTBYNAME */
+
+/* Define if you have the gethostname function.  */
+/* #undef HAVE_GETHOSTNAME */
+
+/* Define if you have a getservbyname_r function taking 6 arguments. */
+#define HAVE_FUNC_GETSERVBYNAME_R_6 1
+
+/* Define if you have a getservbyname_r function taking 5 arguments. */
+/* #undef HAVE_FUNC_GETSERVBYNAME_R_5 */
+
+/* Define if you have a getservbyname_r function taking 4 arguments. */
+/* #undef HAVE_FUNC_GETSERVBYNAME_R_4 */
+
+/* Define if you only have a getservbyname function */
+/* #undef HAVE_GETSERVBYNAME */
+
+/* Define if you have the gmtime_r function.  */
+#define HAVE_GMTIME_R 1
+
+/* Define if you have the inet_addr function.  */
+#define HAVE_INET_ADDR 1
+
+/* Define if you have the inet_aton function.  */
+#define HAVE_INET_ATON 1
+
+/* Define if you have the localtime_r function.  */
+#define HAVE_LOCALTIME_R 1
+
+/* Define if you have the mktemp function.  */
+/* #undef HAVE_MKTEMP */
+
+/* Define if you have the mkstemp function.  */
+#define HAVE_MKSTEMP 1
+
+/* Define if you have the putenv function.  */
+/* #undef HAVE_PUTENV */
+
+/* Define if you have the setenv function.  */
+#define HAVE_SETENV 1
+
+/* Define if you have strtok_r function. */
+#define HAVE_STRTOK_R 1
+
+/* Define if you have thr_setconcurrency function */
+/* #undef HAVE_THR_SETCONCURRENCY */
+
+/* Define if you have pthread_setconcurrency function */
+#define HAVE_PTHREAD_SET_CONCURRENCY 1
+
+/* Define if you have the uname function.  */
+#define HAVE_UNAME 1
+
+/* Define if you have the unsetenv function.  */
+#define HAVE_UNSETENV 1
+
+/* Define if you have the <X11/XKBlib.h> header file.  */
+#define HAVE_X11_XKBLIB_H 1
+
+/* Define if you have the <X11/extensions/xf86vmode.h> header file.  */
+#define HAVE_X11_EXTENSIONS_XF86VMODE_H 1
+
+/* Define if you have the <sched.h> header file.  */
+#define HAVE_SCHED_H 1
+
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H 1
+
+/* Define if you have the <fcntl.h> header file.  */
+/* #undef HAVE_FCNTL_H */
+
+/* Define if you have the <wchar.h> header file.  */
+#define HAVE_WCHAR_H 1
+
+/* Define if you have the <wcstr.h> header file.  */
+/* #undef HAVE_WCSTR_H */
+
+/* Define if you have <widec.h> (Solaris only) */
+/* #undef HAVE_WIDEC_H */
+
+/* Define if you have the <iconv.h> header file and iconv() symbol.  */
+#define HAVE_ICONV 1
+
+/* Define as "const" if the declaration of iconv() needs const.  */
+#define ICONV_CONST 
+
+/* Define if you have the <langinfo.h> header file.  */
+#define HAVE_LANGINFO_H 1
+
+/* Define if you have the <w32api.h> header file (mingw,cygwin).  */
+/* #undef HAVE_W32API_H */
+
+/* Define if you have the <sys/soundcard.h> header file. */
+#define HAVE_SYS_SOUNDCARD_H 1
+
+/* Define if you have wcsrtombs() function */
+#define HAVE_WCSRTOMBS 1
+
+/* Define this if you have putws() */
+/* #undef HAVE_PUTWS */
+
+/* Define this if you have fputws() */
+#define HAVE_FPUTWS 1
+
+/* Define this if you have wprintf() and related functions */
+#define HAVE_WPRINTF 1
+
+/* Define this if you have vswprintf() and related functions */
+#define HAVE_VSWPRINTF 1
+
+/* Define this if you have _vsnwprintf */
+/* #undef HAVE__VSNWPRINTF */
+
+/* vswscanf() */
+#define HAVE_VSWSCANF 1
+
+/* Define if fseeko and ftello are available.  */
+#define HAVE_FSEEKO 1
+
+/* Define this if you are using gtk and gdk contains support for X11R6 XIM */
+/* #undef HAVE_XIM */
+
+/* Define this if you have X11/extensions/shape.h */
+/* #undef HAVE_XSHAPE */
+
+/* Define this if you have type SPBCDATA */
+/* #undef HAVE_SPBCDATA */
+
+/* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
+/* #undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE */
+
+/* Define if you have Pango xft support */
+/* #undef HAVE_PANGO_XFT */
+
+/* Define if you have the <sys/select.h> header file.  */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define if you have abi::__forced_unwind in your <cxxabi.h>. */
+#define HAVE_ABI_FORCEDUNWIND 1
+
+/* Define if fdopen is available.  */
+#define HAVE_FDOPEN 1
+
+/* Define if sysconf is available. */
+#define HAVE_SYSCONF 1
+
+/* Define if getpwuid_r is available. */
+#define HAVE_GETPWUID_R 1
+
+/* Define if getgrgid_r is available. */
+#define HAVE_GETGRGID_R 1
+
+/* Define if setpriority() is available. */
+#define HAVE_SETPRIORITY 1
+
+/* Define if xlocale.h header file exists. */
+/* #undef HAVE_XLOCALE_H */
+
+/* Define if locale_t is available */
+#define HAVE_LOCALE_T 1
+
+/* Define if you have inotify_xxx() functions. */
+#define wxHAS_INOTIFY 1
+
+/* Define if you have kqueu_xxx() functions. */
+/* #undef wxHAS_KQUEUE */
+
+/* -------------------------------------------------------------------------
+   Win32 adjustments section
+   ------------------------------------------------------------------------- */
+
+#ifdef __WIN32__
+
+/* When using an external jpeg library and the Windows headers already define
+ * boolean, define to the type used by the jpeg library for boolean.  */
+/* #undef wxHACK_BOOLEAN */
+
+/* Define if the header pbt.h is missing.  */
+/* #undef NEED_PBT_H */
+
+#endif /* __WIN32__ */
+
+/* --------------------------------------------------------*
+ *  This stuff is static, it doesn't get modified directly
+ *  by configure.
+*/
+
+/*
+   define some constants identifying wxWindows version in more details than
+   just the version number
+ */
+
+/* wxLogChain class available */
+#define wxHAS_LOG_CHAIN
+
+/* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
+/* #undef wxHAS_WORKING_GTK_DC_BLIT */
+
+#endif /* __WX_SETUP_H__ */
+
diff --git a/pwnd b/pwnd
new file mode 100644
index 0000000000..f15daf27bd
--- /dev/null
+++ b/pwnd
@@ -0,0 +1,8 @@
+#!/bin/bash 
+
+ for i; do 
+    echo -n $i >> compile_log
+    echo -n " " >> compile_log
+ done
+
+echo ""  >> compile_log
\ No newline at end of file
diff --git a/samples/Makefile b/samples/Makefile
new file mode 100644
index 0000000000..894c90e920
--- /dev/null
+++ b/samples/Makefile
@@ -0,0 +1,17 @@
+#
+# Makefile : Builds wxWindows samples for Unix.
+#
+
+SAMPLES_SUBDIRS=animate archive artprov aui calendar caret clipboard collpane combo config console dataview debugrpt dialogs dialup display dnd docview dragimag drawing erase event except exec font fswatcher grid help htlbox html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip image internat joytest keyboard layout listctrl mdi mediaplayer menu minimal notebook opengl opengl/cube opengl/isosurf opengl/penguin opengl/pyramid popup power preferences printing propgrid render ribbon richtext sashtest scroll secretstore shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl treelist typetest validate vscroll webview widgets wizard wrapsizer 
+
+ALL_TARGETS := all clean distclean
+
+$(ALL_TARGETS): $(SAMPLES_SUBDIRS)
+
+# The use of both MAKECMDGOALS and .TARGETS here allows the same makefile to be
+# used both with GNU make and BSD make: only one of these variables will be
+# defined for the particular make program flavour.
+$(SAMPLES_SUBDIRS):
+	$(MAKE) -C $@ $(MAKECMDGOALS) $(.TARGETS)
+
+.PHONY: $(ALL_TARGETS) $(SAMPLES_SUBDIRS)
diff --git a/samples/animate/Makefile b/samples/animate/Makefile
new file mode 100644
index 0000000000..e0c8736bcc
--- /dev/null
+++ b/samples/animate/Makefile
@@ -0,0 +1,202 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+ANITEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+ANITEST_OBJECTS =  \
+	anitest_anitest.o \
+	$(__anitest___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd = $(NM) anitest$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep anitest$(EXEEXT) ; fi
+#__anitest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__anitest_app_Contents_PkgInfo___depname \
+#	= anitest.app/Contents/PkgInfo
+#__anitest_bundle___depname = anitest_bundle
+#____anitest_BUNDLE_TGT_REF_DEP = \
+#	$(__anitest_app_Contents_PkgInfo___depname)
+#____anitest_BUNDLE_TGT_REF_DEP \
+#	= $(__anitest_app_Contents_PkgInfo___depname)
+#____anitest_BUNDLE_TGT_REF_DEP \
+#	= $(__anitest_app_Contents_PkgInfo___depname)
+#____anitest_BUNDLE_TGT_REF_DEP \
+#	= $(__anitest_app_Contents_PkgInfo___depname)
+#____anitest_BUNDLE_TGT_REF_DEP = \
+#	$(__anitest_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__anitest___win32rc = anitest_sample_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: anitest$(EXEEXT) $(__anitest_bundle___depname) catalog
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f anitest$(EXEEXT)
+	rm -rf anitest.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
+	$(CXX) -o $@ $(ANITEST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__anitest___os2_emxbindcmd)
+
+#anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p anitest.app/Contents
+#	mkdir -p anitest.app/Contents/MacOS
+#	mkdir -p anitest.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/anitest/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >anitest.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >anitest.app/Contents/PkgInfo
+#	
+#	
+#	ln -f anitest$(EXEEXT) anitest.app/Contents/MacOS/anitest
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns anitest.app/Contents/Resources/wxmac.icns
+
+#anitest_bundle: $(____anitest_BUNDLE_TGT_REF_DEP)
+
+catalog: 
+	@mkdir -p .
+	@for f in throbber.gif hourglass.ani; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+anitest_anitest.o: $(srcdir)/anitest.cpp
+	$(CXXC) -c -o $@ $(ANITEST_CXXFLAGS) $(srcdir)/anitest.cpp
+
+anitest_sample_rc.o: $(srcdir)/../sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean anitest_bundle catalog
diff --git a/samples/archive/Makefile b/samples/archive/Makefile
new file mode 100644
index 0000000000..4e784a977e
--- /dev/null
+++ b/samples/archive/Makefile
@@ -0,0 +1,125 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+LIBDIRNAME = $(wx_top_builddir)/lib
+ARCHIVE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(WX_CXXFLAGS) \
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+ARCHIVE_OBJECTS =  \
+	archive_archive.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: archive$(EXEEXT)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f archive$(EXEEXT)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+archive$(EXEEXT): $(ARCHIVE_OBJECTS)
+	$(CXX) -o $@ $(ARCHIVE_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+archive_archive.o: $(srcdir)/archive.cpp
+	$(CXXC) -c -o $@ $(ARCHIVE_CXXFLAGS) $(srcdir)/archive.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean
diff --git a/samples/artprov/Makefile b/samples/artprov/Makefile
new file mode 100644
index 0000000000..a74423c570
--- /dev/null
+++ b/samples/artprov/Makefile
@@ -0,0 +1,194 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+ARTTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+ARTTEST_OBJECTS =  \
+	$(__arttest___win32rc) \
+	arttest_arttest.o \
+	arttest_artbrows.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___arttest___os2_emxbindcmd = $(NM) arttest$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep arttest$(EXEEXT) ; fi
+#__arttest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___arttest___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__arttest___win32rc = arttest_sample_rc.o
+#__arttest_app_Contents_PkgInfo___depname \
+#	= arttest.app/Contents/PkgInfo
+#__arttest_bundle___depname = arttest_bundle
+#____arttest_BUNDLE_TGT_REF_DEP = \
+#	$(__arttest_app_Contents_PkgInfo___depname)
+#____arttest_BUNDLE_TGT_REF_DEP \
+#	= $(__arttest_app_Contents_PkgInfo___depname)
+#____arttest_BUNDLE_TGT_REF_DEP \
+#	= $(__arttest_app_Contents_PkgInfo___depname)
+#____arttest_BUNDLE_TGT_REF_DEP \
+#	= $(__arttest_app_Contents_PkgInfo___depname)
+#____arttest_BUNDLE_TGT_REF_DEP = \
+#	$(__arttest_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: arttest$(EXEEXT) $(__arttest_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f arttest$(EXEEXT)
+	rm -rf arttest.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc)
+	$(CXX) -o $@ $(ARTTEST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__arttest___os2_emxbindcmd)
+
+#arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p arttest.app/Contents
+#	mkdir -p arttest.app/Contents/MacOS
+#	mkdir -p arttest.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/arttest/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >arttest.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >arttest.app/Contents/PkgInfo
+#	
+#	
+#	ln -f arttest$(EXEEXT) arttest.app/Contents/MacOS/arttest
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns arttest.app/Contents/Resources/wxmac.icns
+
+#arttest_bundle: $(____arttest_BUNDLE_TGT_REF_DEP)
+
+arttest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+arttest_arttest.o: $(srcdir)/arttest.cpp
+	$(CXXC) -c -o $@ $(ARTTEST_CXXFLAGS) $(srcdir)/arttest.cpp
+
+arttest_artbrows.o: $(srcdir)/artbrows.cpp
+	$(CXXC) -c -o $@ $(ARTTEST_CXXFLAGS) $(srcdir)/artbrows.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean arttest_bundle
diff --git a/samples/aui/Makefile b/samples/aui/Makefile
new file mode 100644
index 0000000000..e86be08a19
--- /dev/null
+++ b/samples/aui/Makefile
@@ -0,0 +1,200 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+AUIDEMO_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+AUIDEMO_OBJECTS =  \
+	$(__auidemo___win32rc) \
+	auidemo_auidemo.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd = $(NM) auidemo$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep auidemo$(EXEEXT) ; fi
+#__auidemo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__auidemo___win32rc = auidemo_sample_rc.o
+#__auidemo_app_Contents_PkgInfo___depname \
+#	= auidemo.app/Contents/PkgInfo
+#__auidemo_bundle___depname = auidemo_bundle
+#____auidemo_BUNDLE_TGT_REF_DEP = \
+#	$(__auidemo_app_Contents_PkgInfo___depname)
+#____auidemo_BUNDLE_TGT_REF_DEP \
+#	= $(__auidemo_app_Contents_PkgInfo___depname)
+#____auidemo_BUNDLE_TGT_REF_DEP \
+#	= $(__auidemo_app_Contents_PkgInfo___depname)
+#____auidemo_BUNDLE_TGT_REF_DEP \
+#	= $(__auidemo_app_Contents_PkgInfo___depname)
+#____auidemo_BUNDLE_TGT_REF_DEP = \
+#	$(__auidemo_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_AUI_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_XML_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: auidemo$(EXEEXT) $(__auidemo_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f auidemo$(EXEEXT)
+	rm -rf auidemo.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc)
+	$(CXX) -o $@ $(AUIDEMO_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__auidemo___os2_emxbindcmd)
+
+#auidemo.app/Contents/PkgInfo: auidemo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p auidemo.app/Contents
+#	mkdir -p auidemo.app/Contents/MacOS
+#	mkdir -p auidemo.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/auidemo/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >auidemo.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >auidemo.app/Contents/PkgInfo
+#	
+#	
+#	ln -f auidemo$(EXEEXT) auidemo.app/Contents/MacOS/auidemo
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns auidemo.app/Contents/Resources/wxmac.icns
+
+#auidemo_bundle: $(____auidemo_BUNDLE_TGT_REF_DEP)
+
+auidemo_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+auidemo_auidemo.o: $(srcdir)/auidemo.cpp
+	$(CXXC) -c -o $@ $(AUIDEMO_CXXFLAGS) $(srcdir)/auidemo.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean auidemo_bundle
diff --git a/samples/calendar/Makefile b/samples/calendar/Makefile
new file mode 100644
index 0000000000..651959aac1
--- /dev/null
+++ b/samples/calendar/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+CALENDAR_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+CALENDAR_OBJECTS =  \
+	$(__calendar___win32rc) \
+	calendar_calendar.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd = $(NM) calendar$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep calendar$(EXEEXT) ; fi
+#__calendar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__calendar___win32rc = calendar_sample_rc.o
+#__calendar_app_Contents_PkgInfo___depname \
+#	= calendar.app/Contents/PkgInfo
+#__calendar_bundle___depname = calendar_bundle
+#____calendar_BUNDLE_TGT_REF_DEP = \
+#	$(__calendar_app_Contents_PkgInfo___depname)
+#____calendar_BUNDLE_TGT_REF_DEP \
+#	= $(__calendar_app_Contents_PkgInfo___depname)
+#____calendar_BUNDLE_TGT_REF_DEP \
+#	= $(__calendar_app_Contents_PkgInfo___depname)
+#____calendar_BUNDLE_TGT_REF_DEP \
+#	= $(__calendar_app_Contents_PkgInfo___depname)
+#____calendar_BUNDLE_TGT_REF_DEP = \
+#	$(__calendar_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: calendar$(EXEEXT) $(__calendar_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f calendar$(EXEEXT)
+	rm -rf calendar.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
+	$(CXX) -o $@ $(CALENDAR_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__calendar___os2_emxbindcmd)
+
+#calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p calendar.app/Contents
+#	mkdir -p calendar.app/Contents/MacOS
+#	mkdir -p calendar.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/calendar/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >calendar.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >calendar.app/Contents/PkgInfo
+#	
+#	
+#	ln -f calendar$(EXEEXT) calendar.app/Contents/MacOS/calendar
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns calendar.app/Contents/Resources/wxmac.icns
+
+#calendar_bundle: $(____calendar_BUNDLE_TGT_REF_DEP)
+
+calendar_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+calendar_calendar.o: $(srcdir)/calendar.cpp
+	$(CXXC) -c -o $@ $(CALENDAR_CXXFLAGS) $(srcdir)/calendar.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean calendar_bundle
diff --git a/samples/caret/Makefile b/samples/caret/Makefile
new file mode 100644
index 0000000000..a8636d849c
--- /dev/null
+++ b/samples/caret/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+CARET_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+CARET_OBJECTS =  \
+	$(__caret___win32rc) \
+	caret_caret.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___caret___os2_emxbindcmd = $(NM) caret$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep caret$(EXEEXT) ; fi
+#__caret___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___caret___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__caret___win32rc = caret_sample_rc.o
+#__caret_app_Contents_PkgInfo___depname \
+#	= caret.app/Contents/PkgInfo
+#__caret_bundle___depname = caret_bundle
+#____caret_BUNDLE_TGT_REF_DEP = \
+#	$(__caret_app_Contents_PkgInfo___depname)
+#____caret_BUNDLE_TGT_REF_DEP \
+#	= $(__caret_app_Contents_PkgInfo___depname)
+#____caret_BUNDLE_TGT_REF_DEP \
+#	= $(__caret_app_Contents_PkgInfo___depname)
+#____caret_BUNDLE_TGT_REF_DEP \
+#	= $(__caret_app_Contents_PkgInfo___depname)
+#____caret_BUNDLE_TGT_REF_DEP = \
+#	$(__caret_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: caret$(EXEEXT) $(__caret_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f caret$(EXEEXT)
+	rm -rf caret.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc)
+	$(CXX) -o $@ $(CARET_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__caret___os2_emxbindcmd)
+
+#caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p caret.app/Contents
+#	mkdir -p caret.app/Contents/MacOS
+#	mkdir -p caret.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/caret/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >caret.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >caret.app/Contents/PkgInfo
+#	
+#	
+#	ln -f caret$(EXEEXT) caret.app/Contents/MacOS/caret
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns caret.app/Contents/Resources/wxmac.icns
+
+#caret_bundle: $(____caret_BUNDLE_TGT_REF_DEP)
+
+caret_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+caret_caret.o: $(srcdir)/caret.cpp
+	$(CXXC) -c -o $@ $(CARET_CXXFLAGS) $(srcdir)/caret.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean caret_bundle
diff --git a/samples/clipboard/Makefile b/samples/clipboard/Makefile
new file mode 100644
index 0000000000..9ae16842a1
--- /dev/null
+++ b/samples/clipboard/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+CLIPBOARD_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+CLIPBOARD_OBJECTS =  \
+	$(__clipboard___win32rc) \
+	clipboard_clipboard.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___clipboard___os2_emxbindcmd = $(NM) clipboard$(EXEEXT) | \
+	if grep -q pmwin.763 ; then emxbind -ep clipboard$(EXEEXT) ; fi
+#__clipboard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___clipboard___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__clipboard___win32rc = clipboard_sample_rc.o
+#__clipboard_app_Contents_PkgInfo___depname \
+#	= clipboard.app/Contents/PkgInfo
+#__clipboard_bundle___depname = clipboard_bundle
+#____clipboard_BUNDLE_TGT_REF_DEP = \
+#	$(__clipboard_app_Contents_PkgInfo___depname)
+#____clipboard_BUNDLE_TGT_REF_DEP \
+#	= $(__clipboard_app_Contents_PkgInfo___depname)
+#____clipboard_BUNDLE_TGT_REF_DEP \
+#	= $(__clipboard_app_Contents_PkgInfo___depname)
+#____clipboard_BUNDLE_TGT_REF_DEP \
+#	= $(__clipboard_app_Contents_PkgInfo___depname)
+#____clipboard_BUNDLE_TGT_REF_DEP = \
+#	$(__clipboard_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: clipboard$(EXEEXT) $(__clipboard_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f clipboard$(EXEEXT)
+	rm -rf clipboard.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+clipboard$(EXEEXT): $(CLIPBOARD_OBJECTS) $(__clipboard___win32rc)
+	$(CXX) -o $@ $(CLIPBOARD_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__clipboard___os2_emxbindcmd)
+
+#clipboard.app/Contents/PkgInfo: clipboard$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p clipboard.app/Contents
+#	mkdir -p clipboard.app/Contents/MacOS
+#	mkdir -p clipboard.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/clipboard/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >clipboard.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >clipboard.app/Contents/PkgInfo
+#	
+#	
+#	ln -f clipboard$(EXEEXT) clipboard.app/Contents/MacOS/clipboard
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns clipboard.app/Contents/Resources/wxmac.icns
+
+#clipboard_bundle: $(____clipboard_BUNDLE_TGT_REF_DEP)
+
+clipboard_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+clipboard_clipboard.o: $(srcdir)/clipboard.cpp
+	$(CXXC) -c -o $@ $(CLIPBOARD_CXXFLAGS) $(srcdir)/clipboard.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean clipboard_bundle
diff --git a/samples/collpane/Makefile b/samples/collpane/Makefile
new file mode 100644
index 0000000000..c2d9b59d72
--- /dev/null
+++ b/samples/collpane/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+COLLPANE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+COLLPANE_OBJECTS =  \
+	collpane_collpane.o \
+	$(__collpane___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___collpane___os2_emxbindcmd = $(NM) collpane$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep collpane$(EXEEXT) ; fi
+#__collpane___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___collpane___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__collpane_app_Contents_PkgInfo___depname \
+#	= collpane.app/Contents/PkgInfo
+#__collpane_bundle___depname = collpane_bundle
+#____collpane_BUNDLE_TGT_REF_DEP = \
+#	$(__collpane_app_Contents_PkgInfo___depname)
+#____collpane_BUNDLE_TGT_REF_DEP \
+#	= $(__collpane_app_Contents_PkgInfo___depname)
+#____collpane_BUNDLE_TGT_REF_DEP \
+#	= $(__collpane_app_Contents_PkgInfo___depname)
+#____collpane_BUNDLE_TGT_REF_DEP \
+#	= $(__collpane_app_Contents_PkgInfo___depname)
+#____collpane_BUNDLE_TGT_REF_DEP = \
+#	$(__collpane_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__collpane___win32rc = collpane_sample_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: collpane$(EXEEXT) $(__collpane_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f collpane$(EXEEXT)
+	rm -rf collpane.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+collpane$(EXEEXT): $(COLLPANE_OBJECTS) $(__collpane___win32rc)
+	$(CXX) -o $@ $(COLLPANE_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__collpane___os2_emxbindcmd)
+
+#collpane.app/Contents/PkgInfo: collpane$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p collpane.app/Contents
+#	mkdir -p collpane.app/Contents/MacOS
+#	mkdir -p collpane.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/collpane/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >collpane.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >collpane.app/Contents/PkgInfo
+#	
+#	
+#	ln -f collpane$(EXEEXT) collpane.app/Contents/MacOS/collpane
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns collpane.app/Contents/Resources/wxmac.icns
+
+#collpane_bundle: $(____collpane_BUNDLE_TGT_REF_DEP)
+
+collpane_collpane.o: $(srcdir)/collpane.cpp
+	$(CXXC) -c -o $@ $(COLLPANE_CXXFLAGS) $(srcdir)/collpane.cpp
+
+collpane_sample_rc.o: $(srcdir)/../sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean collpane_bundle
diff --git a/samples/combo/Makefile b/samples/combo/Makefile
new file mode 100644
index 0000000000..3c28c4f322
--- /dev/null
+++ b/samples/combo/Makefile
@@ -0,0 +1,202 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+COMBO_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+COMBO_OBJECTS =  \
+	$(__combo___win32rc) \
+	combo_combo.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___combo___os2_emxbindcmd = $(NM) combo$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep combo$(EXEEXT) ; fi
+#__combo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___combo___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__combo___win32rc = combo_sample_rc.o
+#__combo_app_Contents_PkgInfo___depname \
+#	= combo.app/Contents/PkgInfo
+#__combo_bundle___depname = combo_bundle
+#____combo_BUNDLE_TGT_REF_DEP = \
+#	$(__combo_app_Contents_PkgInfo___depname)
+#____combo_BUNDLE_TGT_REF_DEP \
+#	= $(__combo_app_Contents_PkgInfo___depname)
+#____combo_BUNDLE_TGT_REF_DEP \
+#	= $(__combo_app_Contents_PkgInfo___depname)
+#____combo_BUNDLE_TGT_REF_DEP \
+#	= $(__combo_app_Contents_PkgInfo___depname)
+#____combo_BUNDLE_TGT_REF_DEP = \
+#	$(__combo_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: combo$(EXEEXT) $(__combo_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f combo$(EXEEXT)
+	rm -rf combo.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+combo$(EXEEXT): $(COMBO_OBJECTS) $(__combo___win32rc)
+	$(CXX) -o $@ $(COMBO_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__combo___os2_emxbindcmd)
+
+#combo.app/Contents/PkgInfo: combo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p combo.app/Contents
+#	mkdir -p combo.app/Contents/MacOS
+#	mkdir -p combo.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/combo/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >combo.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >combo.app/Contents/PkgInfo
+#	
+#	
+#	ln -f combo$(EXEEXT) combo.app/Contents/MacOS/combo
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns combo.app/Contents/Resources/wxmac.icns
+
+#combo_bundle: $(____combo_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in dropbuth.png dropbutn.png dropbutp.png; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+combo_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+combo_combo.o: $(srcdir)/combo.cpp
+	$(CXXC) -c -o $@ $(COMBO_CXXFLAGS) $(srcdir)/combo.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean combo_bundle data
diff --git a/samples/config/Makefile b/samples/config/Makefile
new file mode 100644
index 0000000000..153a06f382
--- /dev/null
+++ b/samples/config/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+CONFTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+CONFTEST_OBJECTS =  \
+	$(__conftest___win32rc) \
+	conftest_conftest.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd = $(NM) conftest$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep conftest$(EXEEXT) ; fi
+#__conftest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__conftest___win32rc = conftest_sample_rc.o
+#__conftest_app_Contents_PkgInfo___depname \
+#	= conftest.app/Contents/PkgInfo
+#__conftest_bundle___depname = conftest_bundle
+#____conftest_BUNDLE_TGT_REF_DEP = \
+#	$(__conftest_app_Contents_PkgInfo___depname)
+#____conftest_BUNDLE_TGT_REF_DEP \
+#	= $(__conftest_app_Contents_PkgInfo___depname)
+#____conftest_BUNDLE_TGT_REF_DEP \
+#	= $(__conftest_app_Contents_PkgInfo___depname)
+#____conftest_BUNDLE_TGT_REF_DEP \
+#	= $(__conftest_app_Contents_PkgInfo___depname)
+#____conftest_BUNDLE_TGT_REF_DEP = \
+#	$(__conftest_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: conftest$(EXEEXT) $(__conftest_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f conftest$(EXEEXT)
+	rm -rf conftest.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
+	$(CXX) -o $@ $(CONFTEST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__conftest___os2_emxbindcmd)
+
+#conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p conftest.app/Contents
+#	mkdir -p conftest.app/Contents/MacOS
+#	mkdir -p conftest.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/conftest/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >conftest.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >conftest.app/Contents/PkgInfo
+#	
+#	
+#	ln -f conftest$(EXEEXT) conftest.app/Contents/MacOS/conftest
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns conftest.app/Contents/Resources/wxmac.icns
+
+#conftest_bundle: $(____conftest_BUNDLE_TGT_REF_DEP)
+
+conftest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+conftest_conftest.o: $(srcdir)/conftest.cpp
+	$(CXXC) -c -o $@ $(CONFTEST_CXXFLAGS) $(srcdir)/conftest.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean conftest_bundle
diff --git a/samples/console/Makefile b/samples/console/Makefile
new file mode 100644
index 0000000000..5bb88b4f51
--- /dev/null
+++ b/samples/console/Makefile
@@ -0,0 +1,118 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+LIBDIRNAME = $(wx_top_builddir)/lib
+CONSOLE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(WX_CXXFLAGS) \
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+CONSOLE_OBJECTS =  \
+	console_console.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+COND_MONOLITHIC_0___WXLIB_NET_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: console$(EXEEXT)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f console$(EXEEXT)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+console$(EXEEXT): $(CONSOLE_OBJECTS)
+	$(CXX) -o $@ $(CONSOLE_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+console_console.o: $(srcdir)/console.cpp
+	$(CXXC) -c -o $@ $(CONSOLE_CXXFLAGS) $(srcdir)/console.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean
diff --git a/samples/dataview/Makefile b/samples/dataview/Makefile
new file mode 100644
index 0000000000..68b9261aa2
--- /dev/null
+++ b/samples/dataview/Makefile
@@ -0,0 +1,194 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+DATAVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+DATAVIEW_OBJECTS =  \
+	dataview_dataview.o \
+	dataview_mymodels.o \
+	$(__dataview___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___dataview___os2_emxbindcmd = $(NM) dataview$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep dataview$(EXEEXT) ; fi
+#__dataview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dataview___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__dataview_app_Contents_PkgInfo___depname \
+#	= dataview.app/Contents/PkgInfo
+#__dataview_bundle___depname = dataview_bundle
+#____dataview_BUNDLE_TGT_REF_DEP = \
+#	$(__dataview_app_Contents_PkgInfo___depname)
+#____dataview_BUNDLE_TGT_REF_DEP \
+#	= $(__dataview_app_Contents_PkgInfo___depname)
+#____dataview_BUNDLE_TGT_REF_DEP \
+#	= $(__dataview_app_Contents_PkgInfo___depname)
+#____dataview_BUNDLE_TGT_REF_DEP \
+#	= $(__dataview_app_Contents_PkgInfo___depname)
+#____dataview_BUNDLE_TGT_REF_DEP = \
+#	$(__dataview_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__dataview___win32rc = dataview_sample_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: dataview$(EXEEXT) $(__dataview_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f dataview$(EXEEXT)
+	rm -rf dataview.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc)
+	$(CXX) -o $@ $(DATAVIEW_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__dataview___os2_emxbindcmd)
+
+#dataview.app/Contents/PkgInfo: dataview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p dataview.app/Contents
+#	mkdir -p dataview.app/Contents/MacOS
+#	mkdir -p dataview.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/dataview/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >dataview.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >dataview.app/Contents/PkgInfo
+#	
+#	
+#	ln -f dataview$(EXEEXT) dataview.app/Contents/MacOS/dataview
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns dataview.app/Contents/Resources/wxmac.icns
+
+#dataview_bundle: $(____dataview_BUNDLE_TGT_REF_DEP)
+
+dataview_dataview.o: $(srcdir)/dataview.cpp
+	$(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/dataview.cpp
+
+dataview_mymodels.o: $(srcdir)/mymodels.cpp
+	$(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/mymodels.cpp
+
+dataview_sample_rc.o: $(srcdir)/../sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean dataview_bundle
diff --git a/samples/debugrpt/Makefile b/samples/debugrpt/Makefile
new file mode 100644
index 0000000000..9dc3727c58
--- /dev/null
+++ b/samples/debugrpt/Makefile
@@ -0,0 +1,196 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+DEBUGRPT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+DEBUGRPT_OBJECTS =  \
+	$(__debugrpt___win32rc) \
+	debugrpt_debugrpt.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___debugrpt___os2_emxbindcmd = $(NM) debugrpt$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep debugrpt$(EXEEXT) ; fi
+#__debugrpt___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___debugrpt___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__debugrpt___win32rc = debugrpt_sample_rc.o
+#__debugrpt_app_Contents_PkgInfo___depname \
+#	= debugrpt.app/Contents/PkgInfo
+#__debugrpt_bundle___depname = debugrpt_bundle
+#____debugrpt_BUNDLE_TGT_REF_DEP = \
+#	$(__debugrpt_app_Contents_PkgInfo___depname)
+#____debugrpt_BUNDLE_TGT_REF_DEP \
+#	= $(__debugrpt_app_Contents_PkgInfo___depname)
+#____debugrpt_BUNDLE_TGT_REF_DEP \
+#	= $(__debugrpt_app_Contents_PkgInfo___depname)
+#____debugrpt_BUNDLE_TGT_REF_DEP \
+#	= $(__debugrpt_app_Contents_PkgInfo___depname)
+#____debugrpt_BUNDLE_TGT_REF_DEP = \
+#	$(__debugrpt_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_QA_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_QA_p = $(COND_MONOLITHIC_0___WXLIB_QA_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_0___WXLIB_XML_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: debugrpt$(EXEEXT) $(__debugrpt_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f debugrpt$(EXEEXT)
+	rm -rf debugrpt.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+debugrpt$(EXEEXT): $(DEBUGRPT_OBJECTS) $(__debugrpt___win32rc)
+	$(CXX) -o $@ $(DEBUGRPT_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__debugrpt___os2_emxbindcmd)
+
+#debugrpt.app/Contents/PkgInfo: debugrpt$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p debugrpt.app/Contents
+#	mkdir -p debugrpt.app/Contents/MacOS
+#	mkdir -p debugrpt.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/debugrpt/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >debugrpt.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >debugrpt.app/Contents/PkgInfo
+#	
+#	
+#	ln -f debugrpt$(EXEEXT) debugrpt.app/Contents/MacOS/debugrpt
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns debugrpt.app/Contents/Resources/wxmac.icns
+
+#debugrpt_bundle: $(____debugrpt_BUNDLE_TGT_REF_DEP)
+
+debugrpt_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+debugrpt_debugrpt.o: $(srcdir)/debugrpt.cpp
+	$(CXXC) -c -o $@ $(DEBUGRPT_CXXFLAGS) $(srcdir)/debugrpt.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean debugrpt_bundle
diff --git a/samples/dialogs/Makefile b/samples/dialogs/Makefile
new file mode 100644
index 0000000000..b9b9378e25
--- /dev/null
+++ b/samples/dialogs/Makefile
@@ -0,0 +1,235 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+DIALOGS_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+DIALOGS_OBJECTS =  \
+	$(__dialogs___win32rc) \
+	dialogs_dialogs.o \
+	$(__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd = $(NM) dialogs$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep dialogs$(EXEEXT) ; fi
+#__dialogs___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__dialogs___win32rc = dialogs_sample_rc.o
+#__dialogs_app_Contents_PkgInfo___depname \
+#	= dialogs.app/Contents/PkgInfo
+#__dialogs_bundle___depname = dialogs_bundle
+#____dialogs_BUNDLE_TGT_REF_DEP = \
+#	$(__dialogs_app_Contents_PkgInfo___depname)
+#____dialogs_BUNDLE_TGT_REF_DEP \
+#	= $(__dialogs_app_Contents_PkgInfo___depname)
+#____dialogs_BUNDLE_TGT_REF_DEP \
+#	= $(__dialogs_app_Contents_PkgInfo___depname)
+#____dialogs_BUNDLE_TGT_REF_DEP \
+#	= $(__dialogs_app_Contents_PkgInfo___depname)
+#____dialogs_BUNDLE_TGT_REF_DEP = \
+#	$(__dialogs_app_Contents_PkgInfo___depname)
+#__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \
+#	= dialogs_colrdlgg.o dialogs_dirdlgg.o \
+#	dialogs_filedlgg.o dialogs_fontdlgg.o
+#__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \
+#	= dialogs_colrdlgg.o dialogs_dirdlgg.o \
+#	dialogs_filedlgg.o
+#__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \
+#	= dialogs_filedlgg.o
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: dialogs$(EXEEXT) $(__dialogs_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f dialogs$(EXEEXT)
+	rm -rf dialogs.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
+	$(CXX) -o $@ $(DIALOGS_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__dialogs___os2_emxbindcmd)
+
+#dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p dialogs.app/Contents
+#	mkdir -p dialogs.app/Contents/MacOS
+#	mkdir -p dialogs.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/dialogs/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >dialogs.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >dialogs.app/Contents/PkgInfo
+#	
+#	
+#	ln -f dialogs$(EXEEXT) dialogs.app/Contents/MacOS/dialogs
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns dialogs.app/Contents/Resources/wxmac.icns
+
+#dialogs_bundle: $(____dialogs_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in tips.txt; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+dialogs_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+dialogs_dialogs.o: $(srcdir)/dialogs.cpp
+	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/dialogs.cpp
+
+dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp
+	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/fontdlgg.cpp
+
+#dialogs_colrdlgg.o: $(srcdir)/../../src/generic/colrdlgg.cpp
+#	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/colrdlgg.cpp
+
+#dialogs_colrdlgg.o: $(srcdir)/../../src/generic/colrdlgg.cpp
+#	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/colrdlgg.cpp
+
+#dialogs_dirdlgg.o: $(srcdir)/../../src/generic/dirdlgg.cpp
+#	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/dirdlgg.cpp
+
+#dialogs_dirdlgg.o: $(srcdir)/../../src/generic/dirdlgg.cpp
+#	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/dirdlgg.cpp
+
+#dialogs_filedlgg.o: $(srcdir)/../../src/generic/filedlgg.cpp
+#	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/filedlgg.cpp
+
+#dialogs_filedlgg.o: $(srcdir)/../../src/generic/filedlgg.cpp
+#	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/filedlgg.cpp
+
+#dialogs_filedlgg.o: $(srcdir)/../../src/generic/filedlgg.cpp
+#	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/filedlgg.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean dialogs_bundle data
diff --git a/samples/dialup/Makefile b/samples/dialup/Makefile
new file mode 100644
index 0000000000..5f16caa8e5
--- /dev/null
+++ b/samples/dialup/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+NETTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+NETTEST_OBJECTS =  \
+	$(__nettest___win32rc) \
+	nettest_nettest.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd = $(NM) nettest$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep nettest$(EXEEXT) ; fi
+#__nettest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__nettest___win32rc = nettest_sample_rc.o
+#__nettest_app_Contents_PkgInfo___depname \
+#	= nettest.app/Contents/PkgInfo
+#__nettest_bundle___depname = nettest_bundle
+#____nettest_BUNDLE_TGT_REF_DEP = \
+#	$(__nettest_app_Contents_PkgInfo___depname)
+#____nettest_BUNDLE_TGT_REF_DEP \
+#	= $(__nettest_app_Contents_PkgInfo___depname)
+#____nettest_BUNDLE_TGT_REF_DEP \
+#	= $(__nettest_app_Contents_PkgInfo___depname)
+#____nettest_BUNDLE_TGT_REF_DEP \
+#	= $(__nettest_app_Contents_PkgInfo___depname)
+#____nettest_BUNDLE_TGT_REF_DEP = \
+#	$(__nettest_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: nettest$(EXEEXT) $(__nettest_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f nettest$(EXEEXT)
+	rm -rf nettest.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
+	$(CXX) -o $@ $(NETTEST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__nettest___os2_emxbindcmd)
+
+#nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p nettest.app/Contents
+#	mkdir -p nettest.app/Contents/MacOS
+#	mkdir -p nettest.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/nettest/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >nettest.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >nettest.app/Contents/PkgInfo
+#	
+#	
+#	ln -f nettest$(EXEEXT) nettest.app/Contents/MacOS/nettest
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns nettest.app/Contents/Resources/wxmac.icns
+
+#nettest_bundle: $(____nettest_BUNDLE_TGT_REF_DEP)
+
+nettest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+nettest_nettest.o: $(srcdir)/nettest.cpp
+	$(CXXC) -c -o $@ $(NETTEST_CXXFLAGS) $(srcdir)/nettest.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean nettest_bundle
diff --git a/samples/display/Makefile b/samples/display/Makefile
new file mode 100644
index 0000000000..1a3cba8e5f
--- /dev/null
+++ b/samples/display/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+DISPLAY_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+DISPLAY_OBJECTS =  \
+	$(__display___win32rc) \
+	display_display.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___display___os2_emxbindcmd = $(NM) display$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep display$(EXEEXT) ; fi
+#__display___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___display___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__display___win32rc = display_sample_rc.o
+#__display_app_Contents_PkgInfo___depname \
+#	= display.app/Contents/PkgInfo
+#__display_bundle___depname = display_bundle
+#____display_BUNDLE_TGT_REF_DEP = \
+#	$(__display_app_Contents_PkgInfo___depname)
+#____display_BUNDLE_TGT_REF_DEP \
+#	= $(__display_app_Contents_PkgInfo___depname)
+#____display_BUNDLE_TGT_REF_DEP \
+#	= $(__display_app_Contents_PkgInfo___depname)
+#____display_BUNDLE_TGT_REF_DEP \
+#	= $(__display_app_Contents_PkgInfo___depname)
+#____display_BUNDLE_TGT_REF_DEP = \
+#	$(__display_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: display$(EXEEXT) $(__display_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f display$(EXEEXT)
+	rm -rf display.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc)
+	$(CXX) -o $@ $(DISPLAY_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__display___os2_emxbindcmd)
+
+#display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p display.app/Contents
+#	mkdir -p display.app/Contents/MacOS
+#	mkdir -p display.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/display/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >display.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >display.app/Contents/PkgInfo
+#	
+#	
+#	ln -f display$(EXEEXT) display.app/Contents/MacOS/display
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns display.app/Contents/Resources/wxmac.icns
+
+#display_bundle: $(____display_BUNDLE_TGT_REF_DEP)
+
+display_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+display_display.o: $(srcdir)/display.cpp
+	$(CXXC) -c -o $@ $(DISPLAY_CXXFLAGS) $(srcdir)/display.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean display_bundle
diff --git a/samples/dnd/Makefile b/samples/dnd/Makefile
new file mode 100644
index 0000000000..8488922eeb
--- /dev/null
+++ b/samples/dnd/Makefile
@@ -0,0 +1,202 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+DND_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+DND_OBJECTS =  \
+	dnd_dnd.o \
+	$(__dnd___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___dnd___os2_emxbindcmd = $(NM) dnd$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep dnd$(EXEEXT) ; fi
+#__dnd___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dnd___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__dnd_app_Contents_PkgInfo___depname \
+#	= dnd.app/Contents/PkgInfo
+#__dnd_bundle___depname = dnd_bundle
+#____dnd_BUNDLE_TGT_REF_DEP = \
+#	$(__dnd_app_Contents_PkgInfo___depname)
+#____dnd_BUNDLE_TGT_REF_DEP \
+#	= $(__dnd_app_Contents_PkgInfo___depname)
+#____dnd_BUNDLE_TGT_REF_DEP \
+#	= $(__dnd_app_Contents_PkgInfo___depname)
+#____dnd_BUNDLE_TGT_REF_DEP \
+#	= $(__dnd_app_Contents_PkgInfo___depname)
+#____dnd_BUNDLE_TGT_REF_DEP = \
+#	$(__dnd_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__dnd___win32rc = dnd_dnd_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: dnd$(EXEEXT) $(__dnd_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f dnd$(EXEEXT)
+	rm -rf dnd.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc)
+	$(CXX) -o $@ $(DND_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__dnd___os2_emxbindcmd)
+
+#dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p dnd.app/Contents
+#	mkdir -p dnd.app/Contents/MacOS
+#	mkdir -p dnd.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/dnd/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >dnd.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >dnd.app/Contents/PkgInfo
+#	
+#	
+#	ln -f dnd$(EXEEXT) dnd.app/Contents/MacOS/dnd
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns dnd.app/Contents/Resources/wxmac.icns
+
+#dnd_bundle: $(____dnd_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in wxwin.png; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+dnd_dnd.o: $(srcdir)/dnd.cpp
+	$(CXXC) -c -o $@ $(DND_CXXFLAGS) $(srcdir)/dnd.cpp
+
+dnd_dnd_rc.o: $(srcdir)/dnd.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean dnd_bundle data
diff --git a/samples/docview/Makefile b/samples/docview/Makefile
new file mode 100644
index 0000000000..302dd5840d
--- /dev/null
+++ b/samples/docview/Makefile
@@ -0,0 +1,202 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+DOCVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+DOCVIEW_OBJECTS =  \
+	docview_docview.o \
+	docview_doc.o \
+	docview_view.o \
+	$(__docview___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___docview___os2_emxbindcmd = $(NM) docview$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep docview$(EXEEXT) ; fi
+#__docview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___docview___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__docview_app_Contents_PkgInfo___depname \
+#	= docview.app/Contents/PkgInfo
+#__docview_bundle___depname = docview_bundle
+#____docview_BUNDLE_TGT_REF_DEP = \
+#	$(__docview_app_Contents_PkgInfo___depname)
+#____docview_BUNDLE_TGT_REF_DEP \
+#	= $(__docview_app_Contents_PkgInfo___depname)
+#____docview_BUNDLE_TGT_REF_DEP \
+#	= $(__docview_app_Contents_PkgInfo___depname)
+#____docview_BUNDLE_TGT_REF_DEP \
+#	= $(__docview_app_Contents_PkgInfo___depname)
+#____docview_BUNDLE_TGT_REF_DEP = \
+#	$(__docview_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_AUI_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__docview___win32rc = docview_docview_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: docview$(EXEEXT) $(__docview_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f docview$(EXEEXT)
+	rm -rf docview.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
+	$(CXX) -o $@ $(DOCVIEW_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_AUI_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__docview___os2_emxbindcmd)
+
+#docview.app/Contents/PkgInfo: docview$(EXEEXT) $(srcdir)/Info.plist.in $(srcdir)/doc.icns $(srcdir)/chart.icns $(srcdir)/notepad.icns
+#	mkdir -p docview.app/Contents
+#	mkdir -p docview.app/Contents/MacOS
+#	mkdir -p docview.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/docview/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(srcdir)/Info.plist.in >docview.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >docview.app/Contents/PkgInfo
+#	
+#	
+#	ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview
+#	
+#	
+#	cp -f $(srcdir)/doc.icns docview.app/Contents/Resources/wxmac.icns
+#	cp -f $(srcdir)/chart.icns $(srcdir)/notepad.icns docview.app/Contents/Resources
+
+#docview_bundle: $(____docview_BUNDLE_TGT_REF_DEP)
+
+docview_docview.o: $(srcdir)/docview.cpp
+	$(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $(srcdir)/docview.cpp
+
+docview_doc.o: $(srcdir)/doc.cpp
+	$(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $(srcdir)/doc.cpp
+
+docview_view.o: $(srcdir)/view.cpp
+	$(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $(srcdir)/view.cpp
+
+docview_docview_rc.o: $(srcdir)/docview.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean docview_bundle
diff --git a/samples/dragimag/Makefile b/samples/dragimag/Makefile
new file mode 100644
index 0000000000..4d582603ea
--- /dev/null
+++ b/samples/dragimag/Makefile
@@ -0,0 +1,202 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+DRAGIMAG_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+DRAGIMAG_OBJECTS =  \
+	dragimag_dragimag.o \
+	$(__dragimag___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___dragimag___os2_emxbindcmd = $(NM) dragimag$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep dragimag$(EXEEXT) ; fi
+#__dragimag___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dragimag___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__dragimag_app_Contents_PkgInfo___depname \
+#	= dragimag.app/Contents/PkgInfo
+#__dragimag_bundle___depname = dragimag_bundle
+#____dragimag_BUNDLE_TGT_REF_DEP = \
+#	$(__dragimag_app_Contents_PkgInfo___depname)
+#____dragimag_BUNDLE_TGT_REF_DEP \
+#	= $(__dragimag_app_Contents_PkgInfo___depname)
+#____dragimag_BUNDLE_TGT_REF_DEP \
+#	= $(__dragimag_app_Contents_PkgInfo___depname)
+#____dragimag_BUNDLE_TGT_REF_DEP \
+#	= $(__dragimag_app_Contents_PkgInfo___depname)
+#____dragimag_BUNDLE_TGT_REF_DEP = \
+#	$(__dragimag_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__dragimag___win32rc = dragimag_dragimag_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: dragimag$(EXEEXT) $(__dragimag_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f dragimag$(EXEEXT)
+	rm -rf dragimag.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc)
+	$(CXX) -o $@ $(DRAGIMAG_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__dragimag___os2_emxbindcmd)
+
+#dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p dragimag.app/Contents
+#	mkdir -p dragimag.app/Contents/MacOS
+#	mkdir -p dragimag.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/dragimag/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >dragimag.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >dragimag.app/Contents/PkgInfo
+#	
+#	
+#	ln -f dragimag$(EXEEXT) dragimag.app/Contents/MacOS/dragimag
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns dragimag.app/Contents/Resources/wxmac.icns
+
+#dragimag_bundle: $(____dragimag_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in backgrnd.png shape01.png shape02.png shape03.png; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+dragimag_dragimag.o: $(srcdir)/dragimag.cpp
+	$(CXXC) -c -o $@ $(DRAGIMAG_CXXFLAGS) $(srcdir)/dragimag.cpp
+
+dragimag_dragimag_rc.o: $(srcdir)/dragimag.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean dragimag_bundle data
diff --git a/samples/drawing/Makefile b/samples/drawing/Makefile
new file mode 100644
index 0000000000..c086ece1b0
--- /dev/null
+++ b/samples/drawing/Makefile
@@ -0,0 +1,202 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+DRAWING_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+DRAWING_OBJECTS =  \
+	$(__drawing___win32rc) \
+	drawing_drawing.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___drawing___os2_emxbindcmd = $(NM) drawing$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep drawing$(EXEEXT) ; fi
+#__drawing___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___drawing___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__drawing___win32rc = drawing_sample_rc.o
+#__drawing_app_Contents_PkgInfo___depname \
+#	= drawing.app/Contents/PkgInfo
+#__drawing_bundle___depname = drawing_bundle
+#____drawing_BUNDLE_TGT_REF_DEP = \
+#	$(__drawing_app_Contents_PkgInfo___depname)
+#____drawing_BUNDLE_TGT_REF_DEP \
+#	= $(__drawing_app_Contents_PkgInfo___depname)
+#____drawing_BUNDLE_TGT_REF_DEP \
+#	= $(__drawing_app_Contents_PkgInfo___depname)
+#____drawing_BUNDLE_TGT_REF_DEP \
+#	= $(__drawing_app_Contents_PkgInfo___depname)
+#____drawing_BUNDLE_TGT_REF_DEP = \
+#	$(__drawing_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: drawing$(EXEEXT) $(__drawing_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f drawing$(EXEEXT)
+	rm -rf drawing.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc)
+	$(CXX) -o $@ $(DRAWING_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__drawing___os2_emxbindcmd)
+
+#drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p drawing.app/Contents
+#	mkdir -p drawing.app/Contents/MacOS
+#	mkdir -p drawing.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/drawing/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >drawing.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >drawing.app/Contents/PkgInfo
+#	
+#	
+#	ln -f drawing$(EXEEXT) drawing.app/Contents/MacOS/drawing
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns drawing.app/Contents/Resources/wxmac.icns
+
+#drawing_bundle: $(____drawing_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+drawing_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+drawing_drawing.o: $(srcdir)/drawing.cpp
+	$(CXXC) -c -o $@ $(DRAWING_CXXFLAGS) $(srcdir)/drawing.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean drawing_bundle data
diff --git a/samples/erase/Makefile b/samples/erase/Makefile
new file mode 100644
index 0000000000..ce643377ac
--- /dev/null
+++ b/samples/erase/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+ERASE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+ERASE_OBJECTS =  \
+	$(__erase___win32rc) \
+	erase_erase.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___erase___os2_emxbindcmd = $(NM) erase$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep erase$(EXEEXT) ; fi
+#__erase___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___erase___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__erase___win32rc = erase_sample_rc.o
+#__erase_app_Contents_PkgInfo___depname \
+#	= erase.app/Contents/PkgInfo
+#__erase_bundle___depname = erase_bundle
+#____erase_BUNDLE_TGT_REF_DEP = \
+#	$(__erase_app_Contents_PkgInfo___depname)
+#____erase_BUNDLE_TGT_REF_DEP \
+#	= $(__erase_app_Contents_PkgInfo___depname)
+#____erase_BUNDLE_TGT_REF_DEP \
+#	= $(__erase_app_Contents_PkgInfo___depname)
+#____erase_BUNDLE_TGT_REF_DEP \
+#	= $(__erase_app_Contents_PkgInfo___depname)
+#____erase_BUNDLE_TGT_REF_DEP = \
+#	$(__erase_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: erase$(EXEEXT) $(__erase_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f erase$(EXEEXT)
+	rm -rf erase.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc)
+	$(CXX) -o $@ $(ERASE_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__erase___os2_emxbindcmd)
+
+#erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p erase.app/Contents
+#	mkdir -p erase.app/Contents/MacOS
+#	mkdir -p erase.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/erase/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >erase.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >erase.app/Contents/PkgInfo
+#	
+#	
+#	ln -f erase$(EXEEXT) erase.app/Contents/MacOS/erase
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns erase.app/Contents/Resources/wxmac.icns
+
+#erase_bundle: $(____erase_BUNDLE_TGT_REF_DEP)
+
+erase_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+erase_erase.o: $(srcdir)/erase.cpp
+	$(CXXC) -c -o $@ $(ERASE_CXXFLAGS) $(srcdir)/erase.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean erase_bundle
diff --git a/samples/event/Makefile b/samples/event/Makefile
new file mode 100644
index 0000000000..51ef387253
--- /dev/null
+++ b/samples/event/Makefile
@@ -0,0 +1,198 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+EVENT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+EVENT_OBJECTS =  \
+	$(__event___win32rc) \
+	event_event.o \
+	event_gestures.o \
+	event_chessboard.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___event___os2_emxbindcmd = $(NM) event$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep event$(EXEEXT) ; fi
+#__event___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___event___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__event___win32rc = event_sample_rc.o
+#__event_app_Contents_PkgInfo___depname \
+#	= event.app/Contents/PkgInfo
+#__event_bundle___depname = event_bundle
+#____event_BUNDLE_TGT_REF_DEP = \
+#	$(__event_app_Contents_PkgInfo___depname)
+#____event_BUNDLE_TGT_REF_DEP \
+#	= $(__event_app_Contents_PkgInfo___depname)
+#____event_BUNDLE_TGT_REF_DEP \
+#	= $(__event_app_Contents_PkgInfo___depname)
+#____event_BUNDLE_TGT_REF_DEP \
+#	= $(__event_app_Contents_PkgInfo___depname)
+#____event_BUNDLE_TGT_REF_DEP = \
+#	$(__event_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: event$(EXEEXT) $(__event_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f event$(EXEEXT)
+	rm -rf event.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc)
+	$(CXX) -o $@ $(EVENT_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__event___os2_emxbindcmd)
+
+#event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p event.app/Contents
+#	mkdir -p event.app/Contents/MacOS
+#	mkdir -p event.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/event/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >event.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >event.app/Contents/PkgInfo
+#	
+#	
+#	ln -f event$(EXEEXT) event.app/Contents/MacOS/event
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns event.app/Contents/Resources/wxmac.icns
+
+#event_bundle: $(____event_BUNDLE_TGT_REF_DEP)
+
+event_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+event_event.o: $(srcdir)/event.cpp
+	$(CXXC) -c -o $@ $(EVENT_CXXFLAGS) $(srcdir)/event.cpp
+
+event_gestures.o: $(srcdir)/gestures.cpp
+	$(CXXC) -c -o $@ $(EVENT_CXXFLAGS) $(srcdir)/gestures.cpp
+
+event_chessboard.o: $(srcdir)/chessboard.cpp
+	$(CXXC) -c -o $@ $(EVENT_CXXFLAGS) $(srcdir)/chessboard.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean event_bundle
diff --git a/samples/except/Makefile b/samples/except/Makefile
new file mode 100644
index 0000000000..d20c763ebc
--- /dev/null
+++ b/samples/except/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+EXCEPT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+EXCEPT_OBJECTS =  \
+	$(__except___win32rc) \
+	except_except.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___except___os2_emxbindcmd = $(NM) except$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep except$(EXEEXT) ; fi
+#__except___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___except___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__except___win32rc = except_sample_rc.o
+#__except_app_Contents_PkgInfo___depname \
+#	= except.app/Contents/PkgInfo
+#__except_bundle___depname = except_bundle
+#____except_BUNDLE_TGT_REF_DEP = \
+#	$(__except_app_Contents_PkgInfo___depname)
+#____except_BUNDLE_TGT_REF_DEP \
+#	= $(__except_app_Contents_PkgInfo___depname)
+#____except_BUNDLE_TGT_REF_DEP \
+#	= $(__except_app_Contents_PkgInfo___depname)
+#____except_BUNDLE_TGT_REF_DEP \
+#	= $(__except_app_Contents_PkgInfo___depname)
+#____except_BUNDLE_TGT_REF_DEP = \
+#	$(__except_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: except$(EXEEXT) $(__except_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f except$(EXEEXT)
+	rm -rf except.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc)
+	$(CXX) -o $@ $(EXCEPT_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__except___os2_emxbindcmd)
+
+#except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p except.app/Contents
+#	mkdir -p except.app/Contents/MacOS
+#	mkdir -p except.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/except/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >except.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >except.app/Contents/PkgInfo
+#	
+#	
+#	ln -f except$(EXEEXT) except.app/Contents/MacOS/except
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns except.app/Contents/Resources/wxmac.icns
+
+#except_bundle: $(____except_BUNDLE_TGT_REF_DEP)
+
+except_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+except_except.o: $(srcdir)/except.cpp
+	$(CXXC) -c -o $@ $(EXCEPT_CXXFLAGS) $(srcdir)/except.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean except_bundle
diff --git a/samples/exec/Makefile b/samples/exec/Makefile
new file mode 100644
index 0000000000..1eb49b8cfe
--- /dev/null
+++ b/samples/exec/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+EXEC_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+EXEC_OBJECTS =  \
+	$(__exec___win32rc) \
+	exec_exec.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___exec___os2_emxbindcmd = $(NM) exec$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep exec$(EXEEXT) ; fi
+#__exec___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___exec___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__exec___win32rc = exec_sample_rc.o
+#__exec_app_Contents_PkgInfo___depname \
+#	= exec.app/Contents/PkgInfo
+#__exec_bundle___depname = exec_bundle
+#____exec_BUNDLE_TGT_REF_DEP = \
+#	$(__exec_app_Contents_PkgInfo___depname)
+#____exec_BUNDLE_TGT_REF_DEP \
+#	= $(__exec_app_Contents_PkgInfo___depname)
+#____exec_BUNDLE_TGT_REF_DEP \
+#	= $(__exec_app_Contents_PkgInfo___depname)
+#____exec_BUNDLE_TGT_REF_DEP \
+#	= $(__exec_app_Contents_PkgInfo___depname)
+#____exec_BUNDLE_TGT_REF_DEP = \
+#	$(__exec_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: exec$(EXEEXT) $(__exec_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f exec$(EXEEXT)
+	rm -rf exec.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc)
+	$(CXX) -o $@ $(EXEC_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__exec___os2_emxbindcmd)
+
+#exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p exec.app/Contents
+#	mkdir -p exec.app/Contents/MacOS
+#	mkdir -p exec.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/exec/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >exec.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >exec.app/Contents/PkgInfo
+#	
+#	
+#	ln -f exec$(EXEEXT) exec.app/Contents/MacOS/exec
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns exec.app/Contents/Resources/wxmac.icns
+
+#exec_bundle: $(____exec_BUNDLE_TGT_REF_DEP)
+
+exec_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+exec_exec.o: $(srcdir)/exec.cpp
+	$(CXXC) -c -o $@ $(EXEC_CXXFLAGS) $(srcdir)/exec.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean exec_bundle
diff --git a/samples/font/Makefile b/samples/font/Makefile
new file mode 100644
index 0000000000..42501abd64
--- /dev/null
+++ b/samples/font/Makefile
@@ -0,0 +1,204 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+FONT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+FONT_OBJECTS =  \
+	$(__font___win32rc) \
+	font_font.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___font___os2_emxbindcmd = $(NM) font$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep font$(EXEEXT) ; fi
+#__font___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___font___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__font___win32rc = font_sample_rc.o
+#__font_app_Contents_PkgInfo___depname \
+#	= font.app/Contents/PkgInfo
+#__font_bundle___depname = font_bundle
+#____font_BUNDLE_TGT_REF_DEP = \
+#	$(__font_app_Contents_PkgInfo___depname)
+#____font_BUNDLE_TGT_REF_DEP \
+#	= $(__font_app_Contents_PkgInfo___depname)
+#____font_BUNDLE_TGT_REF_DEP \
+#	= $(__font_app_Contents_PkgInfo___depname)
+#____font_BUNDLE_TGT_REF_DEP \
+#	= $(__font_app_Contents_PkgInfo___depname)
+#____font_BUNDLE_TGT_REF_DEP = \
+#	$(__font_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: font$(EXEEXT) $(__font_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f font$(EXEEXT)
+	rm -rf font.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc)
+	$(CXX) -o $@ $(FONT_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__font___os2_emxbindcmd)
+
+#font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns  $(srcdir)/wxprivate.ttf
+#	mkdir -p font.app/Contents
+#	mkdir -p font.app/Contents/MacOS
+#	mkdir -p font.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/font/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >font.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >font.app/Contents/PkgInfo
+#	
+#	
+#	ln -f font$(EXEEXT) font.app/Contents/MacOS/font
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns font.app/Contents/Resources/wxmac.icns
+#	mkdir -p font.app/Contents/Resources/Fonts
+#	cp -f $(srcdir)/wxprivate.ttf font.app/Contents/Resources/Fonts
+
+#font_bundle: $(____font_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in wxprivate.ttf; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+font_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+font_font.o: $(srcdir)/font.cpp
+	$(CXXC) -c -o $@ $(FONT_CXXFLAGS) $(srcdir)/font.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean font_bundle data
diff --git a/samples/fswatcher/Makefile b/samples/fswatcher/Makefile
new file mode 100644
index 0000000000..5a3c9ccee5
--- /dev/null
+++ b/samples/fswatcher/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+FSWATCHER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+FSWATCHER_OBJECTS =  \
+	$(__fswatcher___win32rc) \
+	fswatcher_fswatcher.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___fswatcher___os2_emxbindcmd = $(NM) fswatcher$(EXEEXT) | \
+	if grep -q pmwin.763 ; then emxbind -ep fswatcher$(EXEEXT) ; fi
+#__fswatcher___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fswatcher___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__fswatcher___win32rc = fswatcher_sample_rc.o
+#__fswatcher_app_Contents_PkgInfo___depname \
+#	= fswatcher.app/Contents/PkgInfo
+#__fswatcher_bundle___depname = fswatcher_bundle
+#____fswatcher_BUNDLE_TGT_REF_DEP = \
+#	$(__fswatcher_app_Contents_PkgInfo___depname)
+#____fswatcher_BUNDLE_TGT_REF_DEP \
+#	= $(__fswatcher_app_Contents_PkgInfo___depname)
+#____fswatcher_BUNDLE_TGT_REF_DEP \
+#	= $(__fswatcher_app_Contents_PkgInfo___depname)
+#____fswatcher_BUNDLE_TGT_REF_DEP \
+#	= $(__fswatcher_app_Contents_PkgInfo___depname)
+#____fswatcher_BUNDLE_TGT_REF_DEP = \
+#	$(__fswatcher_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: fswatcher$(EXEEXT) $(__fswatcher_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f fswatcher$(EXEEXT)
+	rm -rf fswatcher.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+fswatcher$(EXEEXT): $(FSWATCHER_OBJECTS) $(__fswatcher___win32rc)
+	$(CXX) -o $@ $(FSWATCHER_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__fswatcher___os2_emxbindcmd)
+
+#fswatcher.app/Contents/PkgInfo: fswatcher$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p fswatcher.app/Contents
+#	mkdir -p fswatcher.app/Contents/MacOS
+#	mkdir -p fswatcher.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/fswatcher/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >fswatcher.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >fswatcher.app/Contents/PkgInfo
+#	
+#	
+#	ln -f fswatcher$(EXEEXT) fswatcher.app/Contents/MacOS/fswatcher
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns fswatcher.app/Contents/Resources/wxmac.icns
+
+#fswatcher_bundle: $(____fswatcher_BUNDLE_TGT_REF_DEP)
+
+fswatcher_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+fswatcher_fswatcher.o: $(srcdir)/fswatcher.cpp
+	$(CXXC) -c -o $@ $(FSWATCHER_CXXFLAGS) $(srcdir)/fswatcher.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean fswatcher_bundle
diff --git a/samples/grid/Makefile b/samples/grid/Makefile
new file mode 100644
index 0000000000..b318d4faab
--- /dev/null
+++ b/samples/grid/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+GRID_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+GRID_OBJECTS =  \
+	$(__grid___win32rc) \
+	grid_griddemo.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___grid___os2_emxbindcmd = $(NM) grid$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep grid$(EXEEXT) ; fi
+#__grid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___grid___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__grid___win32rc = grid_sample_rc.o
+#__grid_app_Contents_PkgInfo___depname \
+#	= grid.app/Contents/PkgInfo
+#__grid_bundle___depname = grid_bundle
+#____grid_BUNDLE_TGT_REF_DEP = \
+#	$(__grid_app_Contents_PkgInfo___depname)
+#____grid_BUNDLE_TGT_REF_DEP \
+#	= $(__grid_app_Contents_PkgInfo___depname)
+#____grid_BUNDLE_TGT_REF_DEP \
+#	= $(__grid_app_Contents_PkgInfo___depname)
+#____grid_BUNDLE_TGT_REF_DEP \
+#	= $(__grid_app_Contents_PkgInfo___depname)
+#____grid_BUNDLE_TGT_REF_DEP = \
+#	$(__grid_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: grid$(EXEEXT) $(__grid_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f grid$(EXEEXT)
+	rm -rf grid.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc)
+	$(CXX) -o $@ $(GRID_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__grid___os2_emxbindcmd)
+
+#grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p grid.app/Contents
+#	mkdir -p grid.app/Contents/MacOS
+#	mkdir -p grid.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/grid/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >grid.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >grid.app/Contents/PkgInfo
+#	
+#	
+#	ln -f grid$(EXEEXT) grid.app/Contents/MacOS/grid
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns grid.app/Contents/Resources/wxmac.icns
+
+#grid_bundle: $(____grid_BUNDLE_TGT_REF_DEP)
+
+grid_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+grid_griddemo.o: $(srcdir)/griddemo.cpp
+	$(CXXC) -c -o $@ $(GRID_CXXFLAGS) $(srcdir)/griddemo.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean grid_bundle
diff --git a/samples/help/Makefile b/samples/help/Makefile
new file mode 100644
index 0000000000..2b4154fcc8
--- /dev/null
+++ b/samples/help/Makefile
@@ -0,0 +1,218 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+HELP_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+HELP_OBJECTS =  \
+	$(__help___win32rc) \
+	help_demo.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___help___os2_emxbindcmd = $(NM) help$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep help$(EXEEXT) ; fi
+#__help___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___help___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__help___win32rc = help_sample_rc.o
+#__help_app_Contents_PkgInfo___depname \
+#	= help.app/Contents/PkgInfo
+#__help_bundle___depname = help_bundle
+#____help_BUNDLE_TGT_REF_DEP = \
+#	$(__help_app_Contents_PkgInfo___depname)
+#____help_BUNDLE_TGT_REF_DEP \
+#	= $(__help_app_Contents_PkgInfo___depname)
+#____help_BUNDLE_TGT_REF_DEP \
+#	= $(__help_app_Contents_PkgInfo___depname)
+#____help_BUNDLE_TGT_REF_DEP \
+#	= $(__help_app_Contents_PkgInfo___depname)
+#____help_BUNDLE_TGT_REF_DEP = \
+#	$(__help_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: help$(EXEEXT) $(__help_bundle___depname) data data_doc
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f help$(EXEEXT)
+	rm -rf help.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
+	$(CXX) -o $@ $(HELP_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__help___os2_emxbindcmd)
+
+#help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p help.app/Contents
+#	mkdir -p help.app/Contents/MacOS
+#	mkdir -p help.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/help/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >help.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >help.app/Contents/PkgInfo
+#	
+#	
+#	ln -f help$(EXEEXT) help.app/Contents/MacOS/help
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns help.app/Contents/Resources/wxmac.icns
+
+#help_bundle: $(____help_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+data_doc: 
+	@mkdir -p ./doc
+	@for f in aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm; do \
+	if test ! -f ./doc/$$f -a ! -d ./doc/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/doc/$$f -newer ./doc/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/doc/$$f ./doc ;; \
+	esac; \
+	done
+
+help_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+help_demo.o: $(srcdir)/demo.cpp
+	$(CXXC) -c -o $@ $(HELP_CXXFLAGS) $(srcdir)/demo.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean help_bundle data data_doc
diff --git a/samples/htlbox/Makefile b/samples/htlbox/Makefile
new file mode 100644
index 0000000000..eefcdb2b3d
--- /dev/null
+++ b/samples/htlbox/Makefile
@@ -0,0 +1,194 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+HTLBOX_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+HTLBOX_OBJECTS =  \
+	$(__htlbox___win32rc) \
+	htlbox_htlbox.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___htlbox___os2_emxbindcmd = $(NM) htlbox$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep htlbox$(EXEEXT) ; fi
+#__htlbox___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htlbox___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__htlbox___win32rc = htlbox_sample_rc.o
+#__htlbox_app_Contents_PkgInfo___depname \
+#	= htlbox.app/Contents/PkgInfo
+#__htlbox_bundle___depname = htlbox_bundle
+#____htlbox_BUNDLE_TGT_REF_DEP = \
+#	$(__htlbox_app_Contents_PkgInfo___depname)
+#____htlbox_BUNDLE_TGT_REF_DEP \
+#	= $(__htlbox_app_Contents_PkgInfo___depname)
+#____htlbox_BUNDLE_TGT_REF_DEP \
+#	= $(__htlbox_app_Contents_PkgInfo___depname)
+#____htlbox_BUNDLE_TGT_REF_DEP \
+#	= $(__htlbox_app_Contents_PkgInfo___depname)
+#____htlbox_BUNDLE_TGT_REF_DEP = \
+#	$(__htlbox_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: htlbox$(EXEEXT) $(__htlbox_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f htlbox$(EXEEXT)
+	rm -rf htlbox.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
+	$(CXX) -o $@ $(HTLBOX_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__htlbox___os2_emxbindcmd)
+
+#htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p htlbox.app/Contents
+#	mkdir -p htlbox.app/Contents/MacOS
+#	mkdir -p htlbox.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/htlbox/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >htlbox.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >htlbox.app/Contents/PkgInfo
+#	
+#	
+#	ln -f htlbox$(EXEEXT) htlbox.app/Contents/MacOS/htlbox
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns htlbox.app/Contents/Resources/wxmac.icns
+
+#htlbox_bundle: $(____htlbox_BUNDLE_TGT_REF_DEP)
+
+htlbox_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+htlbox_htlbox.o: $(srcdir)/htlbox.cpp
+	$(CXXC) -c -o $@ $(HTLBOX_CXXFLAGS) $(srcdir)/htlbox.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean htlbox_bundle
diff --git a/samples/html/Makefile b/samples/html/Makefile
new file mode 100644
index 0000000000..2c3c5bf15b
--- /dev/null
+++ b/samples/html/Makefile
@@ -0,0 +1,84 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+
+### Variables: ###
+
+DESTDIR = 
+
+### Conditionally set variables: ###
+
+
+### Targets: ###
+
+all: about help helpview printing test virtual widget zip
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	-(cd about && $(MAKE) clean)
+	-(cd help && $(MAKE) clean)
+	-(cd helpview && $(MAKE) clean)
+	-(cd printing && $(MAKE) clean)
+	-(cd test && $(MAKE) clean)
+	-(cd virtual && $(MAKE) clean)
+	-(cd widget && $(MAKE) clean)
+	-(cd zip && $(MAKE) clean)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+	-(cd about && $(MAKE) distclean)
+	-(cd help && $(MAKE) distclean)
+	-(cd helpview && $(MAKE) distclean)
+	-(cd printing && $(MAKE) distclean)
+	-(cd test && $(MAKE) distclean)
+	-(cd virtual && $(MAKE) distclean)
+	-(cd widget && $(MAKE) distclean)
+	-(cd zip && $(MAKE) distclean)
+
+about: 
+	(cd about && $(MAKE) all)
+
+help: 
+	(cd help && $(MAKE) all)
+
+helpview: 
+	(cd helpview && $(MAKE) all)
+
+printing: 
+	(cd printing && $(MAKE) all)
+
+test: 
+	(cd test && $(MAKE) all)
+
+virtual: 
+	(cd virtual && $(MAKE) all)
+
+widget: 
+	(cd widget && $(MAKE) all)
+
+zip: 
+	(cd zip && $(MAKE) all)
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean about help helpview printing test \
+	virtual widget zip
diff --git a/samples/html/about/Makefile b/samples/html/about/Makefile
new file mode 100644
index 0000000000..896a2cd931
--- /dev/null
+++ b/samples/html/about/Makefile
@@ -0,0 +1,207 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+ABOUT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+ABOUT_OBJECTS =  \
+	$(__about___win32rc) \
+	about_about.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___about___os2_emxbindcmd = $(NM) about$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep about$(EXEEXT) ; fi
+#__about___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___about___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__about___win32rc = about_sample_rc.o
+#__about_app_Contents_PkgInfo___depname \
+#	= about.app/Contents/PkgInfo
+#__about_bundle___depname = about_bundle
+#____about_BUNDLE_TGT_REF_DEP = \
+#	$(__about_app_Contents_PkgInfo___depname)
+#____about_BUNDLE_TGT_REF_DEP \
+#	= $(__about_app_Contents_PkgInfo___depname)
+#____about_BUNDLE_TGT_REF_DEP \
+#	= $(__about_app_Contents_PkgInfo___depname)
+#____about_BUNDLE_TGT_REF_DEP \
+#	= $(__about_app_Contents_PkgInfo___depname)
+#____about_BUNDLE_TGT_REF_DEP = \
+#	$(__about_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: about$(EXEEXT) $(__about_bundle___depname) data_files
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f about$(EXEEXT)
+	rm -rf about.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
+	$(CXX) -o $@ $(ABOUT_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__about___os2_emxbindcmd)
+
+#about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p about.app/Contents
+#	mkdir -p about.app/Contents/MacOS
+#	mkdir -p about.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/about/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >about.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >about.app/Contents/PkgInfo
+#	
+#	
+#	ln -f about$(EXEEXT) about.app/Contents/MacOS/about
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns about.app/Contents/Resources/wxmac.icns
+
+#about_bundle: $(____about_BUNDLE_TGT_REF_DEP)
+
+data_files: 
+	@mkdir -p ./data
+	@for f in about.htm logo.png; do \
+	if test ! -f ./data/$$f -a ! -d ./data/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/data/$$f -newer ./data/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/data/$$f ./data ;; \
+	esac; \
+	done
+
+about_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+about_about.o: $(srcdir)/about.cpp
+	$(CXXC) -c -o $@ $(ABOUT_CXXFLAGS) $(srcdir)/about.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean about_bundle data_files
diff --git a/samples/html/help/Makefile b/samples/html/help/Makefile
new file mode 100644
index 0000000000..ad40423328
--- /dev/null
+++ b/samples/html/help/Makefile
@@ -0,0 +1,207 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+HTMLHELP_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+HTMLHELP_OBJECTS =  \
+	$(__htmlhelp___win32rc) \
+	htmlhelp_help.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd = $(NM) htmlhelp$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep htmlhelp$(EXEEXT) ; fi
+#__htmlhelp___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__htmlhelp___win32rc = htmlhelp_sample_rc.o
+#__htmlhelp_app_Contents_PkgInfo___depname \
+#	= htmlhelp.app/Contents/PkgInfo
+#__htmlhelp_bundle___depname = htmlhelp_bundle
+#____htmlhelp_BUNDLE_TGT_REF_DEP = \
+#	$(__htmlhelp_app_Contents_PkgInfo___depname)
+#____htmlhelp_BUNDLE_TGT_REF_DEP \
+#	= $(__htmlhelp_app_Contents_PkgInfo___depname)
+#____htmlhelp_BUNDLE_TGT_REF_DEP \
+#	= $(__htmlhelp_app_Contents_PkgInfo___depname)
+#____htmlhelp_BUNDLE_TGT_REF_DEP \
+#	= $(__htmlhelp_app_Contents_PkgInfo___depname)
+#____htmlhelp_BUNDLE_TGT_REF_DEP = \
+#	$(__htmlhelp_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: htmlhelp$(EXEEXT) $(__htmlhelp_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f htmlhelp$(EXEEXT)
+	rm -rf htmlhelp.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc)
+	$(CXX) -o $@ $(HTMLHELP_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__htmlhelp___os2_emxbindcmd)
+
+#htmlhelp.app/Contents/PkgInfo: htmlhelp$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p htmlhelp.app/Contents
+#	mkdir -p htmlhelp.app/Contents/MacOS
+#	mkdir -p htmlhelp.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/htmlhelp/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >htmlhelp.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >htmlhelp.app/Contents/PkgInfo
+#	
+#	
+#	ln -f htmlhelp$(EXEEXT) htmlhelp.app/Contents/MacOS/htmlhelp
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns htmlhelp.app/Contents/Resources/wxmac.icns
+
+#htmlhelp_bundle: $(____htmlhelp_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p ./helpfiles
+	@for f in Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp; do \
+	if test ! -f ./helpfiles/$$f -a ! -d ./helpfiles/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/helpfiles/$$f -newer ./helpfiles/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/helpfiles/$$f ./helpfiles ;; \
+	esac; \
+	done
+
+htmlhelp_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+htmlhelp_help.o: $(srcdir)/help.cpp
+	$(CXXC) -c -o $@ $(HTMLHELP_CXXFLAGS) $(srcdir)/help.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean htmlhelp_bundle data
diff --git a/samples/html/helpview/Makefile b/samples/html/helpview/Makefile
new file mode 100644
index 0000000000..0556b2dd4c
--- /dev/null
+++ b/samples/html/helpview/Makefile
@@ -0,0 +1,207 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+HELPVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+HELPVIEW_OBJECTS =  \
+	$(__helpview___win32rc) \
+	helpview_helpview.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd = $(NM) helpview$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep helpview$(EXEEXT) ; fi
+#__helpview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__helpview___win32rc = helpview_sample_rc.o
+#__helpview_app_Contents_PkgInfo___depname \
+#	= helpview.app/Contents/PkgInfo
+#__helpview_bundle___depname = helpview_bundle
+#____helpview_BUNDLE_TGT_REF_DEP = \
+#	$(__helpview_app_Contents_PkgInfo___depname)
+#____helpview_BUNDLE_TGT_REF_DEP \
+#	= $(__helpview_app_Contents_PkgInfo___depname)
+#____helpview_BUNDLE_TGT_REF_DEP \
+#	= $(__helpview_app_Contents_PkgInfo___depname)
+#____helpview_BUNDLE_TGT_REF_DEP \
+#	= $(__helpview_app_Contents_PkgInfo___depname)
+#____helpview_BUNDLE_TGT_REF_DEP = \
+#	$(__helpview_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: helpview$(EXEEXT) $(__helpview_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f helpview$(EXEEXT)
+	rm -rf helpview.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
+	$(CXX) -o $@ $(HELPVIEW_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__helpview___os2_emxbindcmd)
+
+#helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p helpview.app/Contents
+#	mkdir -p helpview.app/Contents/MacOS
+#	mkdir -p helpview.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/helpview/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >helpview.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >helpview.app/Contents/PkgInfo
+#	
+#	
+#	ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns helpview.app/Contents/Resources/wxmac.icns
+
+#helpview_bundle: $(____helpview_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in test.zip; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+helpview_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+helpview_helpview.o: $(srcdir)/helpview.cpp
+	$(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $(srcdir)/helpview.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean helpview_bundle data
diff --git a/samples/html/printing/Makefile b/samples/html/printing/Makefile
new file mode 100644
index 0000000000..e26b6dc7bd
--- /dev/null
+++ b/samples/html/printing/Makefile
@@ -0,0 +1,212 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+HTMLPRINTING_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+HTMLPRINTING_OBJECTS =  \
+	$(__htmlprinting___win32rc) \
+	htmlprinting_printing.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___htmlprinting___os2_emxbindcmd = $(NM) \
+	htmlprinting$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
+	htmlprinting$(EXEEXT) ; fi
+#__htmlprinting___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htmlprinting___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__htmlprinting___win32rc = htmlprinting_sample_rc.o
+#__htmlprinting_app_Contents_PkgInfo___depname \
+#	= htmlprinting.app/Contents/PkgInfo
+#__htmlprinting_bundle___depname \
+#	= htmlprinting_bundle
+#____htmlprinting_BUNDLE_TGT_REF_DEP = \
+#	$(__htmlprinting_app_Contents_PkgInfo___depname)
+#____htmlprinting_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__htmlprinting_app_Contents_PkgInfo___depname)
+#____htmlprinting_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__htmlprinting_app_Contents_PkgInfo___depname)
+#____htmlprinting_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__htmlprinting_app_Contents_PkgInfo___depname)
+#____htmlprinting_BUNDLE_TGT_REF_DEP \
+#	= $(__htmlprinting_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: htmlprinting$(EXEEXT) $(__htmlprinting_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f htmlprinting$(EXEEXT)
+	rm -rf htmlprinting.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc)
+	$(CXX) -o $@ $(HTMLPRINTING_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__htmlprinting___os2_emxbindcmd)
+
+#htmlprinting.app/Contents/PkgInfo: htmlprinting$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p htmlprinting.app/Contents
+#	mkdir -p htmlprinting.app/Contents/MacOS
+#	mkdir -p htmlprinting.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/htmlprinting/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >htmlprinting.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >htmlprinting.app/Contents/PkgInfo
+#	
+#	
+#	ln -f htmlprinting$(EXEEXT) htmlprinting.app/Contents/MacOS/htmlprinting
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns htmlprinting.app/Contents/Resources/wxmac.icns
+
+#htmlprinting_bundle: $(____htmlprinting_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in logo6.gif test.htm; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+htmlprinting_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+htmlprinting_printing.o: $(srcdir)/printing.cpp
+	$(CXXC) -c -o $@ $(HTMLPRINTING_CXXFLAGS) $(srcdir)/printing.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean htmlprinting_bundle data
diff --git a/samples/html/test/Makefile b/samples/html/test/Makefile
new file mode 100644
index 0000000000..7fc52f0d33
--- /dev/null
+++ b/samples/html/test/Makefile
@@ -0,0 +1,210 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+TEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+TEST_OBJECTS =  \
+	$(__test___win32rc) \
+	test_test.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep test$(EXEEXT) ; fi
+#__test___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___test___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__test___win32rc = test_sample_rc.o
+#__test_app_Contents_PkgInfo___depname \
+#	= test.app/Contents/PkgInfo
+#__test_bundle___depname = test_bundle
+#____test_BUNDLE_TGT_REF_DEP = \
+#	$(__test_app_Contents_PkgInfo___depname)
+#____test_BUNDLE_TGT_REF_DEP \
+#	= $(__test_app_Contents_PkgInfo___depname)
+#____test_BUNDLE_TGT_REF_DEP \
+#	= $(__test_app_Contents_PkgInfo___depname)
+#____test_BUNDLE_TGT_REF_DEP \
+#	= $(__test_app_Contents_PkgInfo___depname)
+#____test_BUNDLE_TGT_REF_DEP = \
+#	$(__test_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_NET_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: test$(EXEEXT) $(__test_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f test$(EXEEXT)
+	rm -rf test.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
+	$(CXX) -o $@ $(TEST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__test___os2_emxbindcmd)
+
+#test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p test.app/Contents
+#	mkdir -p test.app/Contents/MacOS
+#	mkdir -p test.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/test/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >test.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >test.app/Contents/PkgInfo
+#	
+#	
+#	ln -f test$(EXEEXT) test.app/Contents/MacOS/test
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns
+
+#test_bundle: $(____test_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+test_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+test_test.o: $(srcdir)/test.cpp
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/test.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean test_bundle data
diff --git a/samples/html/virtual/Makefile b/samples/html/virtual/Makefile
new file mode 100644
index 0000000000..859bb55bff
--- /dev/null
+++ b/samples/html/virtual/Makefile
@@ -0,0 +1,207 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+VIRTUAL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+VIRTUAL_OBJECTS =  \
+	$(__virtual___win32rc) \
+	virtual_virtual.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd = $(NM) virtual$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep virtual$(EXEEXT) ; fi
+#__virtual___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__virtual___win32rc = virtual_sample_rc.o
+#__virtual_app_Contents_PkgInfo___depname \
+#	= virtual.app/Contents/PkgInfo
+#__virtual_bundle___depname = virtual_bundle
+#____virtual_BUNDLE_TGT_REF_DEP = \
+#	$(__virtual_app_Contents_PkgInfo___depname)
+#____virtual_BUNDLE_TGT_REF_DEP \
+#	= $(__virtual_app_Contents_PkgInfo___depname)
+#____virtual_BUNDLE_TGT_REF_DEP \
+#	= $(__virtual_app_Contents_PkgInfo___depname)
+#____virtual_BUNDLE_TGT_REF_DEP \
+#	= $(__virtual_app_Contents_PkgInfo___depname)
+#____virtual_BUNDLE_TGT_REF_DEP = \
+#	$(__virtual_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: virtual$(EXEEXT) $(__virtual_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f virtual$(EXEEXT)
+	rm -rf virtual.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
+	$(CXX) -o $@ $(VIRTUAL_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__virtual___os2_emxbindcmd)
+
+#virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p virtual.app/Contents
+#	mkdir -p virtual.app/Contents/MacOS
+#	mkdir -p virtual.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/virtual/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >virtual.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >virtual.app/Contents/PkgInfo
+#	
+#	
+#	ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns virtual.app/Contents/Resources/wxmac.icns
+
+#virtual_bundle: $(____virtual_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in start.htm; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+virtual_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+virtual_virtual.o: $(srcdir)/virtual.cpp
+	$(CXXC) -c -o $@ $(VIRTUAL_CXXFLAGS) $(srcdir)/virtual.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean virtual_bundle data
diff --git a/samples/html/widget/Makefile b/samples/html/widget/Makefile
new file mode 100644
index 0000000000..a03daffcdc
--- /dev/null
+++ b/samples/html/widget/Makefile
@@ -0,0 +1,207 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+WIDGET_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+WIDGET_OBJECTS =  \
+	$(__widget___win32rc) \
+	widget_widget.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___widget___os2_emxbindcmd = $(NM) widget$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep widget$(EXEEXT) ; fi
+#__widget___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___widget___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__widget___win32rc = widget_sample_rc.o
+#__widget_app_Contents_PkgInfo___depname \
+#	= widget.app/Contents/PkgInfo
+#__widget_bundle___depname = widget_bundle
+#____widget_BUNDLE_TGT_REF_DEP = \
+#	$(__widget_app_Contents_PkgInfo___depname)
+#____widget_BUNDLE_TGT_REF_DEP \
+#	= $(__widget_app_Contents_PkgInfo___depname)
+#____widget_BUNDLE_TGT_REF_DEP \
+#	= $(__widget_app_Contents_PkgInfo___depname)
+#____widget_BUNDLE_TGT_REF_DEP \
+#	= $(__widget_app_Contents_PkgInfo___depname)
+#____widget_BUNDLE_TGT_REF_DEP = \
+#	$(__widget_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: widget$(EXEEXT) $(__widget_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f widget$(EXEEXT)
+	rm -rf widget.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
+	$(CXX) -o $@ $(WIDGET_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__widget___os2_emxbindcmd)
+
+#widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p widget.app/Contents
+#	mkdir -p widget.app/Contents/MacOS
+#	mkdir -p widget.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/widget/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >widget.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >widget.app/Contents/PkgInfo
+#	
+#	
+#	ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns widget.app/Contents/Resources/wxmac.icns
+
+#widget_bundle: $(____widget_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in start.htm; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+widget_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+widget_widget.o: $(srcdir)/widget.cpp
+	$(CXXC) -c -o $@ $(WIDGET_CXXFLAGS) $(srcdir)/widget.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean widget_bundle data
diff --git a/samples/html/zip/Makefile b/samples/html/zip/Makefile
new file mode 100644
index 0000000000..4c95635fc8
--- /dev/null
+++ b/samples/html/zip/Makefile
@@ -0,0 +1,207 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+ZIP_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+ZIP_OBJECTS =  \
+	$(__zip___win32rc) \
+	zip_zip.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___zip___os2_emxbindcmd = $(NM) zip$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep zip$(EXEEXT) ; fi
+#__zip___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___zip___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__zip___win32rc = zip_sample_rc.o
+#__zip_app_Contents_PkgInfo___depname \
+#	= zip.app/Contents/PkgInfo
+#__zip_bundle___depname = zip_bundle
+#____zip_BUNDLE_TGT_REF_DEP = \
+#	$(__zip_app_Contents_PkgInfo___depname)
+#____zip_BUNDLE_TGT_REF_DEP \
+#	= $(__zip_app_Contents_PkgInfo___depname)
+#____zip_BUNDLE_TGT_REF_DEP \
+#	= $(__zip_app_Contents_PkgInfo___depname)
+#____zip_BUNDLE_TGT_REF_DEP \
+#	= $(__zip_app_Contents_PkgInfo___depname)
+#____zip_BUNDLE_TGT_REF_DEP = \
+#	$(__zip_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: zip$(EXEEXT) $(__zip_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f zip$(EXEEXT)
+	rm -rf zip.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
+	$(CXX) -o $@ $(ZIP_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__zip___os2_emxbindcmd)
+
+#zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p zip.app/Contents
+#	mkdir -p zip.app/Contents/MacOS
+#	mkdir -p zip.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/zip/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >zip.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >zip.app/Contents/PkgInfo
+#	
+#	
+#	ln -f zip$(EXEEXT) zip.app/Contents/MacOS/zip
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns zip.app/Contents/Resources/wxmac.icns
+
+#zip_bundle: $(____zip_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in pages.zip start.htm; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+zip_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+zip_zip.o: $(srcdir)/zip.cpp
+	$(CXXC) -c -o $@ $(ZIP_CXXFLAGS) $(srcdir)/zip.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean zip_bundle data
diff --git a/samples/image/Makefile b/samples/image/Makefile
new file mode 100644
index 0000000000..3a9c4ff1dc
--- /dev/null
+++ b/samples/image/Makefile
@@ -0,0 +1,207 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+IMAGE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+IMAGE_OBJECTS =  \
+	image_image.o \
+	image_canvas.o \
+	$(__image___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___image___os2_emxbindcmd = $(NM) image$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep image$(EXEEXT) ; fi
+#__image___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___image___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__image_app_Contents_PkgInfo___depname \
+#	= image.app/Contents/PkgInfo
+#__image_bundle___depname = image_bundle
+#____image_BUNDLE_TGT_REF_DEP = \
+#	$(__image_app_Contents_PkgInfo___depname)
+#____image_BUNDLE_TGT_REF_DEP \
+#	= $(__image_app_Contents_PkgInfo___depname)
+#____image_BUNDLE_TGT_REF_DEP \
+#	= $(__image_app_Contents_PkgInfo___depname)
+#____image_BUNDLE_TGT_REF_DEP \
+#	= $(__image_app_Contents_PkgInfo___depname)
+#____image_BUNDLE_TGT_REF_DEP = \
+#	$(__image_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__image___win32rc = image_image_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: image$(EXEEXT) $(__image_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f image$(EXEEXT)
+	rm -rf image.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
+	$(CXX) -o $@ $(IMAGE_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__image___os2_emxbindcmd)
+
+#image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns $(srcdir)/cursor.png
+#	mkdir -p image.app/Contents
+#	mkdir -p image.app/Contents/MacOS
+#	mkdir -p image.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/image/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >image.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >image.app/Contents/PkgInfo
+#	
+#	
+#	ln -f image$(EXEEXT) image.app/Contents/MacOS/image
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns image.app/Contents/Resources/wxmac.icns
+#	cp -f $(srcdir)/cursor.png image.app/Contents/Resources
+
+#image_bundle: $(____image_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg cursor.png; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+image_image.o: $(srcdir)/image.cpp
+	$(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $(srcdir)/image.cpp
+
+image_canvas.o: $(srcdir)/canvas.cpp
+	$(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $(srcdir)/canvas.cpp
+
+image_image_rc.o: $(srcdir)/image.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean image_bundle data
diff --git a/samples/internat/Makefile b/samples/internat/Makefile
new file mode 100644
index 0000000000..3291a7b0b4
--- /dev/null
+++ b/samples/internat/Makefile
@@ -0,0 +1,335 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+INTERNAT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+INTERNAT_OBJECTS =  \
+	$(__internat___win32rc) \
+	internat_internat.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___internat___os2_emxbindcmd = $(NM) internat$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep internat$(EXEEXT) ; fi
+#__internat___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___internat___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__internat___win32rc = internat_sample_rc.o
+#__internat_app_Contents_PkgInfo___depname \
+#	= internat.app/Contents/PkgInfo
+#__internat_bundle___depname = internat_bundle
+#____internat_BUNDLE_TGT_REF_DEP = \
+#	$(__internat_app_Contents_PkgInfo___depname)
+#____internat_BUNDLE_TGT_REF_DEP \
+#	= $(__internat_app_Contents_PkgInfo___depname)
+#____internat_BUNDLE_TGT_REF_DEP \
+#	= $(__internat_app_Contents_PkgInfo___depname)
+#____internat_BUNDLE_TGT_REF_DEP \
+#	= $(__internat_app_Contents_PkgInfo___depname)
+#____internat_BUNDLE_TGT_REF_DEP = \
+#	$(__internat_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: internat$(EXEEXT) $(__internat_bundle___depname) ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f internat$(EXEEXT)
+	rm -rf internat.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
+	$(CXX) -o $@ $(INTERNAT_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__internat___os2_emxbindcmd)
+
+#internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p internat.app/Contents
+#	mkdir -p internat.app/Contents/MacOS
+#	mkdir -p internat.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/internat/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >internat.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >internat.app/Contents/PkgInfo
+#	
+#	
+#	ln -f internat$(EXEEXT) internat.app/Contents/MacOS/internat
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns internat.app/Contents/Resources/wxmac.icns
+
+#internat_bundle: $(____internat_BUNDLE_TGT_REF_DEP)
+
+ar: 
+	@mkdir -p ./ar
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./ar/$$f -a ! -d ./ar/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/ar/$$f -newer ./ar/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/ar/$$f ./ar ;; \
+	esac; \
+	done
+
+bg: 
+	@mkdir -p ./bg
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./bg/$$f -a ! -d ./bg/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/bg/$$f -newer ./bg/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/bg/$$f ./bg ;; \
+	esac; \
+	done
+
+cs: 
+	@mkdir -p ./cs
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./cs/$$f -a ! -d ./cs/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/cs/$$f -newer ./cs/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/cs/$$f ./cs ;; \
+	esac; \
+	done
+
+de: 
+	@mkdir -p ./de
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./de/$$f -a ! -d ./de/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/de/$$f -newer ./de/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/de/$$f ./de ;; \
+	esac; \
+	done
+
+fr: 
+	@mkdir -p ./fr
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./fr/$$f -a ! -d ./fr/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/fr/$$f -newer ./fr/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/fr/$$f ./fr ;; \
+	esac; \
+	done
+
+it: 
+	@mkdir -p ./it
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./it/$$f -a ! -d ./it/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/it/$$f -newer ./it/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/it/$$f ./it ;; \
+	esac; \
+	done
+
+ka: 
+	@mkdir -p ./ka
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./ka/$$f -a ! -d ./ka/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/ka/$$f -newer ./ka/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/ka/$$f ./ka ;; \
+	esac; \
+	done
+
+pl: 
+	@mkdir -p ./pl
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./pl/$$f -a ! -d ./pl/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/pl/$$f -newer ./pl/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/pl/$$f ./pl ;; \
+	esac; \
+	done
+
+ru: 
+	@mkdir -p ./ru
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./ru/$$f -a ! -d ./ru/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/ru/$$f -newer ./ru/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/ru/$$f ./ru ;; \
+	esac; \
+	done
+
+sv: 
+	@mkdir -p ./sv
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./sv/$$f -a ! -d ./sv/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/sv/$$f -newer ./sv/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/sv/$$f ./sv ;; \
+	esac; \
+	done
+
+ja: 
+	@mkdir -p ./ja
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./ja/$$f -a ! -d ./ja/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/ja/$$f -newer ./ja/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/ja/$$f ./ja ;; \
+	esac; \
+	done
+
+ja_JP.EUC-JP: 
+	@mkdir -p ./ja_JP.EUC-JP
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./ja_JP.EUC-JP/$$f -a ! -d ./ja_JP.EUC-JP/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/ja_JP.EUC-JP/$$f -newer ./ja_JP.EUC-JP/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/ja_JP.EUC-JP/$$f ./ja_JP.EUC-JP ;; \
+	esac; \
+	done
+
+internat_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+internat_internat.o: $(srcdir)/internat.cpp
+	$(CXXC) -c -o $@ $(INTERNAT_CXXFLAGS) $(srcdir)/internat.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean internat_bundle ar bg cs de fr it ka pl ru \
+	sv ja ja_JP.EUC-JP
diff --git a/samples/ipc/Makefile b/samples/ipc/Makefile
new file mode 100644
index 0000000000..db92e0a22b
--- /dev/null
+++ b/samples/ipc/Makefile
@@ -0,0 +1,283 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -llzma -lm
+LDFLAGS_GUI = 
+CXX = g++
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-3.1
+EXTRALIBS = -pthread   -Wl,--version-script,$(wx_top_builddir)/version-script -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -llzma -lm 
+EXTRALIBS_XML =  -lexpat
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lXtst -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz -ljpeg -ltiff -llzma
+WX_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-3.1 -I${top_srcdir}/include -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gtk-3.0/unix-print -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsecret-1 -I/usr/include/webkitgtk-4.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4  -fvisibility=hidden -fvisibility-inlines-hidden
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = -Wl,-rpath,$(wx_top_builddir)/lib
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+IPCCLIENT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+IPCCLIENT_OBJECTS =  \
+	$(__ipcclient___win32rc) \
+	ipcclient_client.o
+IPCSERVER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+IPCSERVER_OBJECTS =  \
+	$(__ipcserver___win32rc) \
+	ipcserver_server.o
+BASEIPCCLIENT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-DwxUSE_GUI=0 $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+BASEIPCCLIENT_OBJECTS =  \
+	baseipcclient_baseclient.o
+BASEIPCSERVER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-DwxUSE_GUI=0 $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+BASEIPCSERVER_OBJECTS =  \
+	baseipcserver_baseserver.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+__ipcclient___depname = ipcclient$(EXEEXT)
+COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd = $(NM) ipcclient$(EXEEXT) | \
+	if grep -q pmwin.763 ; then emxbind -ep ipcclient$(EXEEXT) ; fi
+#__ipcclient___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd)
+#__ipcclient___win32rc = ipcclient_sample_rc.o
+#__ipcclient_app_Contents_PkgInfo___depname \
+#	= ipcclient.app/Contents/PkgInfo
+#__ipcclient_bundle___depname \
+#	= ipcclient_bundle
+#____ipcclient_BUNDLE_TGT_REF_DEP = \
+#	$(__ipcclient_app_Contents_PkgInfo___depname)
+#____ipcclient_BUNDLE_TGT_REF_DEP = \
+#	$(__ipcclient_app_Contents_PkgInfo___depname)
+#____ipcclient_BUNDLE_TGT_REF_DEP \
+#	= $(__ipcclient_app_Contents_PkgInfo___depname)
+#____ipcclient_BUNDLE_TGT_REF_DEP \
+#	= $(__ipcclient_app_Contents_PkgInfo___depname)
+#____ipcclient_BUNDLE_TGT_REF_DEP \
+#	= $(__ipcclient_app_Contents_PkgInfo___depname)
+__ipcserver___depname = ipcserver$(EXEEXT)
+COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \
+	if grep -q pmwin.763 ; then emxbind -ep ipcserver$(EXEEXT) ; fi
+#__ipcserver___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd)
+#__ipcserver___win32rc = ipcserver_sample_rc.o
+#__ipcserver_app_Contents_PkgInfo___depname \
+#	= ipcserver.app/Contents/PkgInfo
+#__ipcserver_bundle___depname \
+#	= ipcserver_bundle
+#____ipcserver_BUNDLE_TGT_REF_DEP = \
+#	$(__ipcserver_app_Contents_PkgInfo___depname)
+#____ipcserver_BUNDLE_TGT_REF_DEP = \
+#	$(__ipcserver_app_Contents_PkgInfo___depname)
+#____ipcserver_BUNDLE_TGT_REF_DEP \
+#	= $(__ipcserver_app_Contents_PkgInfo___depname)
+#____ipcserver_BUNDLE_TGT_REF_DEP \
+#	= $(__ipcserver_app_Contents_PkgInfo___depname)
+#____ipcserver_BUNDLE_TGT_REF_DEP \
+#	= $(__ipcserver_app_Contents_PkgInfo___depname)
+#__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+#__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p)
+#__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p_0 = --define wxNO_RTTI
+#__THREAD_DEFINE_p_0 = --define wxNO_THREADS
+__DLLFLAG_p_0 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+__DLLFLAG_p = -DWXUSINGDLL
+COND_MONOLITHIC_0___WXLIB_NET_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: $(__ipcclient___depname) $(__ipcclient_bundle___depname) $(__ipcserver___depname) $(__ipcserver_bundle___depname) baseipcclient$(EXEEXT) baseipcserver$(EXEEXT)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f ipcclient$(EXEEXT)
+	rm -rf ipcclient.app
+	rm -f ipcserver$(EXEEXT)
+	rm -rf ipcserver.app
+	rm -f baseipcclient$(EXEEXT)
+	rm -f baseipcserver$(EXEEXT)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+ipcclient$(EXEEXT): $(IPCCLIENT_OBJECTS) $(__ipcclient___win32rc)
+	$(CXX) -o $@ $(IPCCLIENT_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__ipcclient___os2_emxbindcmd)
+
+#ipcclient.app/Contents/PkgInfo: $(__ipcclient___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p ipcclient.app/Contents
+#	mkdir -p ipcclient.app/Contents/MacOS
+#	mkdir -p ipcclient.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/ipcclient/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >ipcclient.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >ipcclient.app/Contents/PkgInfo
+#	
+#	
+#	ln -f ipcclient$(EXEEXT) ipcclient.app/Contents/MacOS/ipcclient
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns ipcclient.app/Contents/Resources/wxmac.icns
+
+#ipcclient_bundle: $(____ipcclient_BUNDLE_TGT_REF_DEP)
+
+ipcserver$(EXEEXT): $(IPCSERVER_OBJECTS) $(__ipcserver___win32rc)
+	$(CXX) -o $@ $(IPCSERVER_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__ipcserver___os2_emxbindcmd)
+
+#ipcserver.app/Contents/PkgInfo: $(__ipcserver___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p ipcserver.app/Contents
+#	mkdir -p ipcserver.app/Contents/MacOS
+#	mkdir -p ipcserver.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/ipcserver/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >ipcserver.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >ipcserver.app/Contents/PkgInfo
+#	
+#	
+#	ln -f ipcserver$(EXEEXT) ipcserver.app/Contents/MacOS/ipcserver
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns ipcserver.app/Contents/Resources/wxmac.icns
+
+#ipcserver_bundle: $(____ipcserver_BUNDLE_TGT_REF_DEP)
+
+baseipcclient$(EXEEXT): $(BASEIPCCLIENT_OBJECTS)
+	$(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+baseipcserver$(EXEEXT): $(BASEIPCSERVER_OBJECTS)
+	$(CXX) -o $@ $(BASEIPCSERVER_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+ipcclient_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)  --include-dir $(srcdir) $(__DLLFLAG_p_0) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+ipcclient_client.o: $(srcdir)/client.cpp
+	$(CXXC) -c -o $@ $(IPCCLIENT_CXXFLAGS) $(srcdir)/client.cpp
+
+ipcserver_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)  --include-dir $(srcdir) $(__DLLFLAG_p_0) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+ipcserver_server.o: $(srcdir)/server.cpp
+	$(CXXC) -c -o $@ $(IPCSERVER_CXXFLAGS) $(srcdir)/server.cpp
+
+baseipcclient_baseclient.o: $(srcdir)/baseclient.cpp
+	$(CXXC) -c -o $@ $(BASEIPCCLIENT_CXXFLAGS) $(srcdir)/baseclient.cpp
+
+baseipcserver_baseserver.o: $(srcdir)/baseserver.cpp
+	$(CXXC) -c -o $@ $(BASEIPCSERVER_CXXFLAGS) $(srcdir)/baseserver.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean ipcclient_bundle ipcserver_bundle
diff --git a/samples/joytest/Makefile b/samples/joytest/Makefile
new file mode 100644
index 0000000000..41354cf9a1
--- /dev/null
+++ b/samples/joytest/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+JOYTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+JOYTEST_OBJECTS =  \
+	$(__joytest___win32rc) \
+	joytest_joytest.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___joytest___os2_emxbindcmd = $(NM) joytest$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep joytest$(EXEEXT) ; fi
+#__joytest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___joytest___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__joytest___win32rc = joytest_sample_rc.o
+#__joytest_app_Contents_PkgInfo___depname \
+#	= joytest.app/Contents/PkgInfo
+#__joytest_bundle___depname = joytest_bundle
+#____joytest_BUNDLE_TGT_REF_DEP = \
+#	$(__joytest_app_Contents_PkgInfo___depname)
+#____joytest_BUNDLE_TGT_REF_DEP \
+#	= $(__joytest_app_Contents_PkgInfo___depname)
+#____joytest_BUNDLE_TGT_REF_DEP \
+#	= $(__joytest_app_Contents_PkgInfo___depname)
+#____joytest_BUNDLE_TGT_REF_DEP \
+#	= $(__joytest_app_Contents_PkgInfo___depname)
+#____joytest_BUNDLE_TGT_REF_DEP = \
+#	$(__joytest_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: joytest$(EXEEXT) $(__joytest_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f joytest$(EXEEXT)
+	rm -rf joytest.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
+	$(CXX) -o $@ $(JOYTEST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__joytest___os2_emxbindcmd)
+
+#joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p joytest.app/Contents
+#	mkdir -p joytest.app/Contents/MacOS
+#	mkdir -p joytest.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/joytest/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >joytest.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >joytest.app/Contents/PkgInfo
+#	
+#	
+#	ln -f joytest$(EXEEXT) joytest.app/Contents/MacOS/joytest
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns joytest.app/Contents/Resources/wxmac.icns
+
+#joytest_bundle: $(____joytest_BUNDLE_TGT_REF_DEP)
+
+joytest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+joytest_joytest.o: $(srcdir)/joytest.cpp
+	$(CXXC) -c -o $@ $(JOYTEST_CXXFLAGS) $(srcdir)/joytest.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean joytest_bundle
diff --git a/samples/keyboard/Makefile b/samples/keyboard/Makefile
new file mode 100644
index 0000000000..ea5862253a
--- /dev/null
+++ b/samples/keyboard/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+KEYBOARD_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+KEYBOARD_OBJECTS =  \
+	$(__keyboard___win32rc) \
+	keyboard_keyboard.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd = $(NM) keyboard$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep keyboard$(EXEEXT) ; fi
+#__keyboard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__keyboard___win32rc = keyboard_sample_rc.o
+#__keyboard_app_Contents_PkgInfo___depname \
+#	= keyboard.app/Contents/PkgInfo
+#__keyboard_bundle___depname = keyboard_bundle
+#____keyboard_BUNDLE_TGT_REF_DEP = \
+#	$(__keyboard_app_Contents_PkgInfo___depname)
+#____keyboard_BUNDLE_TGT_REF_DEP \
+#	= $(__keyboard_app_Contents_PkgInfo___depname)
+#____keyboard_BUNDLE_TGT_REF_DEP \
+#	= $(__keyboard_app_Contents_PkgInfo___depname)
+#____keyboard_BUNDLE_TGT_REF_DEP \
+#	= $(__keyboard_app_Contents_PkgInfo___depname)
+#____keyboard_BUNDLE_TGT_REF_DEP = \
+#	$(__keyboard_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: keyboard$(EXEEXT) $(__keyboard_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f keyboard$(EXEEXT)
+	rm -rf keyboard.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
+	$(CXX) -o $@ $(KEYBOARD_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__keyboard___os2_emxbindcmd)
+
+#keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p keyboard.app/Contents
+#	mkdir -p keyboard.app/Contents/MacOS
+#	mkdir -p keyboard.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/keyboard/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >keyboard.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >keyboard.app/Contents/PkgInfo
+#	
+#	
+#	ln -f keyboard$(EXEEXT) keyboard.app/Contents/MacOS/keyboard
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns keyboard.app/Contents/Resources/wxmac.icns
+
+#keyboard_bundle: $(____keyboard_BUNDLE_TGT_REF_DEP)
+
+keyboard_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+keyboard_keyboard.o: $(srcdir)/keyboard.cpp
+	$(CXXC) -c -o $@ $(KEYBOARD_CXXFLAGS) $(srcdir)/keyboard.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean keyboard_bundle
diff --git a/samples/layout/Makefile b/samples/layout/Makefile
new file mode 100644
index 0000000000..17ffc28543
--- /dev/null
+++ b/samples/layout/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+LAYOUT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+LAYOUT_OBJECTS =  \
+	$(__layout___win32rc) \
+	layout_layout.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___layout___os2_emxbindcmd = $(NM) layout$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep layout$(EXEEXT) ; fi
+#__layout___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___layout___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__layout___win32rc = layout_sample_rc.o
+#__layout_app_Contents_PkgInfo___depname \
+#	= layout.app/Contents/PkgInfo
+#__layout_bundle___depname = layout_bundle
+#____layout_BUNDLE_TGT_REF_DEP = \
+#	$(__layout_app_Contents_PkgInfo___depname)
+#____layout_BUNDLE_TGT_REF_DEP \
+#	= $(__layout_app_Contents_PkgInfo___depname)
+#____layout_BUNDLE_TGT_REF_DEP \
+#	= $(__layout_app_Contents_PkgInfo___depname)
+#____layout_BUNDLE_TGT_REF_DEP \
+#	= $(__layout_app_Contents_PkgInfo___depname)
+#____layout_BUNDLE_TGT_REF_DEP = \
+#	$(__layout_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: layout$(EXEEXT) $(__layout_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f layout$(EXEEXT)
+	rm -rf layout.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
+	$(CXX) -o $@ $(LAYOUT_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__layout___os2_emxbindcmd)
+
+#layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p layout.app/Contents
+#	mkdir -p layout.app/Contents/MacOS
+#	mkdir -p layout.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/layout/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >layout.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >layout.app/Contents/PkgInfo
+#	
+#	
+#	ln -f layout$(EXEEXT) layout.app/Contents/MacOS/layout
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns layout.app/Contents/Resources/wxmac.icns
+
+#layout_bundle: $(____layout_BUNDLE_TGT_REF_DEP)
+
+layout_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+layout_layout.o: $(srcdir)/layout.cpp
+	$(CXXC) -c -o $@ $(LAYOUT_CXXFLAGS) $(srcdir)/layout.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean layout_bundle
diff --git a/samples/listctrl/Makefile b/samples/listctrl/Makefile
new file mode 100644
index 0000000000..edf7c2d7f1
--- /dev/null
+++ b/samples/listctrl/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+LISTCTRL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+LISTCTRL_OBJECTS =  \
+	listctrl_listtest.o \
+	$(__listctrl___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___listctrl___os2_emxbindcmd = $(NM) listctrl$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep listctrl$(EXEEXT) ; fi
+#__listctrl___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___listctrl___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__listctrl_app_Contents_PkgInfo___depname \
+#	= listctrl.app/Contents/PkgInfo
+#__listctrl_bundle___depname = listctrl_bundle
+#____listctrl_BUNDLE_TGT_REF_DEP = \
+#	$(__listctrl_app_Contents_PkgInfo___depname)
+#____listctrl_BUNDLE_TGT_REF_DEP \
+#	= $(__listctrl_app_Contents_PkgInfo___depname)
+#____listctrl_BUNDLE_TGT_REF_DEP \
+#	= $(__listctrl_app_Contents_PkgInfo___depname)
+#____listctrl_BUNDLE_TGT_REF_DEP \
+#	= $(__listctrl_app_Contents_PkgInfo___depname)
+#____listctrl_BUNDLE_TGT_REF_DEP = \
+#	$(__listctrl_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__listctrl___win32rc = listctrl_listtest_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: listctrl$(EXEEXT) $(__listctrl_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f listctrl$(EXEEXT)
+	rm -rf listctrl.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc)
+	$(CXX) -o $@ $(LISTCTRL_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__listctrl___os2_emxbindcmd)
+
+#listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p listctrl.app/Contents
+#	mkdir -p listctrl.app/Contents/MacOS
+#	mkdir -p listctrl.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/listctrl/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >listctrl.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >listctrl.app/Contents/PkgInfo
+#	
+#	
+#	ln -f listctrl$(EXEEXT) listctrl.app/Contents/MacOS/listctrl
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns listctrl.app/Contents/Resources/wxmac.icns
+
+#listctrl_bundle: $(____listctrl_BUNDLE_TGT_REF_DEP)
+
+listctrl_listtest.o: $(srcdir)/listtest.cpp
+	$(CXXC) -c -o $@ $(LISTCTRL_CXXFLAGS) $(srcdir)/listtest.cpp
+
+listctrl_listtest_rc.o: $(srcdir)/listtest.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean listctrl_bundle
diff --git a/samples/mdi/Makefile b/samples/mdi/Makefile
new file mode 100644
index 0000000000..21deda3e36
--- /dev/null
+++ b/samples/mdi/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+MDI_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+MDI_OBJECTS =  \
+	mdi_mdi.o \
+	$(__mdi___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___mdi___os2_emxbindcmd = $(NM) mdi$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep mdi$(EXEEXT) ; fi
+#__mdi___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mdi___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__mdi_app_Contents_PkgInfo___depname \
+#	= mdi.app/Contents/PkgInfo
+#__mdi_bundle___depname = mdi_bundle
+#____mdi_BUNDLE_TGT_REF_DEP = \
+#	$(__mdi_app_Contents_PkgInfo___depname)
+#____mdi_BUNDLE_TGT_REF_DEP \
+#	= $(__mdi_app_Contents_PkgInfo___depname)
+#____mdi_BUNDLE_TGT_REF_DEP \
+#	= $(__mdi_app_Contents_PkgInfo___depname)
+#____mdi_BUNDLE_TGT_REF_DEP \
+#	= $(__mdi_app_Contents_PkgInfo___depname)
+#____mdi_BUNDLE_TGT_REF_DEP = \
+#	$(__mdi_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__mdi___win32rc = mdi_mdi_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: mdi$(EXEEXT) $(__mdi_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f mdi$(EXEEXT)
+	rm -rf mdi.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc)
+	$(CXX) -o $@ $(MDI_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__mdi___os2_emxbindcmd)
+
+#mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p mdi.app/Contents
+#	mkdir -p mdi.app/Contents/MacOS
+#	mkdir -p mdi.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/mdi/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >mdi.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >mdi.app/Contents/PkgInfo
+#	
+#	
+#	ln -f mdi$(EXEEXT) mdi.app/Contents/MacOS/mdi
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns mdi.app/Contents/Resources/wxmac.icns
+
+#mdi_bundle: $(____mdi_BUNDLE_TGT_REF_DEP)
+
+mdi_mdi.o: $(srcdir)/mdi.cpp
+	$(CXXC) -c -o $@ $(MDI_CXXFLAGS) $(srcdir)/mdi.cpp
+
+mdi_mdi_rc.o: $(srcdir)/mdi.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean mdi_bundle
diff --git a/samples/mediaplayer/Makefile b/samples/mediaplayer/Makefile
new file mode 100644
index 0000000000..0d851c2745
--- /dev/null
+++ b/samples/mediaplayer/Makefile
@@ -0,0 +1,197 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_MEDIA = -lgstplayer-1.0 -lgstvideo-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+MEDIAPLAYER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+MEDIAPLAYER_OBJECTS =  \
+	$(__mediaplayer___win32rc) \
+	mediaplayer_mediaplayer.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd = $(NM) \
+	mediaplayer$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
+	mediaplayer$(EXEEXT) ; fi
+#__mediaplayer___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__mediaplayer___win32rc = mediaplayer_sample_rc.o
+#__mediaplayer_app_Contents_PkgInfo___depname \
+#	= mediaplayer.app/Contents/PkgInfo
+#__mediaplayer_bundle___depname = mediaplayer_bundle
+#____mediaplayer_BUNDLE_TGT_REF_DEP = \
+#	$(__mediaplayer_app_Contents_PkgInfo___depname)
+#____mediaplayer_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__mediaplayer_app_Contents_PkgInfo___depname)
+#____mediaplayer_BUNDLE_TGT_REF_DEP \
+#	= $(__mediaplayer_app_Contents_PkgInfo___depname)
+#____mediaplayer_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__mediaplayer_app_Contents_PkgInfo___depname)
+#____mediaplayer_BUNDLE_TGT_REF_DEP \
+#	= $(__mediaplayer_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_MEDIA_p = $(COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: mediaplayer$(EXEEXT) $(__mediaplayer_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f mediaplayer$(EXEEXT)
+	rm -rf mediaplayer.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
+	$(CXX) -o $@ $(MEDIAPLAYER_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__mediaplayer___os2_emxbindcmd)
+
+#mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p mediaplayer.app/Contents
+#	mkdir -p mediaplayer.app/Contents/MacOS
+#	mkdir -p mediaplayer.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/mediaplayer/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >mediaplayer.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >mediaplayer.app/Contents/PkgInfo
+#	
+#	
+#	ln -f mediaplayer$(EXEEXT) mediaplayer.app/Contents/MacOS/mediaplayer
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns mediaplayer.app/Contents/Resources/wxmac.icns
+
+#mediaplayer_bundle: $(____mediaplayer_BUNDLE_TGT_REF_DEP)
+
+mediaplayer_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+mediaplayer_mediaplayer.o: $(srcdir)/mediaplayer.cpp
+	$(CXXC) -c -o $@ $(MEDIAPLAYER_CXXFLAGS) $(srcdir)/mediaplayer.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean mediaplayer_bundle
diff --git a/samples/menu/Makefile b/samples/menu/Makefile
new file mode 100644
index 0000000000..b168719a5f
--- /dev/null
+++ b/samples/menu/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+MENU_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+MENU_OBJECTS =  \
+	$(__menu___win32rc) \
+	menu_menu.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___menu___os2_emxbindcmd = $(NM) menu$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep menu$(EXEEXT) ; fi
+#__menu___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___menu___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__menu___win32rc = menu_sample_rc.o
+#__menu_app_Contents_PkgInfo___depname \
+#	= menu.app/Contents/PkgInfo
+#__menu_bundle___depname = menu_bundle
+#____menu_BUNDLE_TGT_REF_DEP = \
+#	$(__menu_app_Contents_PkgInfo___depname)
+#____menu_BUNDLE_TGT_REF_DEP \
+#	= $(__menu_app_Contents_PkgInfo___depname)
+#____menu_BUNDLE_TGT_REF_DEP \
+#	= $(__menu_app_Contents_PkgInfo___depname)
+#____menu_BUNDLE_TGT_REF_DEP \
+#	= $(__menu_app_Contents_PkgInfo___depname)
+#____menu_BUNDLE_TGT_REF_DEP = \
+#	$(__menu_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: menu$(EXEEXT) $(__menu_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f menu$(EXEEXT)
+	rm -rf menu.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc)
+	$(CXX) -o $@ $(MENU_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__menu___os2_emxbindcmd)
+
+#menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p menu.app/Contents
+#	mkdir -p menu.app/Contents/MacOS
+#	mkdir -p menu.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/menu/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >menu.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >menu.app/Contents/PkgInfo
+#	
+#	
+#	ln -f menu$(EXEEXT) menu.app/Contents/MacOS/menu
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns menu.app/Contents/Resources/wxmac.icns
+
+#menu_bundle: $(____menu_BUNDLE_TGT_REF_DEP)
+
+menu_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+menu_menu.o: $(srcdir)/menu.cpp
+	$(CXXC) -c -o $@ $(MENU_CXXFLAGS) $(srcdir)/menu.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean menu_bundle
diff --git a/samples/minimal/Makefile b/samples/minimal/Makefile
new file mode 100644
index 0000000000..23d9603e41
--- /dev/null
+++ b/samples/minimal/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+MINIMAL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+MINIMAL_OBJECTS =  \
+	$(__minimal___win32rc) \
+	minimal_minimal.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd = $(NM) minimal$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep minimal$(EXEEXT) ; fi
+#__minimal___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__minimal___win32rc = minimal_sample_rc.o
+#__minimal_app_Contents_PkgInfo___depname \
+#	= minimal.app/Contents/PkgInfo
+#__minimal_bundle___depname = minimal_bundle
+#____minimal_BUNDLE_TGT_REF_DEP = \
+#	$(__minimal_app_Contents_PkgInfo___depname)
+#____minimal_BUNDLE_TGT_REF_DEP \
+#	= $(__minimal_app_Contents_PkgInfo___depname)
+#____minimal_BUNDLE_TGT_REF_DEP \
+#	= $(__minimal_app_Contents_PkgInfo___depname)
+#____minimal_BUNDLE_TGT_REF_DEP \
+#	= $(__minimal_app_Contents_PkgInfo___depname)
+#____minimal_BUNDLE_TGT_REF_DEP = \
+#	$(__minimal_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: minimal$(EXEEXT) $(__minimal_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f minimal$(EXEEXT)
+	rm -rf minimal.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
+	$(CXX) -o $@ $(MINIMAL_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__minimal___os2_emxbindcmd)
+
+#minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p minimal.app/Contents
+#	mkdir -p minimal.app/Contents/MacOS
+#	mkdir -p minimal.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/minimal/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >minimal.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >minimal.app/Contents/PkgInfo
+#	
+#	
+#	ln -f minimal$(EXEEXT) minimal.app/Contents/MacOS/minimal
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns minimal.app/Contents/Resources/wxmac.icns
+
+#minimal_bundle: $(____minimal_BUNDLE_TGT_REF_DEP)
+
+minimal_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+minimal_minimal.o: $(srcdir)/minimal.cpp
+	$(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $(srcdir)/minimal.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean minimal_bundle
diff --git a/samples/notebook/Makefile b/samples/notebook/Makefile
new file mode 100644
index 0000000000..ad988f3b31
--- /dev/null
+++ b/samples/notebook/Makefile
@@ -0,0 +1,193 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+NOTEBOOK_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+NOTEBOOK_OBJECTS =  \
+	$(__notebook___win32rc) \
+	notebook_notebook.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___notebook___os2_emxbindcmd = $(NM) notebook$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep notebook$(EXEEXT) ; fi
+#__notebook___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___notebook___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__notebook___win32rc = notebook_sample_rc.o
+#__notebook_app_Contents_PkgInfo___depname \
+#	= notebook.app/Contents/PkgInfo
+#__notebook_bundle___depname = notebook_bundle
+#____notebook_BUNDLE_TGT_REF_DEP = \
+#	$(__notebook_app_Contents_PkgInfo___depname)
+#____notebook_BUNDLE_TGT_REF_DEP \
+#	= $(__notebook_app_Contents_PkgInfo___depname)
+#____notebook_BUNDLE_TGT_REF_DEP \
+#	= $(__notebook_app_Contents_PkgInfo___depname)
+#____notebook_BUNDLE_TGT_REF_DEP \
+#	= $(__notebook_app_Contents_PkgInfo___depname)
+#____notebook_BUNDLE_TGT_REF_DEP = \
+#	$(__notebook_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_AUI_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: notebook$(EXEEXT) $(__notebook_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f notebook$(EXEEXT)
+	rm -rf notebook.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc)
+	$(CXX) -o $@ $(NOTEBOOK_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_AUI_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__notebook___os2_emxbindcmd)
+
+#notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p notebook.app/Contents
+#	mkdir -p notebook.app/Contents/MacOS
+#	mkdir -p notebook.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/notebook/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >notebook.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >notebook.app/Contents/PkgInfo
+#	
+#	
+#	ln -f notebook$(EXEEXT) notebook.app/Contents/MacOS/notebook
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns notebook.app/Contents/Resources/wxmac.icns
+
+#notebook_bundle: $(____notebook_BUNDLE_TGT_REF_DEP)
+
+notebook_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+notebook_notebook.o: $(srcdir)/notebook.cpp
+	$(CXXC) -c -o $@ $(NOTEBOOK_CXXFLAGS) $(srcdir)/notebook.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean notebook_bundle
diff --git a/samples/opengl/Makefile b/samples/opengl/Makefile
new file mode 100644
index 0000000000..8d97ef8389
--- /dev/null
+++ b/samples/opengl/Makefile
@@ -0,0 +1,63 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+
+### Variables: ###
+
+DESTDIR = 
+
+### Conditionally set variables: ###
+
+
+### Targets: ###
+
+all: cube isosurf penguin pyramid
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	-(cd cube && $(MAKE) clean)
+	-(cd isosurf && $(MAKE) clean)
+	-(cd penguin && $(MAKE) clean)
+	-(cd pyramid && $(MAKE) clean)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+	-(cd cube && $(MAKE) distclean)
+	-(cd isosurf && $(MAKE) distclean)
+	-(cd penguin && $(MAKE) distclean)
+	-(cd pyramid && $(MAKE) distclean)
+
+cube: 
+	(cd cube && $(MAKE) all)
+
+isosurf: 
+	(cd isosurf && $(MAKE) all)
+
+penguin: 
+	(cd penguin && $(MAKE) all)
+
+pyramid: 
+	(cd pyramid && $(MAKE) all)
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean cube isosurf penguin pyramid
diff --git a/samples/opengl/cube/Makefile b/samples/opengl/cube/Makefile
new file mode 100644
index 0000000000..a02b1f8784
--- /dev/null
+++ b/samples/opengl/cube/Makefile
@@ -0,0 +1,193 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+EXTRALIBS_OPENGL =  -lGL -lGLU -lEGL  -lwayland-egl -lwayland-client 
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+CUBE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+CUBE_OBJECTS =  \
+	$(__cube___win32rc) \
+	cube_cube.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+__cube___depname = cube$(EXEEXT)
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___cube___os2_emxbindcmd = $(NM) cube$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep cube$(EXEEXT) ; fi
+#__cube___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___cube___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__cube___win32rc = cube_sample_rc.o
+#__cube_app_Contents_PkgInfo___depname \
+#	= cube.app/Contents/PkgInfo
+#__cube_bundle___depname = cube_bundle
+#____cube_BUNDLE_TGT_REF_DEP = \
+#	$(__cube_app_Contents_PkgInfo___depname)
+#____cube_BUNDLE_TGT_REF_DEP \
+#	= $(__cube_app_Contents_PkgInfo___depname)
+#____cube_BUNDLE_TGT_REF_DEP \
+#	= $(__cube_app_Contents_PkgInfo___depname)
+#____cube_BUNDLE_TGT_REF_DEP \
+#	= $(__cube_app_Contents_PkgInfo___depname)
+#____cube_BUNDLE_TGT_REF_DEP = \
+#	$(__cube_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: $(__cube___depname) $(__cube_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f cube$(EXEEXT)
+	rm -rf cube.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc)
+	$(CXX) -o $@ $(CUBE_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__cube___os2_emxbindcmd)
+
+#cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p cube.app/Contents
+#	mkdir -p cube.app/Contents/MacOS
+#	mkdir -p cube.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/cube/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >cube.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >cube.app/Contents/PkgInfo
+#	
+#	
+#	ln -f cube$(EXEEXT) cube.app/Contents/MacOS/cube
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns cube.app/Contents/Resources/wxmac.icns
+
+#cube_bundle: $(____cube_BUNDLE_TGT_REF_DEP)
+
+cube_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+cube_cube.o: $(srcdir)/cube.cpp
+	$(CXXC) -c -o $@ $(CUBE_CXXFLAGS) $(srcdir)/cube.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean cube_bundle
diff --git a/samples/opengl/isosurf/Makefile b/samples/opengl/isosurf/Makefile
new file mode 100644
index 0000000000..1b9dce2b98
--- /dev/null
+++ b/samples/opengl/isosurf/Makefile
@@ -0,0 +1,206 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+EXTRALIBS_OPENGL =  -lGL -lGLU -lEGL  -lwayland-egl -lwayland-client 
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+ISOSURF_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+ISOSURF_OBJECTS =  \
+	$(__isosurf___win32rc) \
+	isosurf_isosurf.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+__isosurf___depname = isosurf$(EXEEXT)
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd = $(NM) isosurf$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep isosurf$(EXEEXT) ; fi
+#__isosurf___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__isosurf___win32rc = isosurf_sample_rc.o
+#__isosurf_app_Contents_PkgInfo___depname \
+#	= isosurf.app/Contents/PkgInfo
+#__isosurf_bundle___depname \
+#	= isosurf_bundle
+#____isosurf_BUNDLE_TGT_REF_DEP = \
+#	$(__isosurf_app_Contents_PkgInfo___depname)
+#____isosurf_BUNDLE_TGT_REF_DEP \
+#	= $(__isosurf_app_Contents_PkgInfo___depname)
+#____isosurf_BUNDLE_TGT_REF_DEP \
+#	= $(__isosurf_app_Contents_PkgInfo___depname)
+#____isosurf_BUNDLE_TGT_REF_DEP \
+#	= $(__isosurf_app_Contents_PkgInfo___depname)
+#____isosurf_BUNDLE_TGT_REF_DEP = \
+#	$(__isosurf_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: $(__isosurf___depname) $(__isosurf_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f isosurf$(EXEEXT)
+	rm -rf isosurf.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc)
+	$(CXX) -o $@ $(ISOSURF_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__isosurf___os2_emxbindcmd)
+
+#isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p isosurf.app/Contents
+#	mkdir -p isosurf.app/Contents/MacOS
+#	mkdir -p isosurf.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/isosurf/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >isosurf.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >isosurf.app/Contents/PkgInfo
+#	
+#	
+#	ln -f isosurf$(EXEEXT) isosurf.app/Contents/MacOS/isosurf
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns isosurf.app/Contents/Resources/wxmac.icns
+
+#isosurf_bundle: $(____isosurf_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in isosurf.dat.gz; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+isosurf_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+isosurf_isosurf.o: $(srcdir)/isosurf.cpp
+	$(CXXC) -c -o $@ $(ISOSURF_CXXFLAGS) $(srcdir)/isosurf.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean isosurf_bundle data
diff --git a/samples/opengl/penguin/Makefile b/samples/opengl/penguin/Makefile
new file mode 100644
index 0000000000..98d7ad9d0c
--- /dev/null
+++ b/samples/opengl/penguin/Makefile
@@ -0,0 +1,223 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CC = clang
+CXX = clang++ -std=c++17
+CFLAGS = 
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+EXTRALIBS_OPENGL =  -lGL -lGLU -lEGL  -lwayland-egl -lwayland-client 
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CFLAGS = -pthread -Wall -Wundef -O2 -D_GNU_SOURCE -fPIC -DPIC  
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+PENGUIN_CFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+PENGUIN_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+PENGUIN_OBJECTS =  \
+	$(__penguin___win32rc) \
+	penguin_penguin.o \
+	penguin_dxfrenderer.o \
+	penguin_trackball.o
+
+### Conditionally set variables: ###
+
+#CCC = $(CC)
+CCC = $(BK_DEPS) $(CC)
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+__penguin___depname = penguin$(EXEEXT)
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd = $(NM) penguin$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep penguin$(EXEEXT) ; fi
+#__penguin___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__penguin___win32rc = penguin_sample_rc.o
+#__penguin_app_Contents_PkgInfo___depname \
+#	= penguin.app/Contents/PkgInfo
+#__penguin_bundle___depname \
+#	= penguin_bundle
+#____penguin_BUNDLE_TGT_REF_DEP = \
+#	$(__penguin_app_Contents_PkgInfo___depname)
+#____penguin_BUNDLE_TGT_REF_DEP \
+#	= $(__penguin_app_Contents_PkgInfo___depname)
+#____penguin_BUNDLE_TGT_REF_DEP \
+#	= $(__penguin_app_Contents_PkgInfo___depname)
+#____penguin_BUNDLE_TGT_REF_DEP \
+#	= $(__penguin_app_Contents_PkgInfo___depname)
+#____penguin_BUNDLE_TGT_REF_DEP = \
+#	$(__penguin_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: $(__penguin___depname) $(__penguin_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f penguin$(EXEEXT)
+	rm -rf penguin.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc)
+	$(CXX) -o $@ $(PENGUIN_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__penguin___os2_emxbindcmd)
+
+#penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p penguin.app/Contents
+#	mkdir -p penguin.app/Contents/MacOS
+#	mkdir -p penguin.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/penguin/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >penguin.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >penguin.app/Contents/PkgInfo
+#	
+#	
+#	ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns penguin.app/Contents/Resources/wxmac.icns
+
+#penguin_bundle: $(____penguin_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in penguin.dxf.gz; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+penguin_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+penguin_penguin.o: $(srcdir)/penguin.cpp
+	$(CXXC) -c -o $@ $(PENGUIN_CXXFLAGS) $(srcdir)/penguin.cpp
+
+penguin_dxfrenderer.o: $(srcdir)/dxfrenderer.cpp
+	$(CXXC) -c -o $@ $(PENGUIN_CXXFLAGS) $(srcdir)/dxfrenderer.cpp
+
+penguin_trackball.o: $(srcdir)/trackball.c
+	$(CCC) -c -o $@ $(PENGUIN_CFLAGS) $(srcdir)/trackball.c
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean penguin_bundle data
diff --git a/samples/opengl/pyramid/Makefile b/samples/opengl/pyramid/Makefile
new file mode 100644
index 0000000000..0286974e97
--- /dev/null
+++ b/samples/opengl/pyramid/Makefile
@@ -0,0 +1,206 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+EXTRALIBS_OPENGL =  -lGL -lGLU -lEGL  -lwayland-egl -lwayland-client 
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+PYRAMID_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+PYRAMID_OBJECTS =  \
+	$(__pyramid___win32rc) \
+	pyramid_pyramid.o \
+	pyramid_oglstuff.o \
+	pyramid_mathstuff.o \
+	pyramid_oglpfuncs.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+__pyramid___depname = pyramid$(EXEEXT)
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___pyramid___os2_emxbindcmd = $(NM) pyramid$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep pyramid$(EXEEXT) ; fi
+#__pyramid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___pyramid___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__pyramid___win32rc = pyramid_sample_rc.o
+#__pyramid_app_Contents_PkgInfo___depname \
+#	= pyramid.app/Contents/PkgInfo
+#__pyramid_bundle___depname \
+#	= pyramid_bundle
+#____pyramid_BUNDLE_TGT_REF_DEP = \
+#	$(__pyramid_app_Contents_PkgInfo___depname)
+#____pyramid_BUNDLE_TGT_REF_DEP \
+#	= $(__pyramid_app_Contents_PkgInfo___depname)
+#____pyramid_BUNDLE_TGT_REF_DEP \
+#	= $(__pyramid_app_Contents_PkgInfo___depname)
+#____pyramid_BUNDLE_TGT_REF_DEP \
+#	= $(__pyramid_app_Contents_PkgInfo___depname)
+#____pyramid_BUNDLE_TGT_REF_DEP = \
+#	$(__pyramid_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: $(__pyramid___depname) $(__pyramid_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f pyramid$(EXEEXT)
+	rm -rf pyramid.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+pyramid$(EXEEXT): $(PYRAMID_OBJECTS) $(__pyramid___win32rc)
+	$(CXX) -o $@ $(PYRAMID_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__pyramid___os2_emxbindcmd)
+
+#pyramid.app/Contents/PkgInfo: $(__pyramid___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p pyramid.app/Contents
+#	mkdir -p pyramid.app/Contents/MacOS
+#	mkdir -p pyramid.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/pyramid/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >pyramid.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >pyramid.app/Contents/PkgInfo
+#	
+#	
+#	ln -f pyramid$(EXEEXT) pyramid.app/Contents/MacOS/pyramid
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns pyramid.app/Contents/Resources/wxmac.icns
+
+#pyramid_bundle: $(____pyramid_BUNDLE_TGT_REF_DEP)
+
+pyramid_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+pyramid_pyramid.o: $(srcdir)/pyramid.cpp
+	$(CXXC) -c -o $@ $(PYRAMID_CXXFLAGS) $(srcdir)/pyramid.cpp
+
+pyramid_oglstuff.o: $(srcdir)/oglstuff.cpp
+	$(CXXC) -c -o $@ $(PYRAMID_CXXFLAGS) $(srcdir)/oglstuff.cpp
+
+pyramid_mathstuff.o: $(srcdir)/mathstuff.cpp
+	$(CXXC) -c -o $@ $(PYRAMID_CXXFLAGS) $(srcdir)/mathstuff.cpp
+
+pyramid_oglpfuncs.o: $(srcdir)/oglpfuncs.cpp
+	$(CXXC) -c -o $@ $(PYRAMID_CXXFLAGS) $(srcdir)/oglpfuncs.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean pyramid_bundle
diff --git a/samples/popup/Makefile b/samples/popup/Makefile
new file mode 100644
index 0000000000..2de4f3fe1e
--- /dev/null
+++ b/samples/popup/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+POPUP_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+POPUP_OBJECTS =  \
+	popup_popup.o \
+	$(__popup___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___popup___os2_emxbindcmd = $(NM) popup$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep popup$(EXEEXT) ; fi
+#__popup___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___popup___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__popup_app_Contents_PkgInfo___depname \
+#	= popup.app/Contents/PkgInfo
+#__popup_bundle___depname = popup_bundle
+#____popup_BUNDLE_TGT_REF_DEP = \
+#	$(__popup_app_Contents_PkgInfo___depname)
+#____popup_BUNDLE_TGT_REF_DEP \
+#	= $(__popup_app_Contents_PkgInfo___depname)
+#____popup_BUNDLE_TGT_REF_DEP \
+#	= $(__popup_app_Contents_PkgInfo___depname)
+#____popup_BUNDLE_TGT_REF_DEP \
+#	= $(__popup_app_Contents_PkgInfo___depname)
+#____popup_BUNDLE_TGT_REF_DEP = \
+#	$(__popup_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__popup___win32rc = popup_sample_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: popup$(EXEEXT) $(__popup_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f popup$(EXEEXT)
+	rm -rf popup.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc)
+	$(CXX) -o $@ $(POPUP_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__popup___os2_emxbindcmd)
+
+#popup.app/Contents/PkgInfo: popup$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p popup.app/Contents
+#	mkdir -p popup.app/Contents/MacOS
+#	mkdir -p popup.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/popup/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >popup.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >popup.app/Contents/PkgInfo
+#	
+#	
+#	ln -f popup$(EXEEXT) popup.app/Contents/MacOS/popup
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns popup.app/Contents/Resources/wxmac.icns
+
+#popup_bundle: $(____popup_BUNDLE_TGT_REF_DEP)
+
+popup_popup.o: $(srcdir)/popup.cpp
+	$(CXXC) -c -o $@ $(POPUP_CXXFLAGS) $(srcdir)/popup.cpp
+
+popup_sample_rc.o: $(srcdir)/../sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean popup_bundle
diff --git a/samples/power/Makefile b/samples/power/Makefile
new file mode 100644
index 0000000000..a698204970
--- /dev/null
+++ b/samples/power/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+POWER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+POWER_OBJECTS =  \
+	$(__power___win32rc) \
+	power_power.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___power___os2_emxbindcmd = $(NM) power$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep power$(EXEEXT) ; fi
+#__power___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___power___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__power___win32rc = power_sample_rc.o
+#__power_app_Contents_PkgInfo___depname \
+#	= power.app/Contents/PkgInfo
+#__power_bundle___depname = power_bundle
+#____power_BUNDLE_TGT_REF_DEP = \
+#	$(__power_app_Contents_PkgInfo___depname)
+#____power_BUNDLE_TGT_REF_DEP \
+#	= $(__power_app_Contents_PkgInfo___depname)
+#____power_BUNDLE_TGT_REF_DEP \
+#	= $(__power_app_Contents_PkgInfo___depname)
+#____power_BUNDLE_TGT_REF_DEP \
+#	= $(__power_app_Contents_PkgInfo___depname)
+#____power_BUNDLE_TGT_REF_DEP = \
+#	$(__power_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: power$(EXEEXT) $(__power_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f power$(EXEEXT)
+	rm -rf power.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc)
+	$(CXX) -o $@ $(POWER_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__power___os2_emxbindcmd)
+
+#power.app/Contents/PkgInfo: power$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p power.app/Contents
+#	mkdir -p power.app/Contents/MacOS
+#	mkdir -p power.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/power/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >power.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >power.app/Contents/PkgInfo
+#	
+#	
+#	ln -f power$(EXEEXT) power.app/Contents/MacOS/power
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns power.app/Contents/Resources/wxmac.icns
+
+#power_bundle: $(____power_BUNDLE_TGT_REF_DEP)
+
+power_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+power_power.o: $(srcdir)/power.cpp
+	$(CXXC) -c -o $@ $(POWER_CXXFLAGS) $(srcdir)/power.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean power_bundle
diff --git a/samples/preferences/Makefile b/samples/preferences/Makefile
new file mode 100644
index 0000000000..018c8098b0
--- /dev/null
+++ b/samples/preferences/Makefile
@@ -0,0 +1,193 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+PREFERENCES_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+PREFERENCES_OBJECTS =  \
+	$(__preferences___win32rc) \
+	preferences_preferences.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___preferences___os2_emxbindcmd = $(NM) \
+	preferences$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
+	preferences$(EXEEXT) ; fi
+#__preferences___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___preferences___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__preferences___win32rc = preferences_sample_rc.o
+#__preferences_app_Contents_PkgInfo___depname \
+#	= preferences.app/Contents/PkgInfo
+#__preferences_bundle___depname = preferences_bundle
+#____preferences_BUNDLE_TGT_REF_DEP = \
+#	$(__preferences_app_Contents_PkgInfo___depname)
+#____preferences_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__preferences_app_Contents_PkgInfo___depname)
+#____preferences_BUNDLE_TGT_REF_DEP \
+#	= $(__preferences_app_Contents_PkgInfo___depname)
+#____preferences_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__preferences_app_Contents_PkgInfo___depname)
+#____preferences_BUNDLE_TGT_REF_DEP \
+#	= $(__preferences_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: preferences$(EXEEXT) $(__preferences_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f preferences$(EXEEXT)
+	rm -rf preferences.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+preferences$(EXEEXT): $(PREFERENCES_OBJECTS) $(__preferences___win32rc)
+	$(CXX) -o $@ $(PREFERENCES_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__preferences___os2_emxbindcmd)
+
+#preferences.app/Contents/PkgInfo: preferences$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p preferences.app/Contents
+#	mkdir -p preferences.app/Contents/MacOS
+#	mkdir -p preferences.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/preferences/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >preferences.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >preferences.app/Contents/PkgInfo
+#	
+#	
+#	ln -f preferences$(EXEEXT) preferences.app/Contents/MacOS/preferences
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns preferences.app/Contents/Resources/wxmac.icns
+
+#preferences_bundle: $(____preferences_BUNDLE_TGT_REF_DEP)
+
+preferences_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+preferences_preferences.o: $(srcdir)/preferences.cpp
+	$(CXXC) -c -o $@ $(PREFERENCES_CXXFLAGS) $(srcdir)/preferences.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean preferences_bundle
diff --git a/samples/printing/Makefile b/samples/printing/Makefile
new file mode 100644
index 0000000000..40b74b3b7e
--- /dev/null
+++ b/samples/printing/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+PRINTING_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+PRINTING_OBJECTS =  \
+	$(__printing___win32rc) \
+	printing_printing.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___printing___os2_emxbindcmd = $(NM) printing$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep printing$(EXEEXT) ; fi
+#__printing___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___printing___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__printing___win32rc = printing_sample_rc.o
+#__printing_app_Contents_PkgInfo___depname \
+#	= printing.app/Contents/PkgInfo
+#__printing_bundle___depname = printing_bundle
+#____printing_BUNDLE_TGT_REF_DEP = \
+#	$(__printing_app_Contents_PkgInfo___depname)
+#____printing_BUNDLE_TGT_REF_DEP \
+#	= $(__printing_app_Contents_PkgInfo___depname)
+#____printing_BUNDLE_TGT_REF_DEP \
+#	= $(__printing_app_Contents_PkgInfo___depname)
+#____printing_BUNDLE_TGT_REF_DEP \
+#	= $(__printing_app_Contents_PkgInfo___depname)
+#____printing_BUNDLE_TGT_REF_DEP = \
+#	$(__printing_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: printing$(EXEEXT) $(__printing_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f printing$(EXEEXT)
+	rm -rf printing.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
+	$(CXX) -o $@ $(PRINTING_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__printing___os2_emxbindcmd)
+
+#printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p printing.app/Contents
+#	mkdir -p printing.app/Contents/MacOS
+#	mkdir -p printing.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/printing/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >printing.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >printing.app/Contents/PkgInfo
+#	
+#	
+#	ln -f printing$(EXEEXT) printing.app/Contents/MacOS/printing
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns printing.app/Contents/Resources/wxmac.icns
+
+#printing_bundle: $(____printing_BUNDLE_TGT_REF_DEP)
+
+printing_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+printing_printing.o: $(srcdir)/printing.cpp
+	$(CXXC) -c -o $@ $(PRINTING_CXXFLAGS) $(srcdir)/printing.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean printing_bundle
diff --git a/samples/propgrid/Makefile b/samples/propgrid/Makefile
new file mode 100644
index 0000000000..db1eb491c3
--- /dev/null
+++ b/samples/propgrid/Makefile
@@ -0,0 +1,205 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+PROPGRID_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+PROPGRID_OBJECTS =  \
+	propgrid_propgrid.o \
+	propgrid_propgrid_minimal.o \
+	propgrid_sampleprops.o \
+	propgrid_tests.o \
+	$(__propgrid___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___propgrid___os2_emxbindcmd = $(NM) propgrid$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep propgrid$(EXEEXT) ; fi
+#__propgrid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___propgrid___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__propgrid_app_Contents_PkgInfo___depname \
+#	= propgrid.app/Contents/PkgInfo
+#__propgrid_bundle___depname = propgrid_bundle
+#____propgrid_BUNDLE_TGT_REF_DEP = \
+#	$(__propgrid_app_Contents_PkgInfo___depname)
+#____propgrid_BUNDLE_TGT_REF_DEP \
+#	= $(__propgrid_app_Contents_PkgInfo___depname)
+#____propgrid_BUNDLE_TGT_REF_DEP \
+#	= $(__propgrid_app_Contents_PkgInfo___depname)
+#____propgrid_BUNDLE_TGT_REF_DEP \
+#	= $(__propgrid_app_Contents_PkgInfo___depname)
+#____propgrid_BUNDLE_TGT_REF_DEP = \
+#	$(__propgrid_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_PROPGRID_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_PROPGRID_p = $(COND_MONOLITHIC_0___WXLIB_PROPGRID_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__propgrid___win32rc = propgrid_sample_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: propgrid$(EXEEXT) $(__propgrid_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f propgrid$(EXEEXT)
+	rm -rf propgrid.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+propgrid$(EXEEXT): $(PROPGRID_OBJECTS) $(__propgrid___win32rc)
+	$(CXX) -o $@ $(PROPGRID_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_PROPGRID_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__propgrid___os2_emxbindcmd)
+
+#propgrid.app/Contents/PkgInfo: propgrid$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p propgrid.app/Contents
+#	mkdir -p propgrid.app/Contents/MacOS
+#	mkdir -p propgrid.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/propgrid/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >propgrid.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >propgrid.app/Contents/PkgInfo
+#	
+#	
+#	ln -f propgrid$(EXEEXT) propgrid.app/Contents/MacOS/propgrid
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns propgrid.app/Contents/Resources/wxmac.icns
+
+#propgrid_bundle: $(____propgrid_BUNDLE_TGT_REF_DEP)
+
+propgrid_propgrid.o: $(srcdir)/propgrid.cpp
+	$(CXXC) -c -o $@ $(PROPGRID_CXXFLAGS) $(srcdir)/propgrid.cpp
+
+propgrid_propgrid_minimal.o: $(srcdir)/propgrid_minimal.cpp
+	$(CXXC) -c -o $@ $(PROPGRID_CXXFLAGS) $(srcdir)/propgrid_minimal.cpp
+
+propgrid_sampleprops.o: $(srcdir)/sampleprops.cpp
+	$(CXXC) -c -o $@ $(PROPGRID_CXXFLAGS) $(srcdir)/sampleprops.cpp
+
+propgrid_tests.o: $(srcdir)/tests.cpp
+	$(CXXC) -c -o $@ $(PROPGRID_CXXFLAGS) $(srcdir)/tests.cpp
+
+propgrid_sample_rc.o: $(srcdir)/../sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean propgrid_bundle
diff --git a/samples/render/Makefile b/samples/render/Makefile
new file mode 100644
index 0000000000..acb307a99b
--- /dev/null
+++ b/samples/render/Makefile
@@ -0,0 +1,238 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+SHARED_LD_MODULE_CXX = $(CXX) -shared -fPIC -o
+SO_SUFFIX_MODULE = so
+EXEEXT = 
+WINDRES = 
+PIC_FLAG = -fPIC -DPIC
+STRIP = strip
+NM = nm
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DIR = mkdir -p
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+libdir = ${exec_prefix}/lib
+DLLPREFIX_MODULE = 
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_RELEASE_NODOT = 31
+WX_VERSION = $(WX_RELEASE).5
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+LIBDIRNAME = $(wx_top_builddir)/lib
+PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
+RENDER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+RENDER_OBJECTS =  \
+	$(__render___win32rc) \
+	render_render.o
+RENDDLL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -DWXUSINGDLL $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+RENDDLL_OBJECTS =  \
+	renddll_renddll.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#COMPILER_VERSION \
+#	= \
+#	ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+#WXCOMPILER = _gcc
+#WXCOMPILER \
+#	= _gcc$(COMPILER_VERSION)
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#PLUGIN_VERSION0 = $(WX_VERSION_NODOT)
+PLUGIN_VERSION0 = $(WX_VERSION)
+#PLUGVERDELIM = 
+PLUGVERDELIM = -
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___render___os2_emxbindcmd = $(NM) render$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep render$(EXEEXT) ; fi
+#__render___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___render___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__render___win32rc = render_sample_rc.o
+#__render_app_Contents_PkgInfo___depname \
+#	= render.app/Contents/PkgInfo
+#__render_bundle___depname = render_bundle
+#____render_BUNDLE_TGT_REF_DEP = \
+#	$(__render_app_Contents_PkgInfo___depname)
+#____render_BUNDLE_TGT_REF_DEP \
+#	= $(__render_app_Contents_PkgInfo___depname)
+#____render_BUNDLE_TGT_REF_DEP \
+#	= $(__render_app_Contents_PkgInfo___depname)
+#____render_BUNDLE_TGT_REF_DEP \
+#	= $(__render_app_Contents_PkgInfo___depname)
+#____render_BUNDLE_TGT_REF_DEP = \
+#	$(__render_app_Contents_PkgInfo___depname)
+COND_SHARED_1___renddll___depname = \
+	$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+#__renddll___depname = $(COND_SHARED_1___renddll___depname)
+#__install_renddll___depname = install_renddll
+#__uninstall_renddll___depname = uninstall_renddll
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: render$(EXEEXT) $(__render_bundle___depname) $(__renddll___depname)
+
+install: $(__install_renddll___depname)
+
+uninstall: $(__uninstall_renddll___depname)
+
+install-strip: install
+	$(STRIP) $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f render$(EXEEXT)
+	rm -rf render.app
+	rm -f $(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
+	$(CXX) -o $@ $(RENDER_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__render___os2_emxbindcmd)
+
+#render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p render.app/Contents
+#	mkdir -p render.app/Contents/MacOS
+#	mkdir -p render.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/render/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >render.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >render.app/Contents/PkgInfo
+#	
+#	
+#	ln -f render$(EXEEXT) render.app/Contents/MacOS/render
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns render.app/Contents/Resources/wxmac.icns
+
+#render_bundle: $(____render_BUNDLE_TGT_REF_DEP)
+
+#$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS)
+#	$(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+#install_renddll: $(__renddll___depname)
+#	$(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)
+#	$(INSTALL_PROGRAM) $(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) $(DESTDIR)$(PLUGINS_INST_DIR)
+
+#uninstall_renddll: 
+#	rm -f $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+
+render_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+render_render.o: $(srcdir)/render.cpp
+	$(CXXC) -c -o $@ $(RENDER_CXXFLAGS) $(srcdir)/render.cpp
+
+renddll_renddll.o: $(srcdir)/renddll.cpp
+	$(CXXC) -c -o $@ $(RENDDLL_CXXFLAGS) $(srcdir)/renddll.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean render_bundle install_renddll \
+	uninstall_renddll
diff --git a/samples/ribbon/Makefile b/samples/ribbon/Makefile
new file mode 100644
index 0000000000..ba2e9c08e5
--- /dev/null
+++ b/samples/ribbon/Makefile
@@ -0,0 +1,193 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+RIBBON_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+RIBBON_OBJECTS =  \
+	ribbon_ribbondemo.o \
+	$(__ribbon___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___ribbon___os2_emxbindcmd = $(NM) ribbon$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep ribbon$(EXEEXT) ; fi
+#__ribbon___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ribbon___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__ribbon_app_Contents_PkgInfo___depname \
+#	= ribbon.app/Contents/PkgInfo
+#__ribbon_bundle___depname = ribbon_bundle
+#____ribbon_BUNDLE_TGT_REF_DEP = \
+#	$(__ribbon_app_Contents_PkgInfo___depname)
+#____ribbon_BUNDLE_TGT_REF_DEP \
+#	= $(__ribbon_app_Contents_PkgInfo___depname)
+#____ribbon_BUNDLE_TGT_REF_DEP \
+#	= $(__ribbon_app_Contents_PkgInfo___depname)
+#____ribbon_BUNDLE_TGT_REF_DEP \
+#	= $(__ribbon_app_Contents_PkgInfo___depname)
+#____ribbon_BUNDLE_TGT_REF_DEP = \
+#	$(__ribbon_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_RIBBON_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_RIBBON_p = $(COND_MONOLITHIC_0___WXLIB_RIBBON_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__ribbon___win32rc = ribbon_sample_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: ribbon$(EXEEXT) $(__ribbon_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f ribbon$(EXEEXT)
+	rm -rf ribbon.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+ribbon$(EXEEXT): $(RIBBON_OBJECTS) $(__ribbon___win32rc)
+	$(CXX) -o $@ $(RIBBON_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_RIBBON_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__ribbon___os2_emxbindcmd)
+
+#ribbon.app/Contents/PkgInfo: ribbon$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p ribbon.app/Contents
+#	mkdir -p ribbon.app/Contents/MacOS
+#	mkdir -p ribbon.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/ribbon/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >ribbon.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >ribbon.app/Contents/PkgInfo
+#	
+#	
+#	ln -f ribbon$(EXEEXT) ribbon.app/Contents/MacOS/ribbon
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns ribbon.app/Contents/Resources/wxmac.icns
+
+#ribbon_bundle: $(____ribbon_BUNDLE_TGT_REF_DEP)
+
+ribbon_ribbondemo.o: $(srcdir)/ribbondemo.cpp
+	$(CXXC) -c -o $@ $(RIBBON_CXXFLAGS) $(srcdir)/ribbondemo.cpp
+
+ribbon_sample_rc.o: $(srcdir)/../sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean ribbon_bundle
diff --git a/samples/richtext/Makefile b/samples/richtext/Makefile
new file mode 100644
index 0000000000..a6050156e9
--- /dev/null
+++ b/samples/richtext/Makefile
@@ -0,0 +1,200 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+RICHTEXT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+RICHTEXT_OBJECTS =  \
+	richtext_richtext.o \
+	$(__richtext___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___richtext___os2_emxbindcmd = $(NM) richtext$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep richtext$(EXEEXT) ; fi
+#__richtext___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___richtext___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__richtext_app_Contents_PkgInfo___depname \
+#	= richtext.app/Contents/PkgInfo
+#__richtext_bundle___depname = richtext_bundle
+#____richtext_BUNDLE_TGT_REF_DEP = \
+#	$(__richtext_app_Contents_PkgInfo___depname)
+#____richtext_BUNDLE_TGT_REF_DEP \
+#	= $(__richtext_app_Contents_PkgInfo___depname)
+#____richtext_BUNDLE_TGT_REF_DEP \
+#	= $(__richtext_app_Contents_PkgInfo___depname)
+#____richtext_BUNDLE_TGT_REF_DEP \
+#	= $(__richtext_app_Contents_PkgInfo___depname)
+#____richtext_BUNDLE_TGT_REF_DEP = \
+#	$(__richtext_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_RICHTEXT_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_RICHTEXT_p = $(COND_MONOLITHIC_0___WXLIB_RICHTEXT_p)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_XML_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__richtext___win32rc = richtext_sample_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: richtext$(EXEEXT) $(__richtext_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f richtext$(EXEEXT)
+	rm -rf richtext.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+richtext$(EXEEXT): $(RICHTEXT_OBJECTS) $(__richtext___win32rc)
+	$(CXX) -o $@ $(RICHTEXT_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__richtext___os2_emxbindcmd)
+
+#richtext.app/Contents/PkgInfo: richtext$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p richtext.app/Contents
+#	mkdir -p richtext.app/Contents/MacOS
+#	mkdir -p richtext.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/richtext/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >richtext.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >richtext.app/Contents/PkgInfo
+#	
+#	
+#	ln -f richtext$(EXEEXT) richtext.app/Contents/MacOS/richtext
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns richtext.app/Contents/Resources/wxmac.icns
+
+#richtext_bundle: $(____richtext_BUNDLE_TGT_REF_DEP)
+
+richtext_richtext.o: $(srcdir)/richtext.cpp
+	$(CXXC) -c -o $@ $(RICHTEXT_CXXFLAGS) $(srcdir)/richtext.cpp
+
+richtext_sample_rc.o: $(srcdir)/../sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean richtext_bundle
diff --git a/samples/sashtest/Makefile b/samples/sashtest/Makefile
new file mode 100644
index 0000000000..1a86d439ba
--- /dev/null
+++ b/samples/sashtest/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+SASHTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+SASHTEST_OBJECTS =  \
+	sashtest_sashtest.o \
+	$(__sashtest___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___sashtest___os2_emxbindcmd = $(NM) sashtest$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep sashtest$(EXEEXT) ; fi
+#__sashtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___sashtest___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__sashtest_app_Contents_PkgInfo___depname \
+#	= sashtest.app/Contents/PkgInfo
+#__sashtest_bundle___depname = sashtest_bundle
+#____sashtest_BUNDLE_TGT_REF_DEP = \
+#	$(__sashtest_app_Contents_PkgInfo___depname)
+#____sashtest_BUNDLE_TGT_REF_DEP \
+#	= $(__sashtest_app_Contents_PkgInfo___depname)
+#____sashtest_BUNDLE_TGT_REF_DEP \
+#	= $(__sashtest_app_Contents_PkgInfo___depname)
+#____sashtest_BUNDLE_TGT_REF_DEP \
+#	= $(__sashtest_app_Contents_PkgInfo___depname)
+#____sashtest_BUNDLE_TGT_REF_DEP = \
+#	$(__sashtest_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__sashtest___win32rc = sashtest_sashtest_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: sashtest$(EXEEXT) $(__sashtest_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f sashtest$(EXEEXT)
+	rm -rf sashtest.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc)
+	$(CXX) -o $@ $(SASHTEST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__sashtest___os2_emxbindcmd)
+
+#sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p sashtest.app/Contents
+#	mkdir -p sashtest.app/Contents/MacOS
+#	mkdir -p sashtest.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/sashtest/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >sashtest.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >sashtest.app/Contents/PkgInfo
+#	
+#	
+#	ln -f sashtest$(EXEEXT) sashtest.app/Contents/MacOS/sashtest
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns sashtest.app/Contents/Resources/wxmac.icns
+
+#sashtest_bundle: $(____sashtest_BUNDLE_TGT_REF_DEP)
+
+sashtest_sashtest.o: $(srcdir)/sashtest.cpp
+	$(CXXC) -c -o $@ $(SASHTEST_CXXFLAGS) $(srcdir)/sashtest.cpp
+
+sashtest_sashtest_rc.o: $(srcdir)/sashtest.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean sashtest_bundle
diff --git a/samples/scroll/Makefile b/samples/scroll/Makefile
new file mode 100644
index 0000000000..9bfb4dc30b
--- /dev/null
+++ b/samples/scroll/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+SCROLL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+SCROLL_OBJECTS =  \
+	$(__scroll___win32rc) \
+	scroll_scroll.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___scroll___os2_emxbindcmd = $(NM) scroll$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep scroll$(EXEEXT) ; fi
+#__scroll___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___scroll___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__scroll___win32rc = scroll_sample_rc.o
+#__scroll_app_Contents_PkgInfo___depname \
+#	= scroll.app/Contents/PkgInfo
+#__scroll_bundle___depname = scroll_bundle
+#____scroll_BUNDLE_TGT_REF_DEP = \
+#	$(__scroll_app_Contents_PkgInfo___depname)
+#____scroll_BUNDLE_TGT_REF_DEP \
+#	= $(__scroll_app_Contents_PkgInfo___depname)
+#____scroll_BUNDLE_TGT_REF_DEP \
+#	= $(__scroll_app_Contents_PkgInfo___depname)
+#____scroll_BUNDLE_TGT_REF_DEP \
+#	= $(__scroll_app_Contents_PkgInfo___depname)
+#____scroll_BUNDLE_TGT_REF_DEP = \
+#	$(__scroll_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: scroll$(EXEEXT) $(__scroll_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f scroll$(EXEEXT)
+	rm -rf scroll.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc)
+	$(CXX) -o $@ $(SCROLL_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__scroll___os2_emxbindcmd)
+
+#scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p scroll.app/Contents
+#	mkdir -p scroll.app/Contents/MacOS
+#	mkdir -p scroll.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/scroll/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >scroll.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >scroll.app/Contents/PkgInfo
+#	
+#	
+#	ln -f scroll$(EXEEXT) scroll.app/Contents/MacOS/scroll
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns scroll.app/Contents/Resources/wxmac.icns
+
+#scroll_bundle: $(____scroll_BUNDLE_TGT_REF_DEP)
+
+scroll_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+scroll_scroll.o: $(srcdir)/scroll.cpp
+	$(CXXC) -c -o $@ $(SCROLL_CXXFLAGS) $(srcdir)/scroll.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean scroll_bundle
diff --git a/samples/secretstore/Makefile b/samples/secretstore/Makefile
new file mode 100644
index 0000000000..7bb7ea9910
--- /dev/null
+++ b/samples/secretstore/Makefile
@@ -0,0 +1,125 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+LIBDIRNAME = $(wx_top_builddir)/lib
+SECRETSTORE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(WX_CXXFLAGS) \
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+SECRETSTORE_OBJECTS =  \
+	secretstore_secretstore.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: secretstore$(EXEEXT)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f secretstore$(EXEEXT)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+secretstore$(EXEEXT): $(SECRETSTORE_OBJECTS)
+	$(CXX) -o $@ $(SECRETSTORE_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+secretstore_secretstore.o: $(srcdir)/secretstore.cpp
+	$(CXXC) -c -o $@ $(SECRETSTORE_CXXFLAGS) $(srcdir)/secretstore.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean
diff --git a/samples/shaped/Makefile b/samples/shaped/Makefile
new file mode 100644
index 0000000000..3b342f2001
--- /dev/null
+++ b/samples/shaped/Makefile
@@ -0,0 +1,202 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+SHAPED_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+SHAPED_OBJECTS =  \
+	$(__shaped___win32rc) \
+	shaped_shaped.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd = $(NM) shaped$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep shaped$(EXEEXT) ; fi
+#__shaped___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__shaped___win32rc = shaped_sample_rc.o
+#__shaped_app_Contents_PkgInfo___depname \
+#	= shaped.app/Contents/PkgInfo
+#__shaped_bundle___depname = shaped_bundle
+#____shaped_BUNDLE_TGT_REF_DEP = \
+#	$(__shaped_app_Contents_PkgInfo___depname)
+#____shaped_BUNDLE_TGT_REF_DEP \
+#	= $(__shaped_app_Contents_PkgInfo___depname)
+#____shaped_BUNDLE_TGT_REF_DEP \
+#	= $(__shaped_app_Contents_PkgInfo___depname)
+#____shaped_BUNDLE_TGT_REF_DEP \
+#	= $(__shaped_app_Contents_PkgInfo___depname)
+#____shaped_BUNDLE_TGT_REF_DEP = \
+#	$(__shaped_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: shaped$(EXEEXT) $(__shaped_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f shaped$(EXEEXT)
+	rm -rf shaped.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc)
+	$(CXX) -o $@ $(SHAPED_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__shaped___os2_emxbindcmd)
+
+#shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p shaped.app/Contents
+#	mkdir -p shaped.app/Contents/MacOS
+#	mkdir -p shaped.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/shaped/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >shaped.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >shaped.app/Contents/PkgInfo
+#	
+#	
+#	ln -f shaped$(EXEEXT) shaped.app/Contents/MacOS/shaped
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns shaped.app/Contents/Resources/wxmac.icns
+
+#shaped_bundle: $(____shaped_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in star.png; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+shaped_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+shaped_shaped.o: $(srcdir)/shaped.cpp
+	$(CXXC) -c -o $@ $(SHAPED_CXXFLAGS) $(srcdir)/shaped.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean shaped_bundle data
diff --git a/samples/sockets/Makefile b/samples/sockets/Makefile
new file mode 100644
index 0000000000..19f5671ebd
--- /dev/null
+++ b/samples/sockets/Makefile
@@ -0,0 +1,281 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+CLIENT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+CLIENT_OBJECTS =  \
+	$(__client___win32rc) \
+	client_client.o
+SERVER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+SERVER_OBJECTS =  \
+	$(__server___win32rc) \
+	server_server.o
+BASECLIENT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(WX_CXXFLAGS) \
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+BASECLIENT_OBJECTS =  \
+	baseclient_baseclient.o
+BASESERVER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(WX_CXXFLAGS) \
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+BASESERVER_OBJECTS =  \
+	baseserver_baseserver.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+__client___depname = client$(EXEEXT)
+COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep client$(EXEEXT) ; fi
+#__client___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___client___os2_emxbindcmd)
+#__client___win32rc = client_sample_rc.o
+#__client_app_Contents_PkgInfo___depname \
+#	= client.app/Contents/PkgInfo
+#__client_bundle___depname = client_bundle
+#____client_BUNDLE_TGT_REF_DEP = \
+#	$(__client_app_Contents_PkgInfo___depname)
+#____client_BUNDLE_TGT_REF_DEP = \
+#	$(__client_app_Contents_PkgInfo___depname)
+#____client_BUNDLE_TGT_REF_DEP \
+#	= $(__client_app_Contents_PkgInfo___depname)
+#____client_BUNDLE_TGT_REF_DEP \
+#	= $(__client_app_Contents_PkgInfo___depname)
+#____client_BUNDLE_TGT_REF_DEP \
+#	= $(__client_app_Contents_PkgInfo___depname)
+__server___depname = server$(EXEEXT)
+COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep server$(EXEEXT) ; fi
+#__server___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___server___os2_emxbindcmd)
+#__server___win32rc = server_sample_rc.o
+#__server_app_Contents_PkgInfo___depname \
+#	= server.app/Contents/PkgInfo
+#__server_bundle___depname = server_bundle
+#____server_BUNDLE_TGT_REF_DEP = \
+#	$(__server_app_Contents_PkgInfo___depname)
+#____server_BUNDLE_TGT_REF_DEP = \
+#	$(__server_app_Contents_PkgInfo___depname)
+#____server_BUNDLE_TGT_REF_DEP \
+#	= $(__server_app_Contents_PkgInfo___depname)
+#____server_BUNDLE_TGT_REF_DEP \
+#	= $(__server_app_Contents_PkgInfo___depname)
+#____server_BUNDLE_TGT_REF_DEP \
+#	= $(__server_app_Contents_PkgInfo___depname)
+#__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+#__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p)
+#__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p_0 = --define wxNO_RTTI
+#__THREAD_DEFINE_p_0 = --define wxNO_THREADS
+#__DLLFLAG_p_0 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+COND_MONOLITHIC_0___WXLIB_NET_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: $(__client___depname) $(__client_bundle___depname) $(__server___depname) $(__server_bundle___depname) baseclient$(EXEEXT) baseserver$(EXEEXT)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f client$(EXEEXT)
+	rm -rf client.app
+	rm -f server$(EXEEXT)
+	rm -rf server.app
+	rm -f baseclient$(EXEEXT)
+	rm -f baseserver$(EXEEXT)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
+	$(CXX) -o $@ $(CLIENT_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__client___os2_emxbindcmd)
+
+#client.app/Contents/PkgInfo: $(__client___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p client.app/Contents
+#	mkdir -p client.app/Contents/MacOS
+#	mkdir -p client.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/client/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >client.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >client.app/Contents/PkgInfo
+#	
+#	
+#	ln -f client$(EXEEXT) client.app/Contents/MacOS/client
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns client.app/Contents/Resources/wxmac.icns
+
+#client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
+
+server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
+	$(CXX) -o $@ $(SERVER_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__server___os2_emxbindcmd)
+
+#server.app/Contents/PkgInfo: $(__server___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p server.app/Contents
+#	mkdir -p server.app/Contents/MacOS
+#	mkdir -p server.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/server/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >server.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >server.app/Contents/PkgInfo
+#	
+#	
+#	ln -f server$(EXEEXT) server.app/Contents/MacOS/server
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns server.app/Contents/Resources/wxmac.icns
+
+#server_bundle: $(____server_BUNDLE_TGT_REF_DEP)
+
+baseclient$(EXEEXT): $(BASECLIENT_OBJECTS)
+	$(CXX) -o $@ $(BASECLIENT_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+baseserver$(EXEEXT): $(BASESERVER_OBJECTS)
+	$(CXX) -o $@ $(BASESERVER_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+client_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)  --include-dir $(srcdir) $(__DLLFLAG_p_0) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+client_client.o: $(srcdir)/client.cpp
+	$(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $(srcdir)/client.cpp
+
+server_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)  --include-dir $(srcdir) $(__DLLFLAG_p_0) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+server_server.o: $(srcdir)/server.cpp
+	$(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $(srcdir)/server.cpp
+
+baseclient_baseclient.o: $(srcdir)/baseclient.cpp
+	$(CXXC) -c -o $@ $(BASECLIENT_CXXFLAGS) $(srcdir)/baseclient.cpp
+
+baseserver_baseserver.o: $(srcdir)/baseserver.cpp
+	$(CXXC) -c -o $@ $(BASESERVER_CXXFLAGS) $(srcdir)/baseserver.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean client_bundle server_bundle
diff --git a/samples/sound/Makefile b/samples/sound/Makefile
new file mode 100644
index 0000000000..c73b685c9a
--- /dev/null
+++ b/samples/sound/Makefile
@@ -0,0 +1,202 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+SOUND_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+SOUND_OBJECTS =  \
+	sound_sound.o \
+	$(__sound___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___sound___os2_emxbindcmd = $(NM) sound$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep sound$(EXEEXT) ; fi
+#__sound___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___sound___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__sound_app_Contents_PkgInfo___depname \
+#	= sound.app/Contents/PkgInfo
+#__sound_bundle___depname = sound_bundle
+#____sound_BUNDLE_TGT_REF_DEP = \
+#	$(__sound_app_Contents_PkgInfo___depname)
+#____sound_BUNDLE_TGT_REF_DEP \
+#	= $(__sound_app_Contents_PkgInfo___depname)
+#____sound_BUNDLE_TGT_REF_DEP \
+#	= $(__sound_app_Contents_PkgInfo___depname)
+#____sound_BUNDLE_TGT_REF_DEP \
+#	= $(__sound_app_Contents_PkgInfo___depname)
+#____sound_BUNDLE_TGT_REF_DEP = \
+#	$(__sound_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__sound___win32rc = sound_sound_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: sound$(EXEEXT) $(__sound_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f sound$(EXEEXT)
+	rm -rf sound.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc)
+	$(CXX) -o $@ $(SOUND_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__sound___os2_emxbindcmd)
+
+#sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p sound.app/Contents
+#	mkdir -p sound.app/Contents/MacOS
+#	mkdir -p sound.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/sound/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >sound.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >sound.app/Contents/PkgInfo
+#	
+#	
+#	ln -f sound$(EXEEXT) sound.app/Contents/MacOS/sound
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns sound.app/Contents/Resources/wxmac.icns
+
+#sound_bundle: $(____sound_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in 9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+sound_sound.o: $(srcdir)/sound.cpp
+	$(CXXC) -c -o $@ $(SOUND_CXXFLAGS) $(srcdir)/sound.cpp
+
+sound_sound_rc.o: $(srcdir)/sound.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean sound_bundle data
diff --git a/samples/splash/Makefile b/samples/splash/Makefile
new file mode 100644
index 0000000000..2ea4fd17f0
--- /dev/null
+++ b/samples/splash/Makefile
@@ -0,0 +1,206 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_MEDIA = -lgstplayer-1.0 -lgstvideo-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+SPLASH_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+SPLASH_OBJECTS =  \
+	splash_splash.o \
+	$(__splash___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___splash___os2_emxbindcmd = $(NM) splash$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep splash$(EXEEXT) ; fi
+#__splash___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___splash___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__splash_app_Contents_PkgInfo___depname \
+#	= splash.app/Contents/PkgInfo
+#__splash_bundle___depname = splash_bundle
+#____splash_BUNDLE_TGT_REF_DEP = \
+#	$(__splash_app_Contents_PkgInfo___depname)
+#____splash_BUNDLE_TGT_REF_DEP \
+#	= $(__splash_app_Contents_PkgInfo___depname)
+#____splash_BUNDLE_TGT_REF_DEP \
+#	= $(__splash_app_Contents_PkgInfo___depname)
+#____splash_BUNDLE_TGT_REF_DEP \
+#	= $(__splash_app_Contents_PkgInfo___depname)
+#____splash_BUNDLE_TGT_REF_DEP = \
+#	$(__splash_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_MEDIA_p = $(COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__splash___win32rc = splash_sample_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: splash$(EXEEXT) $(__splash_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f splash$(EXEEXT)
+	rm -rf splash.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc)
+	$(CXX) -o $@ $(SPLASH_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__splash___os2_emxbindcmd)
+
+#splash.app/Contents/PkgInfo: splash$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p splash.app/Contents
+#	mkdir -p splash.app/Contents/MacOS
+#	mkdir -p splash.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/splash/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >splash.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >splash.app/Contents/PkgInfo
+#	
+#	
+#	ln -f splash$(EXEEXT) splash.app/Contents/MacOS/splash
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns splash.app/Contents/Resources/wxmac.icns
+
+#splash_bundle: $(____splash_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in splash.png press.mpg; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+splash_splash.o: $(srcdir)/splash.cpp
+	$(CXXC) -c -o $@ $(SPLASH_CXXFLAGS) $(srcdir)/splash.cpp
+
+splash_sample_rc.o: $(srcdir)/../sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean splash_bundle data
diff --git a/samples/splitter/Makefile b/samples/splitter/Makefile
new file mode 100644
index 0000000000..493cedf449
--- /dev/null
+++ b/samples/splitter/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+SPLITTER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+SPLITTER_OBJECTS =  \
+	$(__splitter___win32rc) \
+	splitter_splitter.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___splitter___os2_emxbindcmd = $(NM) splitter$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep splitter$(EXEEXT) ; fi
+#__splitter___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___splitter___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__splitter___win32rc = splitter_sample_rc.o
+#__splitter_app_Contents_PkgInfo___depname \
+#	= splitter.app/Contents/PkgInfo
+#__splitter_bundle___depname = splitter_bundle
+#____splitter_BUNDLE_TGT_REF_DEP = \
+#	$(__splitter_app_Contents_PkgInfo___depname)
+#____splitter_BUNDLE_TGT_REF_DEP \
+#	= $(__splitter_app_Contents_PkgInfo___depname)
+#____splitter_BUNDLE_TGT_REF_DEP \
+#	= $(__splitter_app_Contents_PkgInfo___depname)
+#____splitter_BUNDLE_TGT_REF_DEP \
+#	= $(__splitter_app_Contents_PkgInfo___depname)
+#____splitter_BUNDLE_TGT_REF_DEP = \
+#	$(__splitter_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: splitter$(EXEEXT) $(__splitter_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f splitter$(EXEEXT)
+	rm -rf splitter.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc)
+	$(CXX) -o $@ $(SPLITTER_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__splitter___os2_emxbindcmd)
+
+#splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p splitter.app/Contents
+#	mkdir -p splitter.app/Contents/MacOS
+#	mkdir -p splitter.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/splitter/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >splitter.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >splitter.app/Contents/PkgInfo
+#	
+#	
+#	ln -f splitter$(EXEEXT) splitter.app/Contents/MacOS/splitter
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns splitter.app/Contents/Resources/wxmac.icns
+
+#splitter_bundle: $(____splitter_BUNDLE_TGT_REF_DEP)
+
+splitter_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+splitter_splitter.o: $(srcdir)/splitter.cpp
+	$(CXXC) -c -o $@ $(SPLITTER_CXXFLAGS) $(srcdir)/splitter.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean splitter_bundle
diff --git a/samples/statbar/Makefile b/samples/statbar/Makefile
new file mode 100644
index 0000000000..b1cb9762db
--- /dev/null
+++ b/samples/statbar/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+STATBAR_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+STATBAR_OBJECTS =  \
+	$(__statbar___win32rc) \
+	statbar_statbar.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd = $(NM) statbar$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep statbar$(EXEEXT) ; fi
+#__statbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__statbar___win32rc = statbar_sample_rc.o
+#__statbar_app_Contents_PkgInfo___depname \
+#	= statbar.app/Contents/PkgInfo
+#__statbar_bundle___depname = statbar_bundle
+#____statbar_BUNDLE_TGT_REF_DEP = \
+#	$(__statbar_app_Contents_PkgInfo___depname)
+#____statbar_BUNDLE_TGT_REF_DEP \
+#	= $(__statbar_app_Contents_PkgInfo___depname)
+#____statbar_BUNDLE_TGT_REF_DEP \
+#	= $(__statbar_app_Contents_PkgInfo___depname)
+#____statbar_BUNDLE_TGT_REF_DEP \
+#	= $(__statbar_app_Contents_PkgInfo___depname)
+#____statbar_BUNDLE_TGT_REF_DEP = \
+#	$(__statbar_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: statbar$(EXEEXT) $(__statbar_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f statbar$(EXEEXT)
+	rm -rf statbar.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc)
+	$(CXX) -o $@ $(STATBAR_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__statbar___os2_emxbindcmd)
+
+#statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p statbar.app/Contents
+#	mkdir -p statbar.app/Contents/MacOS
+#	mkdir -p statbar.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/statbar/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >statbar.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >statbar.app/Contents/PkgInfo
+#	
+#	
+#	ln -f statbar$(EXEEXT) statbar.app/Contents/MacOS/statbar
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns statbar.app/Contents/Resources/wxmac.icns
+
+#statbar_bundle: $(____statbar_BUNDLE_TGT_REF_DEP)
+
+statbar_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+statbar_statbar.o: $(srcdir)/statbar.cpp
+	$(CXXC) -c -o $@ $(STATBAR_CXXFLAGS) $(srcdir)/statbar.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean statbar_bundle
diff --git a/samples/stc/Makefile b/samples/stc/Makefile
new file mode 100644
index 0000000000..27c78f8e6e
--- /dev/null
+++ b/samples/stc/Makefile
@@ -0,0 +1,214 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+EXTRALIBS_STC = 
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+STCTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+STCTEST_OBJECTS =  \
+	$(__stctest___win32rc) \
+	stctest_stctest.o \
+	stctest_edit.o \
+	stctest_prefs.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd = $(NM) stctest$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep stctest$(EXEEXT) ; fi
+#__stctest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__stctest___win32rc = stctest_sample_rc.o
+#__stctest_app_Contents_PkgInfo___depname \
+#	= stctest.app/Contents/PkgInfo
+#__stctest_bundle___depname = stctest_bundle
+#____stctest_BUNDLE_TGT_REF_DEP = \
+#	$(__stctest_app_Contents_PkgInfo___depname)
+#____stctest_BUNDLE_TGT_REF_DEP \
+#	= $(__stctest_app_Contents_PkgInfo___depname)
+#____stctest_BUNDLE_TGT_REF_DEP \
+#	= $(__stctest_app_Contents_PkgInfo___depname)
+#____stctest_BUNDLE_TGT_REF_DEP \
+#	= $(__stctest_app_Contents_PkgInfo___depname)
+#____stctest_BUNDLE_TGT_REF_DEP = \
+#	$(__stctest_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0_USE_STC_1___WXLIB_STC_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_STC_p = $(COND_MONOLITHIC_0_USE_STC_1___WXLIB_STC_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: stctest$(EXEEXT) $(__stctest_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f stctest$(EXEEXT)
+	rm -rf stctest.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
+	$(CXX) -o $@ $(STCTEST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__stctest___os2_emxbindcmd)
+
+#stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p stctest.app/Contents
+#	mkdir -p stctest.app/Contents/MacOS
+#	mkdir -p stctest.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/stctest/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >stctest.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >stctest.app/Contents/PkgInfo
+#	
+#	
+#	ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns stctest.app/Contents/Resources/wxmac.icns
+
+#stctest_bundle: $(____stctest_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p .
+	@for f in stctest.cpp; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+stctest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+stctest_stctest.o: $(srcdir)/stctest.cpp
+	$(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $(srcdir)/stctest.cpp
+
+stctest_edit.o: $(srcdir)/edit.cpp
+	$(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $(srcdir)/edit.cpp
+
+stctest_prefs.o: $(srcdir)/prefs.cpp
+	$(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $(srcdir)/prefs.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean stctest_bundle data
diff --git a/samples/svg/Makefile b/samples/svg/Makefile
new file mode 100644
index 0000000000..8df30201d2
--- /dev/null
+++ b/samples/svg/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+SVGTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+SVGTEST_OBJECTS =  \
+	$(__svgtest___win32rc) \
+	svgtest_svgtest.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___svgtest___os2_emxbindcmd = $(NM) svgtest$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep svgtest$(EXEEXT) ; fi
+#__svgtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___svgtest___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__svgtest___win32rc = svgtest_sample_rc.o
+#__svgtest_app_Contents_PkgInfo___depname \
+#	= svgtest.app/Contents/PkgInfo
+#__svgtest_bundle___depname = svgtest_bundle
+#____svgtest_BUNDLE_TGT_REF_DEP = \
+#	$(__svgtest_app_Contents_PkgInfo___depname)
+#____svgtest_BUNDLE_TGT_REF_DEP \
+#	= $(__svgtest_app_Contents_PkgInfo___depname)
+#____svgtest_BUNDLE_TGT_REF_DEP \
+#	= $(__svgtest_app_Contents_PkgInfo___depname)
+#____svgtest_BUNDLE_TGT_REF_DEP \
+#	= $(__svgtest_app_Contents_PkgInfo___depname)
+#____svgtest_BUNDLE_TGT_REF_DEP = \
+#	$(__svgtest_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: svgtest$(EXEEXT) $(__svgtest_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f svgtest$(EXEEXT)
+	rm -rf svgtest.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
+	$(CXX) -o $@ $(SVGTEST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__svgtest___os2_emxbindcmd)
+
+#svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p svgtest.app/Contents
+#	mkdir -p svgtest.app/Contents/MacOS
+#	mkdir -p svgtest.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/svgtest/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >svgtest.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >svgtest.app/Contents/PkgInfo
+#	
+#	
+#	ln -f svgtest$(EXEEXT) svgtest.app/Contents/MacOS/svgtest
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns svgtest.app/Contents/Resources/wxmac.icns
+
+#svgtest_bundle: $(____svgtest_BUNDLE_TGT_REF_DEP)
+
+svgtest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+svgtest_svgtest.o: $(srcdir)/svgtest.cpp
+	$(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $(srcdir)/svgtest.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean svgtest_bundle
diff --git a/samples/taborder/Makefile b/samples/taborder/Makefile
new file mode 100644
index 0000000000..5e7c5a820d
--- /dev/null
+++ b/samples/taborder/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+TABORDER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+TABORDER_OBJECTS =  \
+	$(__taborder___win32rc) \
+	taborder_taborder.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___taborder___os2_emxbindcmd = $(NM) taborder$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep taborder$(EXEEXT) ; fi
+#__taborder___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___taborder___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__taborder___win32rc = taborder_sample_rc.o
+#__taborder_app_Contents_PkgInfo___depname \
+#	= taborder.app/Contents/PkgInfo
+#__taborder_bundle___depname = taborder_bundle
+#____taborder_BUNDLE_TGT_REF_DEP = \
+#	$(__taborder_app_Contents_PkgInfo___depname)
+#____taborder_BUNDLE_TGT_REF_DEP \
+#	= $(__taborder_app_Contents_PkgInfo___depname)
+#____taborder_BUNDLE_TGT_REF_DEP \
+#	= $(__taborder_app_Contents_PkgInfo___depname)
+#____taborder_BUNDLE_TGT_REF_DEP \
+#	= $(__taborder_app_Contents_PkgInfo___depname)
+#____taborder_BUNDLE_TGT_REF_DEP = \
+#	$(__taborder_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: taborder$(EXEEXT) $(__taborder_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f taborder$(EXEEXT)
+	rm -rf taborder.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+taborder$(EXEEXT): $(TABORDER_OBJECTS) $(__taborder___win32rc)
+	$(CXX) -o $@ $(TABORDER_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__taborder___os2_emxbindcmd)
+
+#taborder.app/Contents/PkgInfo: taborder$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p taborder.app/Contents
+#	mkdir -p taborder.app/Contents/MacOS
+#	mkdir -p taborder.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/taborder/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >taborder.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >taborder.app/Contents/PkgInfo
+#	
+#	
+#	ln -f taborder$(EXEEXT) taborder.app/Contents/MacOS/taborder
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns taborder.app/Contents/Resources/wxmac.icns
+
+#taborder_bundle: $(____taborder_BUNDLE_TGT_REF_DEP)
+
+taborder_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+taborder_taborder.o: $(srcdir)/taborder.cpp
+	$(CXXC) -c -o $@ $(TABORDER_CXXFLAGS) $(srcdir)/taborder.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean taborder_bundle
diff --git a/samples/taskbar/Makefile b/samples/taskbar/Makefile
new file mode 100644
index 0000000000..0a5f8cdf8c
--- /dev/null
+++ b/samples/taskbar/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+TASKBAR_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+TASKBAR_OBJECTS =  \
+	$(__taskbar___win32rc) \
+	taskbar_tbtest.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd = $(NM) taskbar$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep taskbar$(EXEEXT) ; fi
+#__taskbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__taskbar___win32rc = taskbar_sample_rc.o
+#__taskbar_app_Contents_PkgInfo___depname \
+#	= taskbar.app/Contents/PkgInfo
+#__taskbar_bundle___depname = taskbar_bundle
+#____taskbar_BUNDLE_TGT_REF_DEP = \
+#	$(__taskbar_app_Contents_PkgInfo___depname)
+#____taskbar_BUNDLE_TGT_REF_DEP \
+#	= $(__taskbar_app_Contents_PkgInfo___depname)
+#____taskbar_BUNDLE_TGT_REF_DEP \
+#	= $(__taskbar_app_Contents_PkgInfo___depname)
+#____taskbar_BUNDLE_TGT_REF_DEP \
+#	= $(__taskbar_app_Contents_PkgInfo___depname)
+#____taskbar_BUNDLE_TGT_REF_DEP = \
+#	$(__taskbar_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: taskbar$(EXEEXT) $(__taskbar_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f taskbar$(EXEEXT)
+	rm -rf taskbar.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc)
+	$(CXX) -o $@ $(TASKBAR_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__taskbar___os2_emxbindcmd)
+
+#taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p taskbar.app/Contents
+#	mkdir -p taskbar.app/Contents/MacOS
+#	mkdir -p taskbar.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/taskbar/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >taskbar.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >taskbar.app/Contents/PkgInfo
+#	
+#	
+#	ln -f taskbar$(EXEEXT) taskbar.app/Contents/MacOS/taskbar
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns taskbar.app/Contents/Resources/wxmac.icns
+
+#taskbar_bundle: $(____taskbar_BUNDLE_TGT_REF_DEP)
+
+taskbar_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+taskbar_tbtest.o: $(srcdir)/tbtest.cpp
+	$(CXXC) -c -o $@ $(TASKBAR_CXXFLAGS) $(srcdir)/tbtest.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean taskbar_bundle
diff --git a/samples/text/Makefile b/samples/text/Makefile
new file mode 100644
index 0000000000..7bdadfb335
--- /dev/null
+++ b/samples/text/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+TEXT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+TEXT_OBJECTS =  \
+	$(__text___win32rc) \
+	text_text.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___text___os2_emxbindcmd = $(NM) text$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep text$(EXEEXT) ; fi
+#__text___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___text___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__text___win32rc = text_sample_rc.o
+#__text_app_Contents_PkgInfo___depname \
+#	= text.app/Contents/PkgInfo
+#__text_bundle___depname = text_bundle
+#____text_BUNDLE_TGT_REF_DEP = \
+#	$(__text_app_Contents_PkgInfo___depname)
+#____text_BUNDLE_TGT_REF_DEP \
+#	= $(__text_app_Contents_PkgInfo___depname)
+#____text_BUNDLE_TGT_REF_DEP \
+#	= $(__text_app_Contents_PkgInfo___depname)
+#____text_BUNDLE_TGT_REF_DEP \
+#	= $(__text_app_Contents_PkgInfo___depname)
+#____text_BUNDLE_TGT_REF_DEP = \
+#	$(__text_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: text$(EXEEXT) $(__text_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f text$(EXEEXT)
+	rm -rf text.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc)
+	$(CXX) -o $@ $(TEXT_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__text___os2_emxbindcmd)
+
+#text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p text.app/Contents
+#	mkdir -p text.app/Contents/MacOS
+#	mkdir -p text.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/text/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >text.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >text.app/Contents/PkgInfo
+#	
+#	
+#	ln -f text$(EXEEXT) text.app/Contents/MacOS/text
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns text.app/Contents/Resources/wxmac.icns
+
+#text_bundle: $(____text_BUNDLE_TGT_REF_DEP)
+
+text_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+text_text.o: $(srcdir)/text.cpp
+	$(CXXC) -c -o $@ $(TEXT_CXXFLAGS) $(srcdir)/text.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean text_bundle
diff --git a/samples/thread/Makefile b/samples/thread/Makefile
new file mode 100644
index 0000000000..30bf540685
--- /dev/null
+++ b/samples/thread/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+THREAD_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+THREAD_OBJECTS =  \
+	$(__thread___win32rc) \
+	thread_thread.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___thread___os2_emxbindcmd = $(NM) thread$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep thread$(EXEEXT) ; fi
+#__thread___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___thread___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__thread___win32rc = thread_sample_rc.o
+#__thread_app_Contents_PkgInfo___depname \
+#	= thread.app/Contents/PkgInfo
+#__thread_bundle___depname = thread_bundle
+#____thread_BUNDLE_TGT_REF_DEP = \
+#	$(__thread_app_Contents_PkgInfo___depname)
+#____thread_BUNDLE_TGT_REF_DEP \
+#	= $(__thread_app_Contents_PkgInfo___depname)
+#____thread_BUNDLE_TGT_REF_DEP \
+#	= $(__thread_app_Contents_PkgInfo___depname)
+#____thread_BUNDLE_TGT_REF_DEP \
+#	= $(__thread_app_Contents_PkgInfo___depname)
+#____thread_BUNDLE_TGT_REF_DEP = \
+#	$(__thread_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: thread$(EXEEXT) $(__thread_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f thread$(EXEEXT)
+	rm -rf thread.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc)
+	$(CXX) -o $@ $(THREAD_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__thread___os2_emxbindcmd)
+
+#thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p thread.app/Contents
+#	mkdir -p thread.app/Contents/MacOS
+#	mkdir -p thread.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/thread/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >thread.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >thread.app/Contents/PkgInfo
+#	
+#	
+#	ln -f thread$(EXEEXT) thread.app/Contents/MacOS/thread
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns thread.app/Contents/Resources/wxmac.icns
+
+#thread_bundle: $(____thread_BUNDLE_TGT_REF_DEP)
+
+thread_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+thread_thread.o: $(srcdir)/thread.cpp
+	$(CXXC) -c -o $@ $(THREAD_CXXFLAGS) $(srcdir)/thread.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean thread_bundle
diff --git a/samples/toolbar/Makefile b/samples/toolbar/Makefile
new file mode 100644
index 0000000000..3b92893f81
--- /dev/null
+++ b/samples/toolbar/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+TOOLBAR_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+TOOLBAR_OBJECTS =  \
+	toolbar_toolbar.o \
+	$(__toolbar___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___toolbar___os2_emxbindcmd = $(NM) toolbar$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep toolbar$(EXEEXT) ; fi
+#__toolbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___toolbar___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__toolbar_app_Contents_PkgInfo___depname \
+#	= toolbar.app/Contents/PkgInfo
+#__toolbar_bundle___depname = toolbar_bundle
+#____toolbar_BUNDLE_TGT_REF_DEP = \
+#	$(__toolbar_app_Contents_PkgInfo___depname)
+#____toolbar_BUNDLE_TGT_REF_DEP \
+#	= $(__toolbar_app_Contents_PkgInfo___depname)
+#____toolbar_BUNDLE_TGT_REF_DEP \
+#	= $(__toolbar_app_Contents_PkgInfo___depname)
+#____toolbar_BUNDLE_TGT_REF_DEP \
+#	= $(__toolbar_app_Contents_PkgInfo___depname)
+#____toolbar_BUNDLE_TGT_REF_DEP = \
+#	$(__toolbar_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__toolbar___win32rc = toolbar_toolbar_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: toolbar$(EXEEXT) $(__toolbar_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f toolbar$(EXEEXT)
+	rm -rf toolbar.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc)
+	$(CXX) -o $@ $(TOOLBAR_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__toolbar___os2_emxbindcmd)
+
+#toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p toolbar.app/Contents
+#	mkdir -p toolbar.app/Contents/MacOS
+#	mkdir -p toolbar.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/toolbar/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >toolbar.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >toolbar.app/Contents/PkgInfo
+#	
+#	
+#	ln -f toolbar$(EXEEXT) toolbar.app/Contents/MacOS/toolbar
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns toolbar.app/Contents/Resources/wxmac.icns
+
+#toolbar_bundle: $(____toolbar_BUNDLE_TGT_REF_DEP)
+
+toolbar_toolbar.o: $(srcdir)/toolbar.cpp
+	$(CXXC) -c -o $@ $(TOOLBAR_CXXFLAGS) $(srcdir)/toolbar.cpp
+
+toolbar_toolbar_rc.o: $(srcdir)/toolbar.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean toolbar_bundle
diff --git a/samples/treectrl/Makefile b/samples/treectrl/Makefile
new file mode 100644
index 0000000000..f2be5dfdc1
--- /dev/null
+++ b/samples/treectrl/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+TREECTRL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+TREECTRL_OBJECTS =  \
+	treectrl_treetest.o \
+	$(__treectrl___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___treectrl___os2_emxbindcmd = $(NM) treectrl$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep treectrl$(EXEEXT) ; fi
+#__treectrl___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___treectrl___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__treectrl_app_Contents_PkgInfo___depname \
+#	= treectrl.app/Contents/PkgInfo
+#__treectrl_bundle___depname = treectrl_bundle
+#____treectrl_BUNDLE_TGT_REF_DEP = \
+#	$(__treectrl_app_Contents_PkgInfo___depname)
+#____treectrl_BUNDLE_TGT_REF_DEP \
+#	= $(__treectrl_app_Contents_PkgInfo___depname)
+#____treectrl_BUNDLE_TGT_REF_DEP \
+#	= $(__treectrl_app_Contents_PkgInfo___depname)
+#____treectrl_BUNDLE_TGT_REF_DEP \
+#	= $(__treectrl_app_Contents_PkgInfo___depname)
+#____treectrl_BUNDLE_TGT_REF_DEP = \
+#	$(__treectrl_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__treectrl___win32rc = treectrl_sample_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: treectrl$(EXEEXT) $(__treectrl_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f treectrl$(EXEEXT)
+	rm -rf treectrl.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc)
+	$(CXX) -o $@ $(TREECTRL_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__treectrl___os2_emxbindcmd)
+
+#treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p treectrl.app/Contents
+#	mkdir -p treectrl.app/Contents/MacOS
+#	mkdir -p treectrl.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/treectrl/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >treectrl.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >treectrl.app/Contents/PkgInfo
+#	
+#	
+#	ln -f treectrl$(EXEEXT) treectrl.app/Contents/MacOS/treectrl
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns treectrl.app/Contents/Resources/wxmac.icns
+
+#treectrl_bundle: $(____treectrl_BUNDLE_TGT_REF_DEP)
+
+treectrl_treetest.o: $(srcdir)/treetest.cpp
+	$(CXXC) -c -o $@ $(TREECTRL_CXXFLAGS) $(srcdir)/treetest.cpp
+
+treectrl_sample_rc.o: $(srcdir)/../sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean treectrl_bundle
diff --git a/samples/treelist/Makefile b/samples/treelist/Makefile
new file mode 100644
index 0000000000..3bb2797418
--- /dev/null
+++ b/samples/treelist/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+TREELIST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+TREELIST_OBJECTS =  \
+	$(__treelist___win32rc) \
+	treelist_treelist.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___treelist___os2_emxbindcmd = $(NM) treelist$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep treelist$(EXEEXT) ; fi
+#__treelist___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___treelist___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__treelist___win32rc = treelist_sample_rc.o
+#__treelist_app_Contents_PkgInfo___depname \
+#	= treelist.app/Contents/PkgInfo
+#__treelist_bundle___depname = treelist_bundle
+#____treelist_BUNDLE_TGT_REF_DEP = \
+#	$(__treelist_app_Contents_PkgInfo___depname)
+#____treelist_BUNDLE_TGT_REF_DEP \
+#	= $(__treelist_app_Contents_PkgInfo___depname)
+#____treelist_BUNDLE_TGT_REF_DEP \
+#	= $(__treelist_app_Contents_PkgInfo___depname)
+#____treelist_BUNDLE_TGT_REF_DEP \
+#	= $(__treelist_app_Contents_PkgInfo___depname)
+#____treelist_BUNDLE_TGT_REF_DEP = \
+#	$(__treelist_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: treelist$(EXEEXT) $(__treelist_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f treelist$(EXEEXT)
+	rm -rf treelist.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+treelist$(EXEEXT): $(TREELIST_OBJECTS) $(__treelist___win32rc)
+	$(CXX) -o $@ $(TREELIST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__treelist___os2_emxbindcmd)
+
+#treelist.app/Contents/PkgInfo: treelist$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p treelist.app/Contents
+#	mkdir -p treelist.app/Contents/MacOS
+#	mkdir -p treelist.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/treelist/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >treelist.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >treelist.app/Contents/PkgInfo
+#	
+#	
+#	ln -f treelist$(EXEEXT) treelist.app/Contents/MacOS/treelist
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns treelist.app/Contents/Resources/wxmac.icns
+
+#treelist_bundle: $(____treelist_BUNDLE_TGT_REF_DEP)
+
+treelist_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+treelist_treelist.o: $(srcdir)/treelist.cpp
+	$(CXXC) -c -o $@ $(TREELIST_CXXFLAGS) $(srcdir)/treelist.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean treelist_bundle
diff --git a/samples/typetest/Makefile b/samples/typetest/Makefile
new file mode 100644
index 0000000000..2ee3bd4fbf
--- /dev/null
+++ b/samples/typetest/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+TYPETEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+TYPETEST_OBJECTS =  \
+	$(__typetest___win32rc) \
+	typetest_typetest.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___typetest___os2_emxbindcmd = $(NM) typetest$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep typetest$(EXEEXT) ; fi
+#__typetest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___typetest___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__typetest___win32rc = typetest_sample_rc.o
+#__typetest_app_Contents_PkgInfo___depname \
+#	= typetest.app/Contents/PkgInfo
+#__typetest_bundle___depname = typetest_bundle
+#____typetest_BUNDLE_TGT_REF_DEP = \
+#	$(__typetest_app_Contents_PkgInfo___depname)
+#____typetest_BUNDLE_TGT_REF_DEP \
+#	= $(__typetest_app_Contents_PkgInfo___depname)
+#____typetest_BUNDLE_TGT_REF_DEP \
+#	= $(__typetest_app_Contents_PkgInfo___depname)
+#____typetest_BUNDLE_TGT_REF_DEP \
+#	= $(__typetest_app_Contents_PkgInfo___depname)
+#____typetest_BUNDLE_TGT_REF_DEP = \
+#	$(__typetest_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: typetest$(EXEEXT) $(__typetest_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f typetest$(EXEEXT)
+	rm -rf typetest.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc)
+	$(CXX) -o $@ $(TYPETEST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__typetest___os2_emxbindcmd)
+
+#typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p typetest.app/Contents
+#	mkdir -p typetest.app/Contents/MacOS
+#	mkdir -p typetest.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/typetest/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >typetest.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >typetest.app/Contents/PkgInfo
+#	
+#	
+#	ln -f typetest$(EXEEXT) typetest.app/Contents/MacOS/typetest
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns typetest.app/Contents/Resources/wxmac.icns
+
+#typetest_bundle: $(____typetest_BUNDLE_TGT_REF_DEP)
+
+typetest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+typetest_typetest.o: $(srcdir)/typetest.cpp
+	$(CXXC) -c -o $@ $(TYPETEST_CXXFLAGS) $(srcdir)/typetest.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean typetest_bundle
diff --git a/samples/uiaction/Makefile b/samples/uiaction/Makefile
new file mode 100644
index 0000000000..b58d95a029
--- /dev/null
+++ b/samples/uiaction/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -llzma -lm
+LDFLAGS_GUI = 
+CXX = g++
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-3.1
+EXTRALIBS = -pthread   -Wl,--version-script,$(wx_top_builddir)/version-script -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -llzma -lm 
+EXTRALIBS_XML =  -lexpat
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lXtst -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz -ljpeg -ltiff -llzma
+WX_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-3.1 -I${top_srcdir}/include -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gtk-3.0/unix-print -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsecret-1 -I/usr/include/webkitgtk-4.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4  -fvisibility=hidden -fvisibility-inlines-hidden
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = -Wl,-rpath,$(wx_top_builddir)/lib
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+UIACTION_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+UIACTION_OBJECTS =  \
+	$(__uiaction___win32rc) \
+	uiaction_uiaction.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+__DLLFLAG_p = -DWXUSINGDLL
+__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___uiaction___os2_emxbindcmd = $(NM) uiaction$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep uiaction$(EXEEXT) ; fi
+#__uiaction___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___uiaction___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__uiaction___win32rc = uiaction_sample_rc.o
+#__uiaction_app_Contents_PkgInfo___depname \
+#	= uiaction.app/Contents/PkgInfo
+#__uiaction_bundle___depname = uiaction_bundle
+#____uiaction_BUNDLE_TGT_REF_DEP = \
+#	$(__uiaction_app_Contents_PkgInfo___depname)
+#____uiaction_BUNDLE_TGT_REF_DEP \
+#	= $(__uiaction_app_Contents_PkgInfo___depname)
+#____uiaction_BUNDLE_TGT_REF_DEP \
+#	= $(__uiaction_app_Contents_PkgInfo___depname)
+#____uiaction_BUNDLE_TGT_REF_DEP \
+#	= $(__uiaction_app_Contents_PkgInfo___depname)
+#____uiaction_BUNDLE_TGT_REF_DEP = \
+#	$(__uiaction_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: uiaction$(EXEEXT) $(__uiaction_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f uiaction$(EXEEXT)
+	rm -rf uiaction.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+uiaction$(EXEEXT): $(UIACTION_OBJECTS) $(__uiaction___win32rc)
+	$(CXX) -o $@ $(UIACTION_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__uiaction___os2_emxbindcmd)
+
+#uiaction.app/Contents/PkgInfo: uiaction$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p uiaction.app/Contents
+#	mkdir -p uiaction.app/Contents/MacOS
+#	mkdir -p uiaction.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/uiaction/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >uiaction.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >uiaction.app/Contents/PkgInfo
+#	
+#	
+#	ln -f uiaction$(EXEEXT) uiaction.app/Contents/MacOS/uiaction
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns uiaction.app/Contents/Resources/wxmac.icns
+
+#uiaction_bundle: $(____uiaction_BUNDLE_TGT_REF_DEP)
+
+uiaction_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+uiaction_uiaction.o: $(srcdir)/uiaction.cpp
+	$(CXXC) -c -o $@ $(UIACTION_CXXFLAGS) $(srcdir)/uiaction.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean uiaction_bundle
diff --git a/samples/validate/Makefile b/samples/validate/Makefile
new file mode 100644
index 0000000000..bf5afb55f6
--- /dev/null
+++ b/samples/validate/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+VALIDATE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+VALIDATE_OBJECTS =  \
+	validate_validate.o \
+	$(__validate___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___validate___os2_emxbindcmd = $(NM) validate$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep validate$(EXEEXT) ; fi
+#__validate___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___validate___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__validate_app_Contents_PkgInfo___depname \
+#	= validate.app/Contents/PkgInfo
+#__validate_bundle___depname = validate_bundle
+#____validate_BUNDLE_TGT_REF_DEP = \
+#	$(__validate_app_Contents_PkgInfo___depname)
+#____validate_BUNDLE_TGT_REF_DEP \
+#	= $(__validate_app_Contents_PkgInfo___depname)
+#____validate_BUNDLE_TGT_REF_DEP \
+#	= $(__validate_app_Contents_PkgInfo___depname)
+#____validate_BUNDLE_TGT_REF_DEP \
+#	= $(__validate_app_Contents_PkgInfo___depname)
+#____validate_BUNDLE_TGT_REF_DEP = \
+#	$(__validate_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__validate___win32rc = validate_sample_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: validate$(EXEEXT) $(__validate_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f validate$(EXEEXT)
+	rm -rf validate.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc)
+	$(CXX) -o $@ $(VALIDATE_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__validate___os2_emxbindcmd)
+
+#validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p validate.app/Contents
+#	mkdir -p validate.app/Contents/MacOS
+#	mkdir -p validate.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/validate/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >validate.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >validate.app/Contents/PkgInfo
+#	
+#	
+#	ln -f validate$(EXEEXT) validate.app/Contents/MacOS/validate
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns validate.app/Contents/Resources/wxmac.icns
+
+#validate_bundle: $(____validate_BUNDLE_TGT_REF_DEP)
+
+validate_validate.o: $(srcdir)/validate.cpp
+	$(CXXC) -c -o $@ $(VALIDATE_CXXFLAGS) $(srcdir)/validate.cpp
+
+validate_sample_rc.o: $(srcdir)/../sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean validate_bundle
diff --git a/samples/vscroll/Makefile b/samples/vscroll/Makefile
new file mode 100644
index 0000000000..8067007c42
--- /dev/null
+++ b/samples/vscroll/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+VSTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+VSTEST_OBJECTS =  \
+	$(__vstest___win32rc) \
+	vstest_vstest.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___vstest___os2_emxbindcmd = $(NM) vstest$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep vstest$(EXEEXT) ; fi
+#__vstest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___vstest___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__vstest___win32rc = vstest_sample_rc.o
+#__vstest_app_Contents_PkgInfo___depname \
+#	= vstest.app/Contents/PkgInfo
+#__vstest_bundle___depname = vstest_bundle
+#____vstest_BUNDLE_TGT_REF_DEP = \
+#	$(__vstest_app_Contents_PkgInfo___depname)
+#____vstest_BUNDLE_TGT_REF_DEP \
+#	= $(__vstest_app_Contents_PkgInfo___depname)
+#____vstest_BUNDLE_TGT_REF_DEP \
+#	= $(__vstest_app_Contents_PkgInfo___depname)
+#____vstest_BUNDLE_TGT_REF_DEP \
+#	= $(__vstest_app_Contents_PkgInfo___depname)
+#____vstest_BUNDLE_TGT_REF_DEP = \
+#	$(__vstest_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: vstest$(EXEEXT) $(__vstest_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f vstest$(EXEEXT)
+	rm -rf vstest.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc)
+	$(CXX) -o $@ $(VSTEST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__vstest___os2_emxbindcmd)
+
+#vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p vstest.app/Contents
+#	mkdir -p vstest.app/Contents/MacOS
+#	mkdir -p vstest.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/vstest/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >vstest.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >vstest.app/Contents/PkgInfo
+#	
+#	
+#	ln -f vstest$(EXEEXT) vstest.app/Contents/MacOS/vstest
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns vstest.app/Contents/Resources/wxmac.icns
+
+#vstest_bundle: $(____vstest_BUNDLE_TGT_REF_DEP)
+
+vstest_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+vstest_vstest.o: $(srcdir)/vstest.cpp
+	$(CXXC) -c -o $@ $(VSTEST_CXXFLAGS) $(srcdir)/vstest.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean vstest_bundle
diff --git a/samples/webview/Makefile b/samples/webview/Makefile
new file mode 100644
index 0000000000..411686b6d5
--- /dev/null
+++ b/samples/webview/Makefile
@@ -0,0 +1,198 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+EXTRALIBS_STC = 
+EXTRALIBS_WEBVIEW = -lwebkit2gtk-4.0 -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lsoup-2.4 -lgio-2.0 -ljavascriptcoregtk-4.0 -lgobject-2.0 -lglib-2.0 
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+WEBVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+WEBVIEW_OBJECTS =  \
+	webview_webview.o \
+	$(__webview___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___webview___os2_emxbindcmd = $(NM) webview$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep webview$(EXEEXT) ; fi
+#__webview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___webview___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__webview_app_Contents_PkgInfo___depname \
+#	= webview.app/Contents/PkgInfo
+#__webview_bundle___depname = webview_bundle
+#____webview_BUNDLE_TGT_REF_DEP = \
+#	$(__webview_app_Contents_PkgInfo___depname)
+#____webview_BUNDLE_TGT_REF_DEP \
+#	= $(__webview_app_Contents_PkgInfo___depname)
+#____webview_BUNDLE_TGT_REF_DEP \
+#	= $(__webview_app_Contents_PkgInfo___depname)
+#____webview_BUNDLE_TGT_REF_DEP \
+#	= $(__webview_app_Contents_PkgInfo___depname)
+#____webview_BUNDLE_TGT_REF_DEP = \
+#	$(__webview_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_WEBVIEW_p = $(COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p)
+COND_MONOLITHIC_0_USE_STC_1___WXLIB_STC_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_STC_p = $(COND_MONOLITHIC_0_USE_STC_1___WXLIB_STC_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__webview___win32rc = webview_sample_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: webview$(EXEEXT) $(__webview_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f webview$(EXEEXT)
+	rm -rf webview.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc)
+	$(CXX) -o $@ $(WEBVIEW_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__webview___os2_emxbindcmd)
+
+#webview.app/Contents/PkgInfo: webview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p webview.app/Contents
+#	mkdir -p webview.app/Contents/MacOS
+#	mkdir -p webview.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/webview/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >webview.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >webview.app/Contents/PkgInfo
+#	
+#	
+#	ln -f webview$(EXEEXT) webview.app/Contents/MacOS/webview
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns webview.app/Contents/Resources/wxmac.icns
+
+#webview_bundle: $(____webview_BUNDLE_TGT_REF_DEP)
+
+webview_webview.o: $(srcdir)/webview.cpp
+	$(CXXC) -c -o $@ $(WEBVIEW_CXXFLAGS) $(srcdir)/webview.cpp
+
+webview_sample_rc.o: $(srcdir)/../sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean webview_bundle
diff --git a/samples/widgets/Makefile b/samples/widgets/Makefile
new file mode 100644
index 0000000000..64e713ec5c
--- /dev/null
+++ b/samples/widgets/Makefile
@@ -0,0 +1,325 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+OBJCXXFLAGS = -pthread -O2 -std=c++17 -Wno-deprecated-declarations 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+WIDGETS_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+WIDGETS_OBJCXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(CPPFLAGS) $(OBJCXXFLAGS)
+WIDGETS_OBJECTS =  \
+	widgets_activityindicator.o \
+	widgets_bmpcombobox.o \
+	widgets_button.o \
+	widgets_checkbox.o \
+	widgets_choice.o \
+	widgets_clrpicker.o \
+	widgets_combobox.o \
+	widgets_datepick.o \
+	widgets_dirctrl.o \
+	widgets_dirpicker.o \
+	widgets_editlbox.o \
+	widgets_filectrl.o \
+	widgets_filepicker.o \
+	widgets_fontpicker.o \
+	widgets_gauge.o \
+	widgets_headerctrl.o \
+	widgets_hyperlnk.o \
+	widgets_itemcontainer.o \
+	widgets_listbox.o \
+	$(__NATIVE_OBJCPP_SRC_OBJECTS) \
+	widgets_native.o \
+	widgets_notebook.o \
+	widgets_odcombobox.o \
+	widgets_radiobox.o \
+	widgets_searchctrl.o \
+	widgets_slider.o \
+	widgets_spinbtn.o \
+	widgets_static.o \
+	widgets_statbmp.o \
+	widgets_textctrl.o \
+	widgets_timepick.o \
+	widgets_toggle.o \
+	widgets_widgets.o \
+	$(__widgets___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___widgets___os2_emxbindcmd = $(NM) widgets$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep widgets$(EXEEXT) ; fi
+#__widgets___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___widgets___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__widgets_app_Contents_PkgInfo___depname \
+#	= widgets.app/Contents/PkgInfo
+#__widgets_bundle___depname = widgets_bundle
+#____widgets_BUNDLE_TGT_REF_DEP = \
+#	$(__widgets_app_Contents_PkgInfo___depname)
+#____widgets_BUNDLE_TGT_REF_DEP \
+#	= $(__widgets_app_Contents_PkgInfo___depname)
+#____widgets_BUNDLE_TGT_REF_DEP \
+#	= $(__widgets_app_Contents_PkgInfo___depname)
+#____widgets_BUNDLE_TGT_REF_DEP \
+#	= $(__widgets_app_Contents_PkgInfo___depname)
+#____widgets_BUNDLE_TGT_REF_DEP = \
+#	$(__widgets_app_Contents_PkgInfo___depname)
+#__NATIVE_OBJCPP_SRC_OBJECTS \
+#	= widgets_native_wrapper.o
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__widgets___win32rc = widgets_sample_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: widgets$(EXEEXT) $(__widgets_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f widgets$(EXEEXT)
+	rm -rf widgets.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc)
+	$(CXX) -o $@ $(WIDGETS_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__widgets___os2_emxbindcmd)
+
+#widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p widgets.app/Contents
+#	mkdir -p widgets.app/Contents/MacOS
+#	mkdir -p widgets.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/widgets/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >widgets.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >widgets.app/Contents/PkgInfo
+#	
+#	
+#	ln -f widgets$(EXEEXT) widgets.app/Contents/MacOS/widgets
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns widgets.app/Contents/Resources/wxmac.icns
+
+#widgets_bundle: $(____widgets_BUNDLE_TGT_REF_DEP)
+
+widgets_activityindicator.o: $(srcdir)/activityindicator.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/activityindicator.cpp
+
+widgets_bmpcombobox.o: $(srcdir)/bmpcombobox.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/bmpcombobox.cpp
+
+widgets_button.o: $(srcdir)/button.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/button.cpp
+
+widgets_checkbox.o: $(srcdir)/checkbox.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/checkbox.cpp
+
+widgets_choice.o: $(srcdir)/choice.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/choice.cpp
+
+widgets_clrpicker.o: $(srcdir)/clrpicker.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/clrpicker.cpp
+
+widgets_combobox.o: $(srcdir)/combobox.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/combobox.cpp
+
+widgets_datepick.o: $(srcdir)/datepick.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/datepick.cpp
+
+widgets_dirctrl.o: $(srcdir)/dirctrl.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/dirctrl.cpp
+
+widgets_dirpicker.o: $(srcdir)/dirpicker.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/dirpicker.cpp
+
+widgets_editlbox.o: $(srcdir)/editlbox.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/editlbox.cpp
+
+widgets_filectrl.o: $(srcdir)/filectrl.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/filectrl.cpp
+
+widgets_filepicker.o: $(srcdir)/filepicker.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/filepicker.cpp
+
+widgets_fontpicker.o: $(srcdir)/fontpicker.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/fontpicker.cpp
+
+widgets_gauge.o: $(srcdir)/gauge.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/gauge.cpp
+
+widgets_headerctrl.o: $(srcdir)/headerctrl.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/headerctrl.cpp
+
+widgets_hyperlnk.o: $(srcdir)/hyperlnk.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/hyperlnk.cpp
+
+widgets_itemcontainer.o: $(srcdir)/itemcontainer.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/itemcontainer.cpp
+
+widgets_listbox.o: $(srcdir)/listbox.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/listbox.cpp
+
+widgets_native_wrapper.o: $(srcdir)/native_wrapper.mm
+	$(CXXC) -c -o $@ $(WIDGETS_OBJCXXFLAGS) $(srcdir)/native_wrapper.mm
+
+widgets_native.o: $(srcdir)/native.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/native.cpp
+
+widgets_notebook.o: $(srcdir)/notebook.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/notebook.cpp
+
+widgets_odcombobox.o: $(srcdir)/odcombobox.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/odcombobox.cpp
+
+widgets_radiobox.o: $(srcdir)/radiobox.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/radiobox.cpp
+
+widgets_searchctrl.o: $(srcdir)/searchctrl.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/searchctrl.cpp
+
+widgets_slider.o: $(srcdir)/slider.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/slider.cpp
+
+widgets_spinbtn.o: $(srcdir)/spinbtn.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/spinbtn.cpp
+
+widgets_static.o: $(srcdir)/static.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/static.cpp
+
+widgets_statbmp.o: $(srcdir)/statbmp.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/statbmp.cpp
+
+widgets_textctrl.o: $(srcdir)/textctrl.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/textctrl.cpp
+
+widgets_timepick.o: $(srcdir)/timepick.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/timepick.cpp
+
+widgets_toggle.o: $(srcdir)/toggle.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/toggle.cpp
+
+widgets_widgets.o: $(srcdir)/widgets.cpp
+	$(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/widgets.cpp
+
+widgets_sample_rc.o: $(srcdir)/../sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean widgets_bundle
diff --git a/samples/wizard/Makefile b/samples/wizard/Makefile
new file mode 100644
index 0000000000..95b7adfbf5
--- /dev/null
+++ b/samples/wizard/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+WIZARD_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+WIZARD_OBJECTS =  \
+	$(__wizard___win32rc) \
+	wizard_wizard.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___wizard___os2_emxbindcmd = $(NM) wizard$(EXEEXT) | if grep \
+	-q pmwin.763 ; then emxbind -ep wizard$(EXEEXT) ; fi
+#__wizard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wizard___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__wizard___win32rc = wizard_sample_rc.o
+#__wizard_app_Contents_PkgInfo___depname \
+#	= wizard.app/Contents/PkgInfo
+#__wizard_bundle___depname = wizard_bundle
+#____wizard_BUNDLE_TGT_REF_DEP = \
+#	$(__wizard_app_Contents_PkgInfo___depname)
+#____wizard_BUNDLE_TGT_REF_DEP \
+#	= $(__wizard_app_Contents_PkgInfo___depname)
+#____wizard_BUNDLE_TGT_REF_DEP \
+#	= $(__wizard_app_Contents_PkgInfo___depname)
+#____wizard_BUNDLE_TGT_REF_DEP \
+#	= $(__wizard_app_Contents_PkgInfo___depname)
+#____wizard_BUNDLE_TGT_REF_DEP = \
+#	$(__wizard_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: wizard$(EXEEXT) $(__wizard_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f wizard$(EXEEXT)
+	rm -rf wizard.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
+	$(CXX) -o $@ $(WIZARD_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__wizard___os2_emxbindcmd)
+
+#wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p wizard.app/Contents
+#	mkdir -p wizard.app/Contents/MacOS
+#	mkdir -p wizard.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/wizard/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >wizard.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >wizard.app/Contents/PkgInfo
+#	
+#	
+#	ln -f wizard$(EXEEXT) wizard.app/Contents/MacOS/wizard
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns wizard.app/Contents/Resources/wxmac.icns
+
+#wizard_bundle: $(____wizard_BUNDLE_TGT_REF_DEP)
+
+wizard_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+wizard_wizard.o: $(srcdir)/wizard.cpp
+	$(CXXC) -c -o $@ $(WIZARD_CXXFLAGS) $(srcdir)/wizard.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean wizard_bundle
diff --git a/samples/wrapsizer/Makefile b/samples/wrapsizer/Makefile
new file mode 100644
index 0000000000..f8e3f66cb4
--- /dev/null
+++ b/samples/wrapsizer/Makefile
@@ -0,0 +1,190 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+WRAPSIZER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+WRAPSIZER_OBJECTS =  \
+	$(__wrapsizer___win32rc) \
+	wrapsizer_wrapsizer.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___wrapsizer___os2_emxbindcmd = $(NM) wrapsizer$(EXEEXT) | \
+	if grep -q pmwin.763 ; then emxbind -ep wrapsizer$(EXEEXT) ; fi
+#__wrapsizer___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wrapsizer___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__wrapsizer___win32rc = wrapsizer_sample_rc.o
+#__wrapsizer_app_Contents_PkgInfo___depname \
+#	= wrapsizer.app/Contents/PkgInfo
+#__wrapsizer_bundle___depname = wrapsizer_bundle
+#____wrapsizer_BUNDLE_TGT_REF_DEP = \
+#	$(__wrapsizer_app_Contents_PkgInfo___depname)
+#____wrapsizer_BUNDLE_TGT_REF_DEP \
+#	= $(__wrapsizer_app_Contents_PkgInfo___depname)
+#____wrapsizer_BUNDLE_TGT_REF_DEP \
+#	= $(__wrapsizer_app_Contents_PkgInfo___depname)
+#____wrapsizer_BUNDLE_TGT_REF_DEP \
+#	= $(__wrapsizer_app_Contents_PkgInfo___depname)
+#____wrapsizer_BUNDLE_TGT_REF_DEP = \
+#	$(__wrapsizer_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: wrapsizer$(EXEEXT) $(__wrapsizer_bundle___depname)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f wrapsizer$(EXEEXT)
+	rm -rf wrapsizer.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc)
+	$(CXX) -o $@ $(WRAPSIZER_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__wrapsizer___os2_emxbindcmd)
+
+#wrapsizer.app/Contents/PkgInfo: wrapsizer$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p wrapsizer.app/Contents
+#	mkdir -p wrapsizer.app/Contents/MacOS
+#	mkdir -p wrapsizer.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/wrapsizer/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >wrapsizer.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >wrapsizer.app/Contents/PkgInfo
+#	
+#	
+#	ln -f wrapsizer$(EXEEXT) wrapsizer.app/Contents/MacOS/wrapsizer
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns wrapsizer.app/Contents/Resources/wxmac.icns
+
+#wrapsizer_bundle: $(____wrapsizer_BUNDLE_TGT_REF_DEP)
+
+wrapsizer_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+wrapsizer_wrapsizer.o: $(srcdir)/wrapsizer.cpp
+	$(CXXC) -c -o $@ $(WRAPSIZER_CXXFLAGS) $(srcdir)/wrapsizer.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean wrapsizer_bundle
diff --git a/samples/xrc/Makefile b/samples/xrc/Makefile
new file mode 100644
index 0000000000..1ed1e05277
--- /dev/null
+++ b/samples/xrc/Makefile
@@ -0,0 +1,234 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -llzma -lm
+LDFLAGS_GUI = 
+CXX = g++
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-3.1
+EXTRALIBS = -pthread   -Wl,--version-script,$(wx_top_builddir)/version-script -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -llzma -lm 
+EXTRALIBS_XML =  -lexpat
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lXtst -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz -ljpeg -ltiff -llzma
+WX_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-3.1 -I${top_srcdir}/include -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gtk-3.0/unix-print -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsecret-1 -I/usr/include/webkitgtk-4.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4  -fvisibility=hidden -fvisibility-inlines-hidden
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = -Wl,-rpath,$(wx_top_builddir)/lib
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+XRCDEMO_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+XRCDEMO_OBJECTS =  \
+	$(__xrcdemo___win32rc) \
+	xrcdemo_xrcdemo.o \
+	xrcdemo_myframe.o \
+	xrcdemo_derivdlg.o \
+	xrcdemo_custclas.o \
+	xrcdemo_objrefdlg.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+__DLLFLAG_p = -DWXUSINGDLL
+__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd = $(NM) xrcdemo$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep xrcdemo$(EXEEXT) ; fi
+#__xrcdemo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__xrcdemo___win32rc = xrcdemo_sample_rc.o
+#__xrcdemo_app_Contents_PkgInfo___depname \
+#	= xrcdemo.app/Contents/PkgInfo
+#__xrcdemo_bundle___depname = xrcdemo_bundle
+#____xrcdemo_BUNDLE_TGT_REF_DEP = \
+#	$(__xrcdemo_app_Contents_PkgInfo___depname)
+#____xrcdemo_BUNDLE_TGT_REF_DEP \
+#	= $(__xrcdemo_app_Contents_PkgInfo___depname)
+#____xrcdemo_BUNDLE_TGT_REF_DEP \
+#	= $(__xrcdemo_app_Contents_PkgInfo___depname)
+#____xrcdemo_BUNDLE_TGT_REF_DEP \
+#	= $(__xrcdemo_app_Contents_PkgInfo___depname)
+#____xrcdemo_BUNDLE_TGT_REF_DEP = \
+#	$(__xrcdemo_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_AUI_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
+COND_MONOLITHIC_0___WXLIB_RIBBON_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_RIBBON_p = $(COND_MONOLITHIC_0___WXLIB_RIBBON_p)
+COND_MONOLITHIC_0___WXLIB_XRC_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_XRC_p = $(COND_MONOLITHIC_0___WXLIB_XRC_p)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_XML_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: xrcdemo$(EXEEXT) $(__xrcdemo_bundle___depname) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f xrcdemo$(EXEEXT)
+	rm -rf xrcdemo.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
+	$(CXX) -o $@ $(XRCDEMO_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_AUI_p)  $(__WXLIB_RIBBON_p)  $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__xrcdemo___os2_emxbindcmd)
+
+#xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p xrcdemo.app/Contents
+#	mkdir -p xrcdemo.app/Contents/MacOS
+#	mkdir -p xrcdemo.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/xrcdemo/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >xrcdemo.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >xrcdemo.app/Contents/PkgInfo
+#	
+#	
+#	ln -f xrcdemo$(EXEEXT) xrcdemo.app/Contents/MacOS/xrcdemo
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns xrcdemo.app/Contents/Resources/wxmac.icns
+
+#xrcdemo_bundle: $(____xrcdemo_BUNDLE_TGT_REF_DEP)
+
+data: 
+	@mkdir -p ./rc
+	@for f in aui.xpm aui.xrc artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc variants.xpm variants.xrc throbber.gif stop.xpm wxbanner.gif; do \
+	if test ! -f ./rc/$$f -a ! -d ./rc/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/rc/$$f -newer ./rc/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/rc/$$f ./rc ;; \
+	esac; \
+	done
+
+xrcdemo_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp
+	$(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $(srcdir)/xrcdemo.cpp
+
+xrcdemo_myframe.o: $(srcdir)/myframe.cpp
+	$(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $(srcdir)/myframe.cpp
+
+xrcdemo_derivdlg.o: $(srcdir)/derivdlg.cpp
+	$(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $(srcdir)/derivdlg.cpp
+
+xrcdemo_custclas.o: $(srcdir)/custclas.cpp
+	$(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $(srcdir)/custclas.cpp
+
+xrcdemo_objrefdlg.o: $(srcdir)/objrefdlg.cpp
+	$(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $(srcdir)/objrefdlg.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean xrcdemo_bundle data
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 0000000000..accc90045d
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,1215 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+SHARED_LD_MODULE_CXX = $(CXX) -shared -fPIC -o
+SO_SUFFIX_MODULE = so
+EXEEXT = 
+WINDRES = 
+PIC_FLAG = -fPIC -DPIC
+ICC_PCH_USE_SWITCH = 
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+BK_MAKE_PCH = 
+srcdir = .
+top_srcdir = ..
+DLLPREFIX_MODULE = 
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_MEDIA = -lgstplayer-1.0 -lgstvideo-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+TEST_CXXFLAGS = $(__test_PCH_INC) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-DwxUSE_GUI=0 -I$(top_srcdir)/3rdparty/catch/include $(WX_CXXFLAGS) \
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+TEST_OBJECTS =  \
+	test_test.o \
+	test_anytest.o \
+	test_archivetest.o \
+	test_ziptest.o \
+	test_tartest.o \
+	test_arrays.o \
+	test_base64.o \
+	test_cmdlinetest.o \
+	test_fileconf.o \
+	test_regconf.o \
+	test_datetimetest.o \
+	test_evthandler.o \
+	test_evtlooptest.o \
+	test_evtsource.o \
+	test_stopwatch.o \
+	test_timertest.o \
+	test_exec.o \
+	test_dir.o \
+	test_filefn.o \
+	test_filetest.o \
+	test_filekind.o \
+	test_filenametest.o \
+	test_filesystest.o \
+	test_fontmaptest.o \
+	test_formatconvertertest.o \
+	test_fswatchertest.o \
+	test_hashes.o \
+	test_output.o \
+	test_input.o \
+	test_intltest.o \
+	test_lists.o \
+	test_logtest.o \
+	test_longlongtest.o \
+	test_convautotest.o \
+	test_mbconvtest.o \
+	test_dynamiclib.o \
+	test_environ.o \
+	test_metatest.o \
+	test_misctests.o \
+	test_module.o \
+	test_pathlist.o \
+	test_typeinfotest.o \
+	test_ipc.o \
+	test_socket.o \
+	test_regextest.o \
+	test_wxregextest.o \
+	test_scopeguardtest.o \
+	test_iostream.o \
+	test_numformatter.o \
+	test_strings.o \
+	test_stdstrings.o \
+	test_tokenizer.o \
+	test_unichar.o \
+	test_unicode.o \
+	test_vararg.o \
+	test_crt.o \
+	test_vsnprintf.o \
+	test_hexconv.o \
+	test_datastreamtest.o \
+	test_ffilestream.o \
+	test_fileback.o \
+	test_filestream.o \
+	test_iostreams.o \
+	test_largefile.o \
+	test_lzmastream.o \
+	test_memstream.o \
+	test_socketstream.o \
+	test_sstream.o \
+	test_stdstream.o \
+	test_tempfile.o \
+	test_textstreamtest.o \
+	test_zlibstream.o \
+	test_textfiletest.o \
+	test_atomic.o \
+	test_misc.o \
+	test_queue.o \
+	test_tls.o \
+	test_ftp.o \
+	test_uris.o \
+	test_url.o \
+	test_vectors.o \
+	test_evtconnection.o \
+	test_weakref.o \
+	test_xlocale.o \
+	test_xmltest.o
+TEST_ODEP =  $(_____pch_testprec_test_testprec_h_gch___depname)
+TEST_DRAWING_CXXFLAGS = $(__test_drawing_PCH_INC) $(WX_CPPFLAGS) \
+	-D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+	-I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 \
+	-I$(top_srcdir)/3rdparty/catch/include $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) \
+	$(CPPFLAGS) $(CXXFLAGS)
+TEST_DRAWING_OBJECTS =  \
+	test_drawing_test.o \
+	test_drawing_drawing.o \
+	test_drawing_plugindriver.o \
+	test_drawing_basictest.o \
+	test_drawing_fonttest.o
+TEST_DRAWING_ODEP = \
+	$(_____pch_testprec_test_drawing_testprec_h_gch___depname)
+TEST_DRAWINGPLUGIN_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__DLLFLAG_p) $(PIC_FLAG) \
+	$(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+TEST_DRAWINGPLUGIN_OBJECTS =  \
+	test_drawingplugin_pluginsample.o
+TEST_GUI_CXXFLAGS = $(__test_gui_PCH_INC) $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../samples -I$(top_srcdir)/3rdparty/catch/include \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+TEST_GUI_OBJECTS =  \
+	$(__test_gui___win32rc) \
+	test_gui_asserthelper.o \
+	test_gui_test.o \
+	test_gui_testableframe.o \
+	test_gui_rect.o \
+	test_gui_size.o \
+	test_gui_point.o \
+	test_gui_region.o \
+	test_gui_bitmap.o \
+	test_gui_colour.o \
+	test_gui_ellipsization.o \
+	test_gui_measuring.o \
+	test_gui_affinematrix.o \
+	test_gui_boundingbox.o \
+	test_gui_clippingbox.o \
+	test_gui_graphmatrix.o \
+	test_gui_graphpath.o \
+	test_gui_config.o \
+	test_gui_auitest.o \
+	test_gui_bitmapcomboboxtest.o \
+	test_gui_bitmaptogglebuttontest.o \
+	test_gui_bookctrlbasetest.o \
+	test_gui_buttontest.o \
+	test_gui_checkboxtest.o \
+	test_gui_checklistboxtest.o \
+	test_gui_choicebooktest.o \
+	test_gui_choicetest.o \
+	test_gui_comboboxtest.o \
+	test_gui_dataviewctrltest.o \
+	test_gui_datepickerctrltest.o \
+	test_gui_frametest.o \
+	test_gui_gaugetest.o \
+	test_gui_gridtest.o \
+	test_gui_headerctrltest.o \
+	test_gui_htmllboxtest.o \
+	test_gui_hyperlinkctrltest.o \
+	test_gui_itemcontainertest.o \
+	test_gui_label.o \
+	test_gui_listbasetest.o \
+	test_gui_listbooktest.o \
+	test_gui_listboxtest.o \
+	test_gui_listctrltest.o \
+	test_gui_listviewtest.o \
+	test_gui_markuptest.o \
+	test_gui_notebooktest.o \
+	test_gui_ownerdrawncomboboxtest.o \
+	test_gui_pickerbasetest.o \
+	test_gui_pickertest.o \
+	test_gui_radioboxtest.o \
+	test_gui_radiobuttontest.o \
+	test_gui_rearrangelisttest.o \
+	test_gui_richtextctrltest.o \
+	test_gui_searchctrltest.o \
+	test_gui_simplebooktest.o \
+	test_gui_slidertest.o \
+	test_gui_spinctrldbltest.o \
+	test_gui_spinctrltest.o \
+	test_gui_styledtextctrltest.o \
+	test_gui_textctrltest.o \
+	test_gui_textentrytest.o \
+	test_gui_togglebuttontest.o \
+	test_gui_toolbooktest.o \
+	test_gui_treebooktest.o \
+	test_gui_treectrltest.o \
+	test_gui_treelistctrltest.o \
+	test_gui_virtlistctrltest.o \
+	test_gui_webtest.o \
+	test_gui_windowtest.o \
+	test_gui_dialogtest.o \
+	test_gui_clone.o \
+	test_gui_evtlooptest.o \
+	test_gui_propagation.o \
+	test_gui_keyboard.o \
+	test_gui_exec.o \
+	test_gui_fonttest.o \
+	test_gui_image.o \
+	test_gui_rawbmp.o \
+	test_gui_htmlparser.o \
+	test_gui_htmlwindow.o \
+	test_gui_htmprint.o \
+	test_gui_accelentry.o \
+	test_gui_menu.o \
+	test_gui_guifuncs.o \
+	test_gui_selstoretest.o \
+	test_gui_garbage.o \
+	test_gui_safearrayconverttest.o \
+	test_gui_settings.o \
+	test_gui_socket.o \
+	test_gui_tlw.o \
+	test_gui_dataview.o \
+	test_gui_rowheightcachetest.o \
+	test_gui_boxsizer.o \
+	test_gui_gridsizer.o \
+	test_gui_wrapsizer.o \
+	test_gui_toplevel.o \
+	test_gui_valnum.o \
+	test_gui_valtext.o \
+	test_gui_clientsize.o \
+	test_gui_setsize.o \
+	test_gui_xrctest.o
+TEST_GUI_ODEP =  $(_____pch_testprec_test_gui_testprec_h_gch___depname)
+TEST_ALLHEADERS_CXXFLAGS = $(__test_allheaders_PCH_INC) $(WX_CPPFLAGS) \
+	-D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../samples \
+	-I$(top_srcdir)/3rdparty/catch/include $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) \
+	$(CPPFLAGS) $(CXXFLAGS)
+TEST_ALLHEADERS_OBJECTS =  \
+	$(__test_allheaders___win32rc) \
+	test_allheaders_asserthelper.o \
+	test_allheaders_test.o \
+	test_allheaders_allheaders.o \
+	test_allheaders_testableframe.o
+TEST_ALLHEADERS_ODEP = \
+	$(_____pch_testprec_test_allheaders_testprec_h_gch___depname)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__test_PCH_INC = -I./.pch/testprec_test
+#__test_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+#	./.pch/testprec_test/testprec.h.gch
+#_____pch_testprec_test_testprec_h_gch___depname \
+#	= ./.pch/testprec_test/testprec.h.gch
+#__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+__test_drawing___depname = test_drawing$(EXEEXT)
+#__test_drawing_PCH_INC = -I./.pch/testprec_test_drawing
+#__test_drawing_PCH_INC = \
+#	$(ICC_PCH_USE_SWITCH) \
+#	./.pch/testprec_test_drawing/testprec.h.gch
+#_____pch_testprec_test_drawing_testprec_h_gch___depname \
+#	= ./.pch/testprec_test_drawing/testprec.h.gch
+#__test_drawingplugin___depname \
+#	= \
+#	$(DLLPREFIX_MODULE)test_drawingplugin.$(SO_SUFFIX_MODULE)
+__test_gui___depname = test_gui$(EXEEXT)
+#__test_gui_app_Contents_PkgInfo___depname \
+#	= test_gui.app/Contents/PkgInfo
+#__test_gui_bundle___depname \
+#	= test_gui_bundle
+#____test_gui_BUNDLE_TGT_REF_DEP = \
+#	$(__test_gui_app_Contents_PkgInfo___depname)
+#____test_gui_BUNDLE_TGT_REF_DEP = \
+#	$(__test_gui_app_Contents_PkgInfo___depname)
+#____test_gui_BUNDLE_TGT_REF_DEP \
+#	= $(__test_gui_app_Contents_PkgInfo___depname)
+#____test_gui_BUNDLE_TGT_REF_DEP \
+#	= $(__test_gui_app_Contents_PkgInfo___depname)
+#____test_gui_BUNDLE_TGT_REF_DEP \
+#	= $(__test_gui_app_Contents_PkgInfo___depname)
+#__test_gui___win32rc = test_gui_sample_rc.o
+#__test_gui_PCH_INC = -I./.pch/testprec_test_gui
+#__test_gui_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+#	./.pch/testprec_test_gui/testprec.h.gch
+#_____pch_testprec_test_gui_testprec_h_gch___depname \
+#	= ./.pch/testprec_test_gui/testprec.h.gch
+COND_MONOLITHIC_0___WXLIB_AUI_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
+COND_MONOLITHIC_0___WXLIB_RICHTEXT_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_RICHTEXT_p = $(COND_MONOLITHIC_0___WXLIB_RICHTEXT_p)
+COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_MEDIA_p = $(COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p)
+COND_MONOLITHIC_0___WXLIB_XRC_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_XRC_p = $(COND_MONOLITHIC_0___WXLIB_XRC_p)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+__test_allheaders___depname = test_allheaders$(EXEEXT)
+#__test_allheaders_app_Contents_PkgInfo___depname \
+#	= test_allheaders.app/Contents/PkgInfo
+#__test_allheaders_bundle___depname \
+#	= test_allheaders_bundle
+#____test_allheaders_BUNDLE_TGT_REF_DEP \
+#	= $(__test_allheaders_app_Contents_PkgInfo___depname)
+#____test_allheaders_BUNDLE_TGT_REF_DEP \
+#	= $(__test_allheaders_app_Contents_PkgInfo___depname)
+#____test_allheaders_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__test_allheaders_app_Contents_PkgInfo___depname)
+#____test_allheaders_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__test_allheaders_app_Contents_PkgInfo___depname)
+#____test_allheaders_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__test_allheaders_app_Contents_PkgInfo___depname)
+#__test_allheaders___win32rc = \
+#	test_allheaders_sample_rc.o
+#__test_allheaders_PCH_INC = \
+#	-I./.pch/testprec_test_allheaders
+#__test_allheaders_PCH_INC = \
+#	$(ICC_PCH_USE_SWITCH) \
+#	./.pch/testprec_test_allheaders/testprec.h.gch
+#_____pch_testprec_test_allheaders_testprec_h_gch___depname \
+#	= ./.pch/testprec_test_allheaders/testprec.h.gch
+COND_MONOLITHIC_0___WXLIB_XML_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_0 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_0 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_0 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_WEBVIEW_p = $(COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p)
+COND_MONOLITHIC_0_USE_STC_1___WXLIB_STC_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_STC_p = $(COND_MONOLITHIC_0_USE_STC_1___WXLIB_STC_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_NET_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: test$(EXEEXT) $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) $(__test_gui_bundle___depname) $(__test_allheaders___depname) $(__test_allheaders_bundle___depname) data data-images fr ja
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f test$(EXEEXT)
+	rm -f test_drawing$(EXEEXT)
+	rm -f $(DLLPREFIX_MODULE)test_drawingplugin.$(SO_SUFFIX_MODULE)
+	rm -f test_gui$(EXEEXT)
+	rm -rf test_gui.app
+	rm -f test_allheaders$(EXEEXT)
+	rm -rf test_allheaders.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+test$(EXEEXT): $(TEST_OBJECTS)
+	$(CXX) -o $@ $(TEST_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_NET_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+#./.pch/testprec_test/testprec.h.gch: 
+#	$(BK_MAKE_PCH) ./.pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS)
+
+test_drawing$(EXEEXT): $(TEST_DRAWING_OBJECTS)
+	$(CXX) -o $@ $(TEST_DRAWING_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+#./.pch/testprec_test_drawing/testprec.h.gch: 
+#	$(BK_MAKE_PCH) ./.pch/testprec_test_drawing/testprec.h.gch testprec.h $(CXX) $(TEST_DRAWING_CXXFLAGS)
+
+#$(DLLPREFIX_MODULE)test_drawingplugin.$(SO_SUFFIX_MODULE): $(TEST_DRAWINGPLUGIN_OBJECTS)
+#	$(SHARED_LD_MODULE_CXX) $@ $(TEST_DRAWINGPLUGIN_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc)
+	$(CXX) -o $@ $(TEST_GUI_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+#test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p test_gui.app/Contents
+#	mkdir -p test_gui.app/Contents/MacOS
+#	mkdir -p test_gui.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/test_gui/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >test_gui.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >test_gui.app/Contents/PkgInfo
+#	
+#	
+#	ln -f test_gui$(EXEEXT) test_gui.app/Contents/MacOS/test_gui
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns test_gui.app/Contents/Resources/wxmac.icns
+
+#test_gui_bundle: $(____test_gui_BUNDLE_TGT_REF_DEP)
+
+#./.pch/testprec_test_gui/testprec.h.gch: 
+#	$(BK_MAKE_PCH) ./.pch/testprec_test_gui/testprec.h.gch testprec.h $(CXX) $(TEST_GUI_CXXFLAGS)
+
+test_allheaders$(EXEEXT): $(TEST_ALLHEADERS_OBJECTS) $(__test_allheaders___win32rc)
+	$(CXX) -o $@ $(TEST_ALLHEADERS_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+#test_allheaders.app/Contents/PkgInfo: $(__test_allheaders___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p test_allheaders.app/Contents
+#	mkdir -p test_allheaders.app/Contents/MacOS
+#	mkdir -p test_allheaders.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/test_allheaders/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >test_allheaders.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >test_allheaders.app/Contents/PkgInfo
+#	
+#	
+#	ln -f test_allheaders$(EXEEXT) test_allheaders.app/Contents/MacOS/test_allheaders
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns test_allheaders.app/Contents/Resources/wxmac.icns
+
+#test_allheaders_bundle: $(____test_allheaders_BUNDLE_TGT_REF_DEP)
+
+#./.pch/testprec_test_allheaders/testprec.h.gch: 
+#	$(BK_MAKE_PCH) ./.pch/testprec_test_allheaders/testprec.h.gch testprec.h $(CXX) $(TEST_ALLHEADERS_CXXFLAGS)
+
+data: 
+	@mkdir -p .
+	@for f in horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+data-images: 
+	@mkdir -p image
+	@for f in horse_grey.bmp horse_grey_flipped.bmp horse_rle4.bmp horse_rle4_flipped.bmp horse_rle8.bmp horse_rle8_flipped.bmp horse_bicubic_50x50.png horse_bicubic_100x100.png horse_bicubic_150x150.png horse_bicubic_300x300.png horse_bilinear_50x50.png horse_bilinear_100x100.png horse_bilinear_150x150.png horse_bilinear_300x300.png horse_box_average_50x50.png horse_box_average_100x100.png horse_box_average_150x150.png horse_box_average_300x300.png cross_bicubic_256x256.png cross_bilinear_256x256.png cross_box_average_256x256.png cross_nearest_neighb_256x256.png; do \
+	if test ! -f image/$$f -a ! -d image/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/image/$$f -newer image/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/image/$$f image ;; \
+	esac; \
+	done
+
+fr: 
+	@mkdir -p ./intl/fr
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./intl/fr/$$f -a ! -d ./intl/fr/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/intl/fr/$$f -newer ./intl/fr/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/intl/fr/$$f ./intl/fr ;; \
+	esac; \
+	done
+
+ja: 
+	@mkdir -p ./intl/ja
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./intl/ja/$$f -a ! -d ./intl/ja/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/intl/ja/$$f -newer ./intl/ja/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/intl/ja/$$f ./intl/ja ;; \
+	esac; \
+	done
+
+test_test.o: $(srcdir)/test.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/test.cpp
+
+test_anytest.o: $(srcdir)/any/anytest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/any/anytest.cpp
+
+test_archivetest.o: $(srcdir)/archive/archivetest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/archive/archivetest.cpp
+
+test_ziptest.o: $(srcdir)/archive/ziptest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/archive/ziptest.cpp
+
+test_tartest.o: $(srcdir)/archive/tartest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/archive/tartest.cpp
+
+test_arrays.o: $(srcdir)/arrays/arrays.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/arrays/arrays.cpp
+
+test_base64.o: $(srcdir)/base64/base64.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/base64/base64.cpp
+
+test_cmdlinetest.o: $(srcdir)/cmdline/cmdlinetest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/cmdline/cmdlinetest.cpp
+
+test_fileconf.o: $(srcdir)/config/fileconf.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/config/fileconf.cpp
+
+test_regconf.o: $(srcdir)/config/regconf.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/config/regconf.cpp
+
+test_datetimetest.o: $(srcdir)/datetime/datetimetest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/datetime/datetimetest.cpp
+
+test_evthandler.o: $(srcdir)/events/evthandler.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/evthandler.cpp
+
+test_evtlooptest.o: $(srcdir)/events/evtlooptest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/evtlooptest.cpp
+
+test_evtsource.o: $(srcdir)/events/evtsource.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/evtsource.cpp
+
+test_stopwatch.o: $(srcdir)/events/stopwatch.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/stopwatch.cpp
+
+test_timertest.o: $(srcdir)/events/timertest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/timertest.cpp
+
+test_exec.o: $(srcdir)/exec/exec.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/exec/exec.cpp
+
+test_dir.o: $(srcdir)/file/dir.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/file/dir.cpp
+
+test_filefn.o: $(srcdir)/file/filefn.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/file/filefn.cpp
+
+test_filetest.o: $(srcdir)/file/filetest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/file/filetest.cpp
+
+test_filekind.o: $(srcdir)/filekind/filekind.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/filekind/filekind.cpp
+
+test_filenametest.o: $(srcdir)/filename/filenametest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/filename/filenametest.cpp
+
+test_filesystest.o: $(srcdir)/filesys/filesystest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/filesys/filesystest.cpp
+
+test_fontmaptest.o: $(srcdir)/fontmap/fontmaptest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/fontmap/fontmaptest.cpp
+
+test_formatconvertertest.o: $(srcdir)/formatconverter/formatconvertertest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/formatconverter/formatconvertertest.cpp
+
+test_fswatchertest.o: $(srcdir)/fswatcher/fswatchertest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/fswatcher/fswatchertest.cpp
+
+test_hashes.o: $(srcdir)/hashes/hashes.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/hashes/hashes.cpp
+
+test_output.o: $(srcdir)/interactive/output.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/interactive/output.cpp
+
+test_input.o: $(srcdir)/interactive/input.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/interactive/input.cpp
+
+test_intltest.o: $(srcdir)/intl/intltest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/intl/intltest.cpp
+
+test_lists.o: $(srcdir)/lists/lists.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/lists/lists.cpp
+
+test_logtest.o: $(srcdir)/log/logtest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/log/logtest.cpp
+
+test_longlongtest.o: $(srcdir)/longlong/longlongtest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/longlong/longlongtest.cpp
+
+test_convautotest.o: $(srcdir)/mbconv/convautotest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/mbconv/convautotest.cpp
+
+test_mbconvtest.o: $(srcdir)/mbconv/mbconvtest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/mbconv/mbconvtest.cpp
+
+test_dynamiclib.o: $(srcdir)/misc/dynamiclib.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/misc/dynamiclib.cpp
+
+test_environ.o: $(srcdir)/misc/environ.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/misc/environ.cpp
+
+test_metatest.o: $(srcdir)/misc/metatest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/misc/metatest.cpp
+
+test_misctests.o: $(srcdir)/misc/misctests.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/misc/misctests.cpp
+
+test_module.o: $(srcdir)/misc/module.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/misc/module.cpp
+
+test_pathlist.o: $(srcdir)/misc/pathlist.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/misc/pathlist.cpp
+
+test_typeinfotest.o: $(srcdir)/misc/typeinfotest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/misc/typeinfotest.cpp
+
+test_ipc.o: $(srcdir)/net/ipc.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/net/ipc.cpp
+
+test_socket.o: $(srcdir)/net/socket.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/net/socket.cpp
+
+test_regextest.o: $(srcdir)/regex/regextest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/regex/regextest.cpp
+
+test_wxregextest.o: $(srcdir)/regex/wxregextest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/regex/wxregextest.cpp
+
+test_scopeguardtest.o: $(srcdir)/scopeguard/scopeguardtest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/scopeguard/scopeguardtest.cpp
+
+test_iostream.o: $(srcdir)/strings/iostream.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/iostream.cpp
+
+test_numformatter.o: $(srcdir)/strings/numformatter.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/numformatter.cpp
+
+test_strings.o: $(srcdir)/strings/strings.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/strings.cpp
+
+test_stdstrings.o: $(srcdir)/strings/stdstrings.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/stdstrings.cpp
+
+test_tokenizer.o: $(srcdir)/strings/tokenizer.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/tokenizer.cpp
+
+test_unichar.o: $(srcdir)/strings/unichar.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/unichar.cpp
+
+test_unicode.o: $(srcdir)/strings/unicode.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/unicode.cpp
+
+test_vararg.o: $(srcdir)/strings/vararg.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/vararg.cpp
+
+test_crt.o: $(srcdir)/strings/crt.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/crt.cpp
+
+test_vsnprintf.o: $(srcdir)/strings/vsnprintf.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/vsnprintf.cpp
+
+test_hexconv.o: $(srcdir)/strings/hexconv.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/hexconv.cpp
+
+test_datastreamtest.o: $(srcdir)/streams/datastreamtest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/datastreamtest.cpp
+
+test_ffilestream.o: $(srcdir)/streams/ffilestream.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/ffilestream.cpp
+
+test_fileback.o: $(srcdir)/streams/fileback.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/fileback.cpp
+
+test_filestream.o: $(srcdir)/streams/filestream.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/filestream.cpp
+
+test_iostreams.o: $(srcdir)/streams/iostreams.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/iostreams.cpp
+
+test_largefile.o: $(srcdir)/streams/largefile.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/largefile.cpp
+
+test_lzmastream.o: $(srcdir)/streams/lzmastream.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/lzmastream.cpp
+
+test_memstream.o: $(srcdir)/streams/memstream.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/memstream.cpp
+
+test_socketstream.o: $(srcdir)/streams/socketstream.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/socketstream.cpp
+
+test_sstream.o: $(srcdir)/streams/sstream.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/sstream.cpp
+
+test_stdstream.o: $(srcdir)/streams/stdstream.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/stdstream.cpp
+
+test_tempfile.o: $(srcdir)/streams/tempfile.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/tempfile.cpp
+
+test_textstreamtest.o: $(srcdir)/streams/textstreamtest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/textstreamtest.cpp
+
+test_zlibstream.o: $(srcdir)/streams/zlibstream.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/zlibstream.cpp
+
+test_textfiletest.o: $(srcdir)/textfile/textfiletest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/textfile/textfiletest.cpp
+
+test_atomic.o: $(srcdir)/thread/atomic.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/thread/atomic.cpp
+
+test_misc.o: $(srcdir)/thread/misc.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/thread/misc.cpp
+
+test_queue.o: $(srcdir)/thread/queue.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/thread/queue.cpp
+
+test_tls.o: $(srcdir)/thread/tls.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/thread/tls.cpp
+
+test_ftp.o: $(srcdir)/uris/ftp.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/uris/ftp.cpp
+
+test_uris.o: $(srcdir)/uris/uris.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/uris/uris.cpp
+
+test_url.o: $(srcdir)/uris/url.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/uris/url.cpp
+
+test_vectors.o: $(srcdir)/vectors/vectors.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/vectors/vectors.cpp
+
+test_evtconnection.o: $(srcdir)/weakref/evtconnection.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/weakref/evtconnection.cpp
+
+test_weakref.o: $(srcdir)/weakref/weakref.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/weakref/weakref.cpp
+
+test_xlocale.o: $(srcdir)/xlocale/xlocale.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/xlocale/xlocale.cpp
+
+test_xmltest.o: $(srcdir)/xml/xmltest.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/xml/xmltest.cpp
+
+test_drawing_test.o: $(srcdir)/test.cpp $(TEST_DRAWING_ODEP)
+	$(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/test.cpp
+
+test_drawing_drawing.o: $(srcdir)/drawing/drawing.cpp $(TEST_DRAWING_ODEP)
+	$(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/drawing/drawing.cpp
+
+test_drawing_plugindriver.o: $(srcdir)/drawing/plugindriver.cpp $(TEST_DRAWING_ODEP)
+	$(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/drawing/plugindriver.cpp
+
+test_drawing_basictest.o: $(srcdir)/drawing/basictest.cpp $(TEST_DRAWING_ODEP)
+	$(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/drawing/basictest.cpp
+
+test_drawing_fonttest.o: $(srcdir)/drawing/fonttest.cpp $(TEST_DRAWING_ODEP)
+	$(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/drawing/fonttest.cpp
+
+test_drawingplugin_pluginsample.o: $(srcdir)/drawing/pluginsample.cpp
+	$(CXXC) -c -o $@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $(srcdir)/drawing/pluginsample.cpp
+
+test_gui_sample_rc.o: $(srcdir)/../samples/sample.rc $(TEST_GUI_ODEP)
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)  --include-dir $(srcdir) $(__DLLFLAG_p_0) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/3rdparty/catch/include
+
+test_gui_asserthelper.o: $(srcdir)/asserthelper.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/asserthelper.cpp
+
+test_gui_test.o: $(srcdir)/test.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/test.cpp
+
+test_gui_testableframe.o: $(srcdir)/testableframe.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/testableframe.cpp
+
+test_gui_rect.o: $(srcdir)/geometry/rect.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/geometry/rect.cpp
+
+test_gui_size.o: $(srcdir)/geometry/size.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/geometry/size.cpp
+
+test_gui_point.o: $(srcdir)/geometry/point.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/geometry/point.cpp
+
+test_gui_region.o: $(srcdir)/geometry/region.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/geometry/region.cpp
+
+test_gui_bitmap.o: $(srcdir)/graphics/bitmap.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/bitmap.cpp
+
+test_gui_colour.o: $(srcdir)/graphics/colour.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/colour.cpp
+
+test_gui_ellipsization.o: $(srcdir)/graphics/ellipsization.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/ellipsization.cpp
+
+test_gui_measuring.o: $(srcdir)/graphics/measuring.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/measuring.cpp
+
+test_gui_affinematrix.o: $(srcdir)/graphics/affinematrix.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/affinematrix.cpp
+
+test_gui_boundingbox.o: $(srcdir)/graphics/boundingbox.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/boundingbox.cpp
+
+test_gui_clippingbox.o: $(srcdir)/graphics/clippingbox.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/clippingbox.cpp
+
+test_gui_graphmatrix.o: $(srcdir)/graphics/graphmatrix.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/graphmatrix.cpp
+
+test_gui_graphpath.o: $(srcdir)/graphics/graphpath.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/graphpath.cpp
+
+test_gui_config.o: $(srcdir)/config/config.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/config/config.cpp
+
+test_gui_auitest.o: $(srcdir)/controls/auitest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/auitest.cpp
+
+test_gui_bitmapcomboboxtest.o: $(srcdir)/controls/bitmapcomboboxtest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/bitmapcomboboxtest.cpp
+
+test_gui_bitmaptogglebuttontest.o: $(srcdir)/controls/bitmaptogglebuttontest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/bitmaptogglebuttontest.cpp
+
+test_gui_bookctrlbasetest.o: $(srcdir)/controls/bookctrlbasetest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/bookctrlbasetest.cpp
+
+test_gui_buttontest.o: $(srcdir)/controls/buttontest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/buttontest.cpp
+
+test_gui_checkboxtest.o: $(srcdir)/controls/checkboxtest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/checkboxtest.cpp
+
+test_gui_checklistboxtest.o: $(srcdir)/controls/checklistboxtest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/checklistboxtest.cpp
+
+test_gui_choicebooktest.o: $(srcdir)/controls/choicebooktest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/choicebooktest.cpp
+
+test_gui_choicetest.o: $(srcdir)/controls/choicetest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/choicetest.cpp
+
+test_gui_comboboxtest.o: $(srcdir)/controls/comboboxtest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/comboboxtest.cpp
+
+test_gui_dataviewctrltest.o: $(srcdir)/controls/dataviewctrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/dataviewctrltest.cpp
+
+test_gui_datepickerctrltest.o: $(srcdir)/controls/datepickerctrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/datepickerctrltest.cpp
+
+test_gui_frametest.o: $(srcdir)/controls/frametest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/frametest.cpp
+
+test_gui_gaugetest.o: $(srcdir)/controls/gaugetest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/gaugetest.cpp
+
+test_gui_gridtest.o: $(srcdir)/controls/gridtest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/gridtest.cpp
+
+test_gui_headerctrltest.o: $(srcdir)/controls/headerctrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/headerctrltest.cpp
+
+test_gui_htmllboxtest.o: $(srcdir)/controls/htmllboxtest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/htmllboxtest.cpp
+
+test_gui_hyperlinkctrltest.o: $(srcdir)/controls/hyperlinkctrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/hyperlinkctrltest.cpp
+
+test_gui_itemcontainertest.o: $(srcdir)/controls/itemcontainertest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/itemcontainertest.cpp
+
+test_gui_label.o: $(srcdir)/controls/label.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/label.cpp
+
+test_gui_listbasetest.o: $(srcdir)/controls/listbasetest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/listbasetest.cpp
+
+test_gui_listbooktest.o: $(srcdir)/controls/listbooktest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/listbooktest.cpp
+
+test_gui_listboxtest.o: $(srcdir)/controls/listboxtest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/listboxtest.cpp
+
+test_gui_listctrltest.o: $(srcdir)/controls/listctrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/listctrltest.cpp
+
+test_gui_listviewtest.o: $(srcdir)/controls/listviewtest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/listviewtest.cpp
+
+test_gui_markuptest.o: $(srcdir)/controls/markuptest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/markuptest.cpp
+
+test_gui_notebooktest.o: $(srcdir)/controls/notebooktest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/notebooktest.cpp
+
+test_gui_ownerdrawncomboboxtest.o: $(srcdir)/controls/ownerdrawncomboboxtest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/ownerdrawncomboboxtest.cpp
+
+test_gui_pickerbasetest.o: $(srcdir)/controls/pickerbasetest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/pickerbasetest.cpp
+
+test_gui_pickertest.o: $(srcdir)/controls/pickertest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/pickertest.cpp
+
+test_gui_radioboxtest.o: $(srcdir)/controls/radioboxtest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/radioboxtest.cpp
+
+test_gui_radiobuttontest.o: $(srcdir)/controls/radiobuttontest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/radiobuttontest.cpp
+
+test_gui_rearrangelisttest.o: $(srcdir)/controls/rearrangelisttest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/rearrangelisttest.cpp
+
+test_gui_richtextctrltest.o: $(srcdir)/controls/richtextctrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/richtextctrltest.cpp
+
+test_gui_searchctrltest.o: $(srcdir)/controls/searchctrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/searchctrltest.cpp
+
+test_gui_simplebooktest.o: $(srcdir)/controls/simplebooktest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/simplebooktest.cpp
+
+test_gui_slidertest.o: $(srcdir)/controls/slidertest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/slidertest.cpp
+
+test_gui_spinctrldbltest.o: $(srcdir)/controls/spinctrldbltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/spinctrldbltest.cpp
+
+test_gui_spinctrltest.o: $(srcdir)/controls/spinctrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/spinctrltest.cpp
+
+test_gui_styledtextctrltest.o: $(srcdir)/controls/styledtextctrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/styledtextctrltest.cpp
+
+test_gui_textctrltest.o: $(srcdir)/controls/textctrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/textctrltest.cpp
+
+test_gui_textentrytest.o: $(srcdir)/controls/textentrytest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/textentrytest.cpp
+
+test_gui_togglebuttontest.o: $(srcdir)/controls/togglebuttontest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/togglebuttontest.cpp
+
+test_gui_toolbooktest.o: $(srcdir)/controls/toolbooktest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/toolbooktest.cpp
+
+test_gui_treebooktest.o: $(srcdir)/controls/treebooktest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/treebooktest.cpp
+
+test_gui_treectrltest.o: $(srcdir)/controls/treectrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/treectrltest.cpp
+
+test_gui_treelistctrltest.o: $(srcdir)/controls/treelistctrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/treelistctrltest.cpp
+
+test_gui_virtlistctrltest.o: $(srcdir)/controls/virtlistctrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/virtlistctrltest.cpp
+
+test_gui_webtest.o: $(srcdir)/controls/webtest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/webtest.cpp
+
+test_gui_windowtest.o: $(srcdir)/controls/windowtest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/windowtest.cpp
+
+test_gui_dialogtest.o: $(srcdir)/controls/dialogtest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/dialogtest.cpp
+
+test_gui_clone.o: $(srcdir)/events/clone.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/clone.cpp
+
+test_gui_evtlooptest.o: $(srcdir)/events/evtlooptest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/evtlooptest.cpp
+
+test_gui_propagation.o: $(srcdir)/events/propagation.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/propagation.cpp
+
+test_gui_keyboard.o: $(srcdir)/events/keyboard.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/keyboard.cpp
+
+test_gui_exec.o: $(srcdir)/exec/exec.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/exec/exec.cpp
+
+test_gui_fonttest.o: $(srcdir)/font/fonttest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/font/fonttest.cpp
+
+test_gui_image.o: $(srcdir)/image/image.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/image/image.cpp
+
+test_gui_rawbmp.o: $(srcdir)/image/rawbmp.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/image/rawbmp.cpp
+
+test_gui_htmlparser.o: $(srcdir)/html/htmlparser.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/html/htmlparser.cpp
+
+test_gui_htmlwindow.o: $(srcdir)/html/htmlwindow.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/html/htmlwindow.cpp
+
+test_gui_htmprint.o: $(srcdir)/html/htmprint.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/html/htmprint.cpp
+
+test_gui_accelentry.o: $(srcdir)/menu/accelentry.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/menu/accelentry.cpp
+
+test_gui_menu.o: $(srcdir)/menu/menu.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/menu/menu.cpp
+
+test_gui_guifuncs.o: $(srcdir)/misc/guifuncs.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/misc/guifuncs.cpp
+
+test_gui_selstoretest.o: $(srcdir)/misc/selstoretest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/misc/selstoretest.cpp
+
+test_gui_garbage.o: $(srcdir)/misc/garbage.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/misc/garbage.cpp
+
+test_gui_safearrayconverttest.o: $(srcdir)/misc/safearrayconverttest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/misc/safearrayconverttest.cpp
+
+test_gui_settings.o: $(srcdir)/misc/settings.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/misc/settings.cpp
+
+test_gui_socket.o: $(srcdir)/net/socket.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/net/socket.cpp
+
+test_gui_tlw.o: $(srcdir)/persistence/tlw.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/persistence/tlw.cpp
+
+test_gui_dataview.o: $(srcdir)/persistence/dataview.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/persistence/dataview.cpp
+
+test_gui_rowheightcachetest.o: $(srcdir)/rowheightcache/rowheightcachetest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/rowheightcache/rowheightcachetest.cpp
+
+test_gui_boxsizer.o: $(srcdir)/sizers/boxsizer.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/sizers/boxsizer.cpp
+
+test_gui_gridsizer.o: $(srcdir)/sizers/gridsizer.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/sizers/gridsizer.cpp
+
+test_gui_wrapsizer.o: $(srcdir)/sizers/wrapsizer.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/sizers/wrapsizer.cpp
+
+test_gui_toplevel.o: $(srcdir)/toplevel/toplevel.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/toplevel/toplevel.cpp
+
+test_gui_valnum.o: $(srcdir)/validators/valnum.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/validators/valnum.cpp
+
+test_gui_valtext.o: $(srcdir)/validators/valtext.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/validators/valtext.cpp
+
+test_gui_clientsize.o: $(srcdir)/window/clientsize.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/window/clientsize.cpp
+
+test_gui_setsize.o: $(srcdir)/window/setsize.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/window/setsize.cpp
+
+test_gui_xrctest.o: $(srcdir)/xml/xrctest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/xml/xrctest.cpp
+
+test_allheaders_sample_rc.o: $(srcdir)/../samples/sample.rc $(TEST_ALLHEADERS_ODEP)
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)  --include-dir $(srcdir) $(__DLLFLAG_p_0) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include --include-dir $(top_srcdir)/3rdparty/catch/include
+
+test_allheaders_asserthelper.o: $(srcdir)/asserthelper.cpp $(TEST_ALLHEADERS_ODEP)
+	$(CXXC) -c -o $@ $(TEST_ALLHEADERS_CXXFLAGS) $(srcdir)/asserthelper.cpp
+
+test_allheaders_test.o: $(srcdir)/test.cpp $(TEST_ALLHEADERS_ODEP)
+	$(CXXC) -c -o $@ $(TEST_ALLHEADERS_CXXFLAGS) $(srcdir)/test.cpp
+
+test_allheaders_allheaders.o: $(srcdir)/allheaders.cpp $(TEST_ALLHEADERS_ODEP)
+	$(CXXC) -c -o $@ $(TEST_ALLHEADERS_CXXFLAGS) $(srcdir)/allheaders.cpp
+
+test_allheaders_testableframe.o: $(srcdir)/testableframe.cpp $(TEST_ALLHEADERS_ODEP)
+	$(CXXC) -c -o $@ $(TEST_ALLHEADERS_CXXFLAGS) $(srcdir)/testableframe.cpp
+
+
+failtest: failtest_combobox failtest_evthandler failtest_weakref failtest_allheaders
+
+failtest_combobox:
+	@$(RM) test_gui_comboboxtest.o
+	if $(MAKE) CPPFLAGS=-DTEST_INVALID_COMBOBOX_ISEMPTY test_gui_comboboxtest.o 2>/dev/null; then \
+	    echo "*** Compilation with TEST_INVALID_COMBOBOX_ISEMPTY unexpectedly succeeded.">&2; \
+	    exit 1; \
+	fi; \
+	exit 0
+
+failtest_evthandler:
+	@$(RM) test_evthandler.o
+	@for d in BIND_GLOBAL BIND_STATIC BIND_METHOD BIND_FUNCTOR BIND_NO_HANDLER BIND_DERIVED BIND_WRONG_CLASS EVENT_CREATION; do \
+	    if $(MAKE) CPPFLAGS=-DTEST_INVALID_$$d test_evthandler.o 2>/dev/null; then \
+	        echo "*** Compilation with TEST_INVALID_$$d unexpectedly succeeded.">&2; \
+	        exit 1; \
+	    fi; \
+	done; \
+	exit 0
+
+failtest_weakref:
+	@$(RM) test_weakref.o
+	if $(MAKE) CPPFLAGS=-DTEST_INVALID_INCOMPLETE_WEAKREF test_weakref.o 2>/dev/null; then \
+	    echo "*** Compilation with TEST_INVALID_INCOMPLETE_WEAKREF unexpectedly succeeded.">&2; \
+	    exit 1; \
+	fi; \
+	exit 0
+
+failtest_allheaders:
+	@$(RM) test_allheaders.o
+	if $(MAKE) CPPFLAGS=-DwxNO_IMPLICIT_WXSTRING_ENCODING -DTEST_IMPLICIT_WXSTRING_ENCODING test_allheaders.o 2>/dev/null; then \
+	    echo "*** Compilation with TEST_IMPLICIT_WXSTRING_ENCODING unexpectedly succeeded.">&2; \
+	    exit 1; \
+	fi; \
+	exit 0
+
+.PHONY: failtest failtest_combobox failtest_evthandler failtest_weakref failtest_allheaders
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean test_gui_bundle \
+	test_allheaders_bundle data data-images fr ja
diff --git a/tests/benchmarks/Makefile b/tests/benchmarks/Makefile
new file mode 100644
index 0000000000..9fd00df913
--- /dev/null
+++ b/tests/benchmarks/Makefile
@@ -0,0 +1,334 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+EXTRALIBS_OPENGL =  -lGL -lGLU -lEGL  -lwayland-egl -lwayland-client 
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+SAMPLES_CXXFLAGS =  -fPIC -DPIC
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+BENCH_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(WX_CXXFLAGS) \
+	$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+BENCH_OBJECTS =  \
+	bench_bench.o \
+	bench_datetime.o \
+	bench_htmlpars.o \
+	bench_htmltag.o \
+	bench_ipcclient.o \
+	bench_log.o \
+	bench_mbconv.o \
+	bench_strings.o \
+	bench_tls.o \
+	bench_printfbench.o
+BENCH_GUI_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+BENCH_GUI_OBJECTS =  \
+	$(__bench_gui___win32rc) \
+	bench_gui_bench.o \
+	bench_gui_display.o \
+	bench_gui_image.o
+BENCH_GRAPHICS_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../samples $(WX_CXXFLAGS) $(SAMPLES_CXXFLAGS) $(CPPFLAGS) \
+	$(CXXFLAGS)
+BENCH_GRAPHICS_OBJECTS =  \
+	$(__bench_graphics___win32rc) \
+	bench_graphics_graphics.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+COND_MONOLITHIC_0___WXLIB_NET_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
+#__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+__bench_gui___depname = bench_gui$(EXEEXT)
+#__bench_gui___win32rc = bench_gui_sample_rc.o
+#__bench_gui_app_Contents_PkgInfo___depname \
+#	= bench_gui.app/Contents/PkgInfo
+#__bench_gui_bundle___depname \
+#	= bench_gui_bundle
+#____bench_gui_BUNDLE_TGT_REF_DEP = \
+#	$(__bench_gui_app_Contents_PkgInfo___depname)
+#____bench_gui_BUNDLE_TGT_REF_DEP = \
+#	$(__bench_gui_app_Contents_PkgInfo___depname)
+#____bench_gui_BUNDLE_TGT_REF_DEP \
+#	= $(__bench_gui_app_Contents_PkgInfo___depname)
+#____bench_gui_BUNDLE_TGT_REF_DEP \
+#	= $(__bench_gui_app_Contents_PkgInfo___depname)
+#____bench_gui_BUNDLE_TGT_REF_DEP \
+#	= $(__bench_gui_app_Contents_PkgInfo___depname)
+__bench_graphics___depname = bench_graphics$(EXEEXT)
+#__bench_graphics___win32rc = \
+#	bench_graphics_sample_rc.o
+#__bench_graphics_app_Contents_PkgInfo___depname \
+#	= bench_graphics.app/Contents/PkgInfo
+#__bench_graphics_bundle___depname \
+#	= bench_graphics_bundle
+#____bench_graphics_BUNDLE_TGT_REF_DEP \
+#	= $(__bench_graphics_app_Contents_PkgInfo___depname)
+#____bench_graphics_BUNDLE_TGT_REF_DEP = \
+#	$(__bench_graphics_app_Contents_PkgInfo___depname)
+#____bench_graphics_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__bench_graphics_app_Contents_PkgInfo___depname)
+#____bench_graphics_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__bench_graphics_app_Contents_PkgInfo___depname)
+#____bench_graphics_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__bench_graphics_app_Contents_PkgInfo___depname)
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_0 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_0 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_0 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: bench$(EXEEXT) data $(__bench_gui___depname) $(__bench_gui_bundle___depname) $(__bench_graphics___depname) $(__bench_graphics_bundle___depname) data-image
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f bench$(EXEEXT)
+	rm -f bench_gui$(EXEEXT)
+	rm -rf bench_gui.app
+	rm -f bench_graphics$(EXEEXT)
+	rm -rf bench_graphics.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+bench$(EXEEXT): $(BENCH_OBJECTS)
+	$(CXX) -o $@ $(BENCH_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+data: 
+	@mkdir -p .
+	@for f in htmltest.html; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+bench_gui$(EXEEXT): $(BENCH_GUI_OBJECTS) $(__bench_gui___win32rc)
+	$(CXX) -o $@ $(BENCH_GUI_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+#bench_gui.app/Contents/PkgInfo: $(__bench_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p bench_gui.app/Contents
+#	mkdir -p bench_gui.app/Contents/MacOS
+#	mkdir -p bench_gui.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/bench_gui/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >bench_gui.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >bench_gui.app/Contents/PkgInfo
+#	
+#	
+#	ln -f bench_gui$(EXEEXT) bench_gui.app/Contents/MacOS/bench_gui
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns bench_gui.app/Contents/Resources/wxmac.icns
+
+#bench_gui_bundle: $(____bench_gui_BUNDLE_TGT_REF_DEP)
+
+bench_graphics$(EXEEXT): $(BENCH_GRAPHICS_OBJECTS) $(__bench_graphics___win32rc)
+	$(CXX) -o $@ $(BENCH_GRAPHICS_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+#bench_graphics.app/Contents/PkgInfo: $(__bench_graphics___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p bench_graphics.app/Contents
+#	mkdir -p bench_graphics.app/Contents/MacOS
+#	mkdir -p bench_graphics.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/bench_graphics/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >bench_graphics.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >bench_graphics.app/Contents/PkgInfo
+#	
+#	
+#	ln -f bench_graphics$(EXEEXT) bench_graphics.app/Contents/MacOS/bench_graphics
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns bench_graphics.app/Contents/Resources/wxmac.icns
+
+#bench_graphics_bundle: $(____bench_graphics_BUNDLE_TGT_REF_DEP)
+
+data-image: 
+	@mkdir -p .
+	@for f in ../../samples/image/horse.bmp ../../samples/image/horse.jpg ../../samples/image/horse.png ../../samples/image/horse.tif; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+bench_bench.o: $(srcdir)/bench.cpp
+	$(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/bench.cpp
+
+bench_datetime.o: $(srcdir)/datetime.cpp
+	$(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/datetime.cpp
+
+bench_htmlpars.o: $(srcdir)/htmlparser/htmlpars.cpp
+	$(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/htmlparser/htmlpars.cpp
+
+bench_htmltag.o: $(srcdir)/htmlparser/htmltag.cpp
+	$(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/htmlparser/htmltag.cpp
+
+bench_ipcclient.o: $(srcdir)/ipcclient.cpp
+	$(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/ipcclient.cpp
+
+bench_log.o: $(srcdir)/log.cpp
+	$(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/log.cpp
+
+bench_mbconv.o: $(srcdir)/mbconv.cpp
+	$(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/mbconv.cpp
+
+bench_strings.o: $(srcdir)/strings.cpp
+	$(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/strings.cpp
+
+bench_tls.o: $(srcdir)/tls.cpp
+	$(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/tls.cpp
+
+bench_printfbench.o: $(srcdir)/printfbench.cpp
+	$(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/printfbench.cpp
+
+bench_gui_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)  --include-dir $(srcdir) $(__DLLFLAG_p_0) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+bench_gui_bench.o: $(srcdir)/bench.cpp
+	$(CXXC) -c -o $@ $(BENCH_GUI_CXXFLAGS) $(srcdir)/bench.cpp
+
+bench_gui_display.o: $(srcdir)/display.cpp
+	$(CXXC) -c -o $@ $(BENCH_GUI_CXXFLAGS) $(srcdir)/display.cpp
+
+bench_gui_image.o: $(srcdir)/image.cpp
+	$(CXXC) -c -o $@ $(BENCH_GUI_CXXFLAGS) $(srcdir)/image.cpp
+
+bench_graphics_sample_rc.o: $(srcdir)/../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)  --include-dir $(srcdir) $(__DLLFLAG_p_0) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+bench_graphics_graphics.o: $(srcdir)/graphics.cpp
+	$(CXXC) -c -o $@ $(BENCH_GRAPHICS_CXXFLAGS) $(srcdir)/graphics.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean data bench_gui_bundle \
+	bench_graphics_bundle data-image
diff --git a/utils/Makefile b/utils/Makefile
new file mode 100644
index 0000000000..fcf53f1225
--- /dev/null
+++ b/utils/Makefile
@@ -0,0 +1,119 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+
+### Variables: ###
+
+DESTDIR = 
+
+### Conditionally set variables: ###
+
+
+### Targets: ###
+
+all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc
+
+install: install_execmon install_ifacecheck install_screenshotgen install_wxrc
+
+uninstall: uninstall_execmon uninstall_ifacecheck uninstall_screenshotgen uninstall_wxrc
+
+install-strip: install install-strip_execmon install-strip_ifacecheck install-strip_screenshotgen install-strip_wxrc
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	-(cd emulator/src && $(MAKE) clean)
+	-(cd execmon && $(MAKE) clean)
+	-(cd helpview/src && $(MAKE) clean)
+	-(cd hhp2cached && $(MAKE) clean)
+	-(cd ifacecheck/src && $(MAKE) clean)
+	-(cd screenshotgen/src && $(MAKE) clean)
+	-(cd wxrc && $(MAKE) clean)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+	-(cd emulator/src && $(MAKE) distclean)
+	-(cd execmon && $(MAKE) distclean)
+	-(cd helpview/src && $(MAKE) distclean)
+	-(cd hhp2cached && $(MAKE) distclean)
+	-(cd ifacecheck/src && $(MAKE) distclean)
+	-(cd screenshotgen/src && $(MAKE) distclean)
+	-(cd wxrc && $(MAKE) distclean)
+
+emulator: 
+	(cd emulator/src && $(MAKE) all)
+
+execmon: 
+	(cd execmon && $(MAKE) all)
+
+install_execmon: 
+	(cd execmon && $(MAKE) install)
+
+uninstall_execmon: 
+	(cd execmon && $(MAKE) uninstall)
+
+install-strip_execmon: 
+	(cd execmon && $(MAKE) install-strip)
+
+helpview: 
+	(cd helpview/src && $(MAKE) all)
+
+hhp2cached: 
+	(cd hhp2cached && $(MAKE) all)
+
+ifacecheck: 
+	(cd ifacecheck/src && $(MAKE) all)
+
+install_ifacecheck: 
+	(cd ifacecheck/src && $(MAKE) install)
+
+uninstall_ifacecheck: 
+	(cd ifacecheck/src && $(MAKE) uninstall)
+
+install-strip_ifacecheck: 
+	(cd ifacecheck/src && $(MAKE) install-strip)
+
+screenshotgen: 
+	(cd screenshotgen/src && $(MAKE) all)
+
+install_screenshotgen: 
+	(cd screenshotgen/src && $(MAKE) install)
+
+uninstall_screenshotgen: 
+	(cd screenshotgen/src && $(MAKE) uninstall)
+
+install-strip_screenshotgen: 
+	(cd screenshotgen/src && $(MAKE) install-strip)
+
+wxrc: 
+	(cd wxrc && $(MAKE) all)
+
+install_wxrc: 
+	(cd wxrc && $(MAKE) install)
+
+uninstall_wxrc: 
+	(cd wxrc && $(MAKE) uninstall)
+
+install-strip_wxrc: 
+	(cd wxrc && $(MAKE) install-strip)
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean emulator execmon install_execmon \
+	uninstall_execmon install-strip_execmon helpview hhp2cached ifacecheck \
+	install_ifacecheck uninstall_ifacecheck install-strip_ifacecheck \
+	screenshotgen install_screenshotgen uninstall_screenshotgen \
+	install-strip_screenshotgen wxrc install_wxrc uninstall_wxrc \
+	install-strip_wxrc
diff --git a/utils/emulator/Makefile b/utils/emulator/Makefile
new file mode 100644
index 0000000000..6d36395442
--- /dev/null
+++ b/utils/emulator/Makefile
@@ -0,0 +1,7 @@
+
+all:
+	cd src; $(MAKE)
+
+clean:
+	cd src; $(MAKE) clean
+
diff --git a/utils/emulator/src/Makefile b/utils/emulator/src/Makefile
new file mode 100644
index 0000000000..418ba8104a
--- /dev/null
+++ b/utils/emulator/src/Makefile
@@ -0,0 +1,163 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+NM = nm
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+LIBDIRNAME = $(wx_top_builddir)/lib
+WXEMULATOR_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+WXEMULATOR_OBJECTS =  \
+	$(__wxemulator___win32rc) \
+	wxemulator_emulator.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___wxemulator___os2_emxbindcmd = $(NM) wxemulator$(EXEEXT) \
+	| if grep -q pmwin.763 ; then emxbind -ep wxemulator$(EXEEXT) ; fi
+#__wxemulator___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wxemulator___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__wxemulator___win32rc = wxemulator_sample_rc.o
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: wxemulator$(EXEEXT) data
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f wxemulator$(EXEEXT)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+wxemulator$(EXEEXT): $(WXEMULATOR_OBJECTS) $(__wxemulator___win32rc)
+	$(CXX) -o $@ $(WXEMULATOR_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__wxemulator___os2_emxbindcmd)
+
+data: 
+	@mkdir -p .
+	@for f in default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+wxemulator_sample_rc.o: $(srcdir)/../../../samples/sample.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+wxemulator_emulator.o: $(srcdir)/emulator.cpp
+	$(CXXC) -c -o $@ $(WXEMULATOR_CXXFLAGS) $(srcdir)/emulator.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean data
diff --git a/utils/execmon/Makefile b/utils/execmon/Makefile
new file mode 100644
index 0000000000..c070d45453
--- /dev/null
+++ b/utils/execmon/Makefile
@@ -0,0 +1,128 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+STRIP = strip
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DIR = mkdir -p
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+bindir = ${exec_prefix}/bin
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+LIBDIRNAME = $(wx_top_builddir)/lib
+EXECMON_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(WX_CXXFLAGS) \
+	$(CPPFLAGS) $(CXXFLAGS)
+EXECMON_OBJECTS =  \
+	execmon_execmon.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+#__execmon___depname = execmon$(EXEEXT)
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__install_execmon___depname = install_execmon
+#__uninstall_execmon___depname = uninstall_execmon
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: $(__execmon___depname)
+
+install: $(__install_execmon___depname)
+
+uninstall: $(__uninstall_execmon___depname)
+
+install-strip: install
+	$(STRIP) $(DESTDIR)$(bindir)/execmon$(EXEEXT)
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f execmon$(EXEEXT)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+#execmon$(EXEEXT): $(EXECMON_OBJECTS)
+#	$(CXX) -o $@ $(EXECMON_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+#install_execmon: $(__execmon___depname)
+#	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+#	$(INSTALL_PROGRAM) execmon$(EXEEXT) $(DESTDIR)$(bindir)
+
+#uninstall_execmon: 
+#	rm -f $(DESTDIR)$(bindir)/execmon$(EXEEXT)
+
+execmon_execmon.o: $(srcdir)/execmon.cpp
+	$(CXXC) -c -o $@ $(EXECMON_CXXFLAGS) $(srcdir)/execmon.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean install_execmon uninstall_execmon
diff --git a/utils/helpview/Makefile b/utils/helpview/Makefile
new file mode 100644
index 0000000000..6d36395442
--- /dev/null
+++ b/utils/helpview/Makefile
@@ -0,0 +1,7 @@
+
+all:
+	cd src; $(MAKE)
+
+clean:
+	cd src; $(MAKE) clean
+
diff --git a/utils/helpview/src/Makefile b/utils/helpview/src/Makefile
new file mode 100644
index 0000000000..c50f9a8647
--- /dev/null
+++ b/utils/helpview/src/Makefile
@@ -0,0 +1,221 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+STRIP = strip
+NM = nm
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DIR = mkdir -p
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+bindir = ${exec_prefix}/bin
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+HELPVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+HELPVIEW_OBJECTS =  \
+	helpview_helpview.o \
+	$(__helpview___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd = $(NM) helpview$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep helpview$(EXEEXT) ; fi
+#__helpview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__helpview_app_Contents_PkgInfo___depname \
+#	= helpview.app/Contents/PkgInfo
+#__helpview_bundle___depname = helpview_bundle
+#____helpview_BUNDLE_TGT_REF_DEP = \
+#	$(__helpview_app_Contents_PkgInfo___depname)
+#____helpview_BUNDLE_TGT_REF_DEP \
+#	= $(__helpview_app_Contents_PkgInfo___depname)
+#____helpview_BUNDLE_TGT_REF_DEP \
+#	= $(__helpview_app_Contents_PkgInfo___depname)
+#____helpview_BUNDLE_TGT_REF_DEP \
+#	= $(__helpview_app_Contents_PkgInfo___depname)
+#____helpview_BUNDLE_TGT_REF_DEP = \
+#	$(__helpview_app_Contents_PkgInfo___depname)
+#__helpview___win32rc = helpview_helpview_rc.o
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_NET_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: helpview$(EXEEXT) $(__helpview_bundle___depname) data
+
+install: install_helpview
+
+uninstall: uninstall_helpview
+
+install-strip: install
+	$(STRIP) $(DESTDIR)$(bindir)/helpview$(EXEEXT)
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f helpview$(EXEEXT)
+	rm -rf helpview.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
+	$(CXX) -o $@ $(HELPVIEW_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__helpview___os2_emxbindcmd)
+
+#helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p helpview.app/Contents
+#	mkdir -p helpview.app/Contents/MacOS
+#	mkdir -p helpview.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/helpview/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >helpview.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >helpview.app/Contents/PkgInfo
+#	
+#	
+#	ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns helpview.app/Contents/Resources/wxmac.icns
+
+#helpview_bundle: $(____helpview_BUNDLE_TGT_REF_DEP)
+
+install_helpview: helpview$(EXEEXT)
+	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) helpview$(EXEEXT) $(DESTDIR)$(bindir)
+
+uninstall_helpview: 
+	rm -f $(DESTDIR)$(bindir)/helpview$(EXEEXT)
+
+data: 
+	@mkdir -p .
+	@for f in test.zip; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+helpview_helpview.o: $(srcdir)/helpview.cpp
+	$(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $(srcdir)/helpview.cpp
+
+helpview_helpview_rc.o: $(srcdir)/helpview.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean helpview_bundle install_helpview \
+	uninstall_helpview data
diff --git a/utils/hhp2cached/Makefile b/utils/hhp2cached/Makefile
new file mode 100644
index 0000000000..b02c28d28d
--- /dev/null
+++ b/utils/hhp2cached/Makefile
@@ -0,0 +1,168 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+STRIP = strip
+NM = nm
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DIR = mkdir -p
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+bindir = ${exec_prefix}/bin
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+LIBDIRNAME = $(wx_top_builddir)/lib
+HHP2CACHED_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+	$(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+HHP2CACHED_OBJECTS =  \
+	hhp2cached_hhp2cached.o \
+	$(__hhp2cached___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___hhp2cached___os2_emxbindcmd = $(NM) hhp2cached$(EXEEXT) \
+	| if grep -q pmwin.763 ; then emxbind -ep hhp2cached$(EXEEXT) ; fi
+#__hhp2cached___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___hhp2cached___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__hhp2cached___win32rc = hhp2cached_hhp2cached_rc.o
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: hhp2cached$(EXEEXT)
+
+install: install_hhp2cached
+
+uninstall: uninstall_hhp2cached
+
+install-strip: install
+	$(STRIP) $(DESTDIR)$(bindir)/hhp2cached$(EXEEXT)
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f hhp2cached$(EXEEXT)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+hhp2cached$(EXEEXT): $(HHP2CACHED_OBJECTS) $(__hhp2cached___win32rc)
+	$(CXX) -o $@ $(HHP2CACHED_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__hhp2cached___os2_emxbindcmd)
+
+install_hhp2cached: hhp2cached$(EXEEXT)
+	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) hhp2cached$(EXEEXT) $(DESTDIR)$(bindir)
+
+uninstall_hhp2cached: 
+	rm -f $(DESTDIR)$(bindir)/hhp2cached$(EXEEXT)
+
+hhp2cached_hhp2cached.o: $(srcdir)/hhp2cached.cpp
+	$(CXXC) -c -o $@ $(HHP2CACHED_CXXFLAGS) $(srcdir)/hhp2cached.cpp
+
+hhp2cached_hhp2cached_rc.o: $(srcdir)/hhp2cached.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean install_hhp2cached \
+	uninstall_hhp2cached
diff --git a/utils/ifacecheck/rungccxml.sh b/utils/ifacecheck/rungccxml.sh
new file mode 100644
index 0000000000..a6d60b8688
--- /dev/null
+++ b/utils/ifacecheck/rungccxml.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+#
+# Runs gccxml on the wxWidgets include folder, in order to build the XML
+# file to fetch to ifacecheck to check the coherency of the wxWidgets
+# interface headers with the "real" ones.
+
+
+## CONSTANTS
+############
+
+
+gccxmloutput="wxapi.xml"             # the file where we store the gccXML output
+preprocoutput="wxapi-preproc.txt"    # the file where we store the preprocessor's #define values
+allheaders="/tmp/wx-all.h"           # the header which includes all wx public headers (autogenerated)
+
+# the list of all wxWidgets public headers
+listcmd="ls wx/*.h wx/aui/*.h wx/html/*.h wx/protocol/*.h wx/richtext/*.h wx/stc/*.h wx/xml/*.h wx/xrc/*.h"
+
+
+
+## MAIN
+#######
+
+if [[ ! -z "$1" ]]; then
+    echo "This script does not accept arguments."
+    echo "Usage: $0"
+    echo "Creates a '$gccxmloutput' file which you can pass to ifacecheck."
+    exit 1
+fi
+
+me=$(basename $0)
+current=$(pwd)/${0%%/$me}            # current path
+
+gccxmloutput="$current/$gccxmloutput"
+
+cd ../../include              # go to wx include folder
+
+# now filter it
+headerlist=`$listcmd | grep -v wxshl | grep -v wx_cw | grep -v setup | grep -v xti | grep -v dde.h | grep -v fmappriv`
+
+cd $current                          # return to the original path
+
+# create the header file to pass to gccxml
+echo "Creating the $allheaders dummy file which #includes all wxWidgets interface header files..."
+if [[ -f $allheaders ]]; then rm $allheaders; fi
+for f in $headerlist; do
+    echo "#include <$f>" >> $allheaders
+done
+
+# filter the configure flags to pass to gccxml
+wx_top_builddir="/run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets"
+top_srcdir="../.."
+flags=" "
+
+# NOTE: it's important to define __WXDEBUG__ because some functions of wx
+#       are declared (and thus parsed by gcc) only if that symbol is defined.
+#       So we remove it from $flags (in case it's defined) and then readd it.
+flags=`echo "$flags" | sed -e 's/-pthread//g' | sed -e 's/__WXDEBUG__//g'`
+
+# append some other flags:
+flags="-I . -I ../../include $flags -D__WXDEBUG__ -D__WXGTK__ -DWXBUILDING $allheaders"
+
+# run gccxml with the same flag used for the real compilation of wx sources:
+echo "Running gccxml on the $allheaders file... results in $gccxmloutput"
+if [[ -f "$gccxmloutput" ]]; then rm $gccxmloutput; fi
+gccxml $flags -fxml=$gccxmloutput
+if [[ $? != 0 ]]; then
+    echo "Errors running gccxml... aborting."
+    exit
+fi
+
+# now get the list of the #defined values for wx headers, so that the result
+# can be passed to ifacecheck to aid the comparison
+echo "Running gccxml's preprocessor on the $allheaders file... results in $preprocoutput"
+gccxml -E -dM $flags >$preprocoutput
+if [[ $? != 0 ]]; then
+    echo "Errors running gccxml preprocessor... aborting."
+    exit
+fi
+
+# cleanup
+rm $allheaders
diff --git a/utils/ifacecheck/src/Makefile b/utils/ifacecheck/src/Makefile
new file mode 100644
index 0000000000..d3dcb3311e
--- /dev/null
+++ b/utils/ifacecheck/src/Makefile
@@ -0,0 +1,133 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+STRIP = strip
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DIR = mkdir -p
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+bindir = ${exec_prefix}/bin
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+LIBDIRNAME = $(wx_top_builddir)/lib
+IFACECHECK_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(WX_CXXFLAGS) \
+	$(CPPFLAGS) $(CXXFLAGS)
+IFACECHECK_OBJECTS =  \
+	ifacecheck_ifacecheck.o \
+	ifacecheck_xmlparser.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+COND_MONOLITHIC_0___WXLIB_XML_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: ifacecheck$(EXEEXT)
+
+install: install_ifacecheck
+
+uninstall: uninstall_ifacecheck
+
+install-strip: install
+	$(STRIP) $(DESTDIR)$(bindir)/ifacecheck$(EXEEXT)
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f ifacecheck$(EXEEXT)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+ifacecheck$(EXEEXT): $(IFACECHECK_OBJECTS)
+	$(CXX) -o $@ $(IFACECHECK_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+install_ifacecheck: ifacecheck$(EXEEXT)
+	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) ifacecheck$(EXEEXT) $(DESTDIR)$(bindir)
+
+uninstall_ifacecheck: 
+	rm -f $(DESTDIR)$(bindir)/ifacecheck$(EXEEXT)
+
+ifacecheck_ifacecheck.o: $(srcdir)/ifacecheck.cpp
+	$(CXXC) -c -o $@ $(IFACECHECK_CXXFLAGS) $(srcdir)/ifacecheck.cpp
+
+ifacecheck_xmlparser.o: $(srcdir)/xmlparser.cpp
+	$(CXXC) -c -o $@ $(IFACECHECK_CXXFLAGS) $(srcdir)/xmlparser.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean install_ifacecheck \
+	uninstall_ifacecheck
diff --git a/utils/screenshotgen/Makefile b/utils/screenshotgen/Makefile
new file mode 100644
index 0000000000..6d36395442
--- /dev/null
+++ b/utils/screenshotgen/Makefile
@@ -0,0 +1,7 @@
+
+all:
+	cd src; $(MAKE)
+
+clean:
+	cd src; $(MAKE) clean
+
diff --git a/utils/screenshotgen/src/Makefile b/utils/screenshotgen/src/Makefile
new file mode 100644
index 0000000000..9017591c4c
--- /dev/null
+++ b/utils/screenshotgen/src/Makefile
@@ -0,0 +1,262 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+WINDRES = 
+STRIP = strip
+NM = nm
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DIR = mkdir -p
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../../..
+bindir = ${exec_prefix}/bin
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+LDFLAGS_GUI = 
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+USE_DPI_AWARE_MANIFEST = 2
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+TOOLCHAIN_FULLNAME = gtk3-unicode-static-3.1
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_HTML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+SAMPLES_RPATH_FLAG = 
+HEADER_PAD_OPTION = 
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+WX_VERSION = $(WX_RELEASE).5
+LIBDIRNAME = $(wx_top_builddir)/lib
+SCREENSHOTGEN_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../../samples $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+SCREENSHOTGEN_OBJECTS =  \
+	screenshotgen_screenshot_app.o \
+	screenshotgen_screenshot_main.o \
+	screenshotgen_guiframe.o \
+	screenshotgen_customcombo.o \
+	screenshotgen_autocapture.o \
+	$(__screenshotgen___win32rc)
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+#EXTRALIBS_FOR_GUI = 
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+#__DLLFLAG_p_1 = --define WXUSINGDLL
+#__WIN32_DPI_MANIFEST_p = \
+#	--define \
+#	wxUSE_DPI_AWARE_MANIFEST=$(USE_DPI_AWARE_MANIFEST)
+COND_PLATFORM_OS2_1___screenshotgen___os2_emxbindcmd = $(NM) \
+	screenshotgen$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
+	screenshotgen$(EXEEXT) ; fi
+#__screenshotgen___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___screenshotgen___os2_emxbindcmd)
+#__RCDEFDIR_p = --include-dir \
+#	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+#__screenshotgen_app_Contents_PkgInfo___depname \
+#	= screenshotgen.app/Contents/PkgInfo
+#__screenshotgen_bundle___depname \
+#	= screenshotgen_bundle
+#____screenshotgen_BUNDLE_TGT_REF_DEP = \
+#	$(__screenshotgen_app_Contents_PkgInfo___depname)
+#____screenshotgen_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__screenshotgen_app_Contents_PkgInfo___depname)
+#____screenshotgen_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__screenshotgen_app_Contents_PkgInfo___depname)
+#____screenshotgen_BUNDLE_TGT_REF_DEP \
+#	= \
+#	$(__screenshotgen_app_Contents_PkgInfo___depname)
+#____screenshotgen_BUNDLE_TGT_REF_DEP \
+#	= $(__screenshotgen_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_AUI_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
+COND_MONOLITHIC_0___WXLIB_RICHTEXT_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_RICHTEXT_p = $(COND_MONOLITHIC_0___WXLIB_RICHTEXT_p)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_XML_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__screenshotgen___win32rc = \
+#	screenshotgen_screenshotgen_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_SCINTILLA_IF_MONO_p \
+#	= \
+#	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_TIFF_p \
+#	= \
+#	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_JPEG_p \
+#	= \
+#	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: screenshotgen$(EXEEXT) $(__screenshotgen_bundle___depname) bitmaps xml
+
+install: install_screenshotgen
+
+uninstall: uninstall_screenshotgen
+
+install-strip: install
+	$(STRIP) $(DESTDIR)$(bindir)/screenshotgen$(EXEEXT)
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f screenshotgen$(EXEEXT)
+	rm -rf screenshotgen.app
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+screenshotgen$(EXEEXT): $(SCREENSHOTGEN_OBJECTS) $(__screenshotgen___win32rc)
+	$(CXX) -o $@ $(SCREENSHOTGEN_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(HEADER_PAD_OPTION) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(__screenshotgen___os2_emxbindcmd)
+
+#screenshotgen.app/Contents/PkgInfo: screenshotgen$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+#	mkdir -p screenshotgen.app/Contents
+#	mkdir -p screenshotgen.app/Contents/MacOS
+#	mkdir -p screenshotgen.app/Contents/Resources
+#	
+#	
+#	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+#	-e "s/EXECUTABLE/screenshotgen/" \
+#	-e "s/VERSION/$(WX_VERSION)/" \
+#	$(top_srcdir)/src/osx/carbon/Info.plist.in >screenshotgen.app/Contents/Info.plist
+#	
+#	
+#	/bin/echo "APPL????" >screenshotgen.app/Contents/PkgInfo
+#	
+#	
+#	ln -f screenshotgen$(EXEEXT) screenshotgen.app/Contents/MacOS/screenshotgen
+#	
+#	
+#	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns screenshotgen.app/Contents/Resources/wxmac.icns
+
+#screenshotgen_bundle: $(____screenshotgen_BUNDLE_TGT_REF_DEP)
+
+install_screenshotgen: screenshotgen$(EXEEXT)
+	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) screenshotgen$(EXEEXT) $(DESTDIR)$(bindir)
+
+uninstall_screenshotgen: 
+	rm -f $(DESTDIR)$(bindir)/screenshotgen$(EXEEXT)
+
+bitmaps: 
+	@mkdir -p ./bitmaps
+	@for f in wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif; do \
+	if test ! -f ./bitmaps/$$f -a ! -d ./bitmaps/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/bitmaps/$$f -newer ./bitmaps/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/bitmaps/$$f ./bitmaps ;; \
+	esac; \
+	done
+
+xml: 
+	@mkdir -p .
+	@for f in richtext.xml; do \
+	if test ! -f ./$$f -a ! -d ./$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/$$f . ;; \
+	esac; \
+	done
+
+screenshotgen_screenshot_app.o: $(srcdir)/screenshot_app.cpp
+	$(CXXC) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(srcdir)/screenshot_app.cpp
+
+screenshotgen_screenshot_main.o: $(srcdir)/screenshot_main.cpp
+	$(CXXC) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(srcdir)/screenshot_main.cpp
+
+screenshotgen_guiframe.o: $(srcdir)/guiframe.cpp
+	$(CXXC) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(srcdir)/guiframe.cpp
+
+screenshotgen_customcombo.o: $(srcdir)/customcombo.cpp
+	$(CXXC) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(srcdir)/customcombo.cpp
+
+screenshotgen_autocapture.o: $(srcdir)/autocapture.cpp
+	$(CXXC) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(srcdir)/autocapture.cpp
+
+screenshotgen_screenshotgen_rc.o: $(srcdir)/screenshotgen.rc
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) $(__WIN32_DPI_MANIFEST_p) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean screenshotgen_bundle \
+	install_screenshotgen uninstall_screenshotgen bitmaps xml
diff --git a/utils/wxrc/Makefile b/utils/wxrc/Makefile
new file mode 100644
index 0000000000..ffaf1b8642
--- /dev/null
+++ b/utils/wxrc/Makefile
@@ -0,0 +1,137 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.12 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+INSTALL = /usr/bin/install -c
+EXEEXT = 
+LN_S = ln -s
+STRIP = strip
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DIR = mkdir -p
+BK_DEPS = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets/bk-deps
+srcdir = .
+top_srcdir = ../..
+bindir = ${exec_prefix}/bin
+LIBS = -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm
+CXX = clang++ -std=c++17
+CXXFLAGS = 
+CPPFLAGS = 
+LDFLAGS = 
+WX_FLAVOUR = 
+WX_LIB_FLAVOUR = 
+TOOLKIT = GTK
+TOOLKIT_LOWERCASE = gtk
+TOOLKIT_VERSION = 3
+EXTRALIBS = -pthread    -lz -ldl -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm 
+EXTRALIBS_XML = 
+EXTRALIBS_GUI = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -pthread -lglib-2.0 -lX11 -lXxf86vm -lSM -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lpng -lz
+WX_CPPFLAGS = -I${wx_top_builddir}/lib/wx/include/gtk3-unicode-static-3.1 -I${top_srcdir}/include -D_FILE_OFFSET_BITS=64 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -pthread 
+WX_CXXFLAGS = -pthread -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -O2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libsecret-1 -I/usr/include/gio-unix-2.0 -I/usr/include/webkitgtk-4.0 -I/usr/include/gtk-3.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/at-spi-2.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0 -I/usr/include/orc-0.4 -fPIC -DPIC  
+WX_LDFLAGS = -pthread 
+HOST_SUFFIX = 
+wx_top_builddir = /run/media/reece/Misc/GameEngine/Source/Vendor/Graphics/wxWidgets
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+LIBDIRNAME = $(wx_top_builddir)/lib
+WXRC_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(WX_CXXFLAGS) \
+	$(CPPFLAGS) $(CXXFLAGS)
+WXRC_OBJECTS =  \
+	wxrc_wxrc.o
+
+### Conditionally set variables: ###
+
+#CXXC = $(CXX)
+CXXC = $(BK_DEPS) $(CXX)
+#PORTNAME = base
+PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+#WXBASEPORT = _carbon
+#WXDEBUGFLAG = d
+WXUNICODEFLAG = u
+#WXUNIVNAME = univ
+EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+#EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+#	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+#__wxrc___depname = wxrc$(EXEEXT)
+#__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+#__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+#__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+#__RTTI_DEFINE_p = -DwxNO_RTTI
+#__THREAD_DEFINE_p = -DwxNO_THREADS
+#__DLLFLAG_p = -DWXUSINGDLL
+COND_MONOLITHIC_0___WXLIB_XML_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+#__install_wxrc___depname = install_wxrc
+#__uninstall_wxrc___depname = uninstall_wxrc
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+#__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+#__LIB_PNG_p \
+#	= \
+#	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+#__LIB_ZLIB_p = \
+#	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+#__LIB_EXPAT_p = \
+#	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: $(__wxrc___depname)
+
+install: $(__install_wxrc___depname)
+
+uninstall: $(__uninstall_wxrc___depname)
+
+install-strip: install
+	$(STRIP) $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f wxrc$(EXEEXT)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+#wxrc$(EXEEXT): $(WXRC_OBJECTS)
+#	$(CXX) -o $@ $(WXRC_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+#install_wxrc: $(__wxrc___depname)
+#	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+#	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+#	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)$(WX_FLAVOUR)$(EXEEXT)
+#	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+#	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)$(WX_FLAVOUR)$(EXEEXT)
+#	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE)$(WX_FLAVOUR)$(EXEEXT) wxrc$(EXEEXT))
+
+#uninstall_wxrc: 
+#	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
+
+wxrc_wxrc.o: $(srcdir)/wxrc.cpp
+	$(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $(srcdir)/wxrc.cpp
+
+
+# Include dependency info, if present:
+-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean install_wxrc uninstall_wxrc
diff --git a/version-script b/version-script
new file mode 100644
index 0000000000..90e7c5420d
--- /dev/null
+++ b/version-script
@@ -0,0 +1,29 @@
+#
+# Notes:
+#
+# Remove all of the tags below except for the last one when creating new
+# development branch.
+#
+# Once a symbol has been included in a stable release of wxWidgets its version
+# cannot be changed.
+#
+# With each new release a section should be added containing any new symbols,
+# for example:
+#
+#   # public symbols added in release WXU_3.1.2 (please keep in alphabetical order):
+#   WXU_3.1.2 {
+#           *wxChoice*GetCurrentSelection*;
+#   };
+#
+# If a symbols should have been added in this way, but is forgotten then it
+# cannot be added in the next release. This is because it has already been
+# released with the generic branch version due to the final wildcard below,
+# and once released its version cannot be changed.
+
+
+# symbols available since the beginning of this branch are only given
+# generic branch tag (don't remove this!):
+
+WXU_3.1 {
+        *;
+};