From 71ec82c1b527125ec5b999f40be0fd0e4fd3705c Mon Sep 17 00:00:00 2001 From: Paul Houx Date: Sun, 9 Feb 2020 23:54:42 +0100 Subject: [PATCH] Fixed support for AntTweakBar in vc2019, as seen in PR #2113. --- proj/cmake/libcinder_configure.cmake | 4 ++-- proj/cmake/platform_msw.cmake | 2 +- src/AntTweakBar/TwMgr.cpp | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/proj/cmake/libcinder_configure.cmake b/proj/cmake/libcinder_configure.cmake index 49d3048cd1..e4e623b8a3 100644 --- a/proj/cmake/libcinder_configure.cmake +++ b/proj/cmake/libcinder_configure.cmake @@ -66,8 +66,8 @@ else() list( APPEND CINDER_DEFINES "-DFT2_BUILD_LIBRARY;-DFT_DEBUG_LEVEL_TRACE" ) endif() -# declare whether AntTweakBar is available (isn't on mobile devices or Visual Studio 2019 and up) -if( CINDER_DISABLE_ANTTWEAKBAR OR CINDER_GL_ES OR ( CINDER_MSW AND MSVC_VERSION GREATER_EQUAL 1920 ) ) +# declare whether AntTweakBar is available (isn't on mobile devices) +if( CINDER_DISABLE_ANTTWEAKBAR OR CINDER_GL_ES OR BUILD_SHARED_LIBS ) set( CINDER_ANTTWEAKBAR_ENABLED FALSE ) else() set( CINDER_ANTTWEAKBAR_ENABLED TRUE ) diff --git a/proj/cmake/platform_msw.cmake b/proj/cmake/platform_msw.cmake index 094a819e2a..baa4d6494a 100644 --- a/proj/cmake/platform_msw.cmake +++ b/proj/cmake/platform_msw.cmake @@ -19,7 +19,7 @@ list( APPEND SRC_SET_MSW ${CINDER_SRC_DIR}/glload/wgl_load.c ) -if( NOT ( CINDER_DISABLE_ANTTWEAKBAR OR BUILD_SHARED_LIBS ) ) +if( CINDER_ANTTWEAKBAR_ENABLED ) list( APPEND SRC_SET_MSW ${CINDER_SRC_DIR}/AntTweakBar/TwDirect3D11.cpp ) endif() diff --git a/src/AntTweakBar/TwMgr.cpp b/src/AntTweakBar/TwMgr.cpp index ae56dea073..f3b3b67e6e 100644 --- a/src/AntTweakBar/TwMgr.cpp +++ b/src/AntTweakBar/TwMgr.cpp @@ -7,6 +7,9 @@ // // --------------------------------------------------------------------------- +#if defined( _MSC_VER ) +# define _HAS_AUTO_PTR_ETC 1 +#endif #include "TwPrecomp.h" #include