Merge branch 'sokol'

This commit is contained in:
Vadim Grigoruk
2018-12-01 21:55:10 +03:00
19 changed files with 1182 additions and 756 deletions

View File

@@ -22,6 +22,12 @@
#pragma once
#if !defined(TIC_BUILD_WITH_LUA) && \
!defined(TIC_BUILD_WITH_MOON) && \
!defined(TIC_BUILD_WITH_FENNEL) && \
!defined(TIC_BUILD_WITH_JS) && \
!defined(TIC_BUILD_WITH_WREN)
#define TIC_BUILD_WITH_LUA 1
#define TIC_BUILD_WITH_MOON 1
#define TIC_BUILD_WITH_FENNEL 1
@@ -29,6 +35,8 @@
#define TIC_BUILD_WITH_WREN 1
#define TIC_BUILD_WITH_SQUIRREL 1
#endif
#if defined(__APPLE__)
// TODO: this disables macos config
# include "AvailabilityMacros.h"