Extern :
- rinominati i file dwrite necessari per la compilazione a x32.
This commit is contained in:
@@ -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 <dwrite.h>
|
||||
|
||||
#if !defined(WIN64) // quindi definito WIN32
|
||||
//#include <dwrite.h>
|
||||
#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 <atlbase.h> // smart pointers disponibili per Windows Xp CComPtr<>
|
||||
#else //#if defined( WIN64)
|
||||
#include <dwrite_2.h>
|
||||
#include <wrl.h>
|
||||
#include <wrl.h> // smart pointers da Windows 8.1 in avanti Miscrosoft::WRL::ComPtr<>
|
||||
#endif
|
||||
|
||||
#include <d2d1.h>
|
||||
//#include <wrl\implements.h>
|
||||
//#include <wrl\implements.h> // questo era già commentato
|
||||
|
||||
#pragma comment(lib, "Dwrite.lib")
|
||||
|
||||
|
||||
#if defined(WIN32) && defined(WIN64)
|
||||
#undef WIN32
|
||||
#endif
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user