diff --git a/opennurbs/Include/opennurbs_win_dwrite.h b/opennurbs/Include/opennurbs_win_dwrite.h index ad21e83..d3e96be 100644 --- a/opennurbs/Include/opennurbs_win_dwrite.h +++ b/opennurbs/Include/opennurbs_win_dwrite.h @@ -25,14 +25,25 @@ Warning C4263 ..: member function does not override any base class virtual membe Warning C4263 ..: member function does not override any base class virtual member function ... C:\Program Files (x86)\Windows Kits\8.1\Include\um\dwrite_2.h ... */ #pragma ON_PRAGMA_WARNING_DISABLE_MSC( 4263 4264 4265 ) -//#include +#if !defined(WIN64) // quindi definito WIN32 +//#include +#include "C:\EgtDev\Extern\opennurbs\Include\dwrite_x32.h" +#include "C:\EgtDev\Extern\opennurbs\Include\dwrite_1_x32.h" +#include "C:\EgtDev\Extern\opennurbs\Include\dwrite_2_x32.h" + +#include // smart pointers disponibili per Windows Xp CComPtr<> +#else //#if defined( WIN64) #include -#include +#include // smart pointers da Windows 8.1 in avanti Miscrosoft::WRL::ComPtr<> +#endif #include -//#include +//#include // questo era giĆ  commentato + #pragma comment(lib, "Dwrite.lib") + + #if defined(WIN32) && defined(WIN64) #undef WIN32 #endif diff --git a/opennurbs/Lib/opennurbs_publicD32.lib b/opennurbs/Lib/opennurbs_publicD32.lib index 9fe2fe1..f10f6af 100644 Binary files a/opennurbs/Lib/opennurbs_publicD32.lib and b/opennurbs/Lib/opennurbs_publicD32.lib differ diff --git a/opennurbs/Lib/opennurbs_publicD32.pdb b/opennurbs/Lib/opennurbs_publicD32.pdb index a7a7b85..5d5c37e 100644 Binary files a/opennurbs/Lib/opennurbs_publicD32.pdb and b/opennurbs/Lib/opennurbs_publicD32.pdb differ