From 4b33f8037dcd8116874dd34f5ef204416efd7201 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Tue, 9 Jun 2020 12:05:15 +0200 Subject: [PATCH] fix win build --- src/external.cmake | 4 ++++ src/external/u3d/IDTF/Converter.cpp | 15 ++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/external.cmake b/src/external.cmake index 45c9c25ad..2dd0b4a98 100644 --- a/src/external.cmake +++ b/src/external.cmake @@ -376,6 +376,10 @@ if(ALLOW_BUNDLED_U3D) UNSET( CMAKE_SHARED_MODULE_PREFIX ) UNSET( CMAKE_STATIC_LIBRARY_PREFIX ) UNSET( CMAKE_IMPORT_LIBRARY_PREFIX ) + if(MSVC) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) + endif(MSVC) ENDIF(WIN32) IF(UNIX AND NOT APPLE) diff --git a/src/external/u3d/IDTF/Converter.cpp b/src/external/u3d/IDTF/Converter.cpp index 92f68f96f..33903aa43 100644 --- a/src/external/u3d/IDTF/Converter.cpp +++ b/src/external/u3d/IDTF/Converter.cpp @@ -83,22 +83,19 @@ bool IDTFToU3d( int argc = 11; IFXRESULT result = IFX_OK; -#ifdef __MINGW32__ - wchar_t **argw = NULL; - int argc=0; -#endif -#ifndef WIN32 +//#ifdef __MINGW32__ +// wchar_t **argw = NULL; +// int argc=0; +//#endif +//#ifndef WIN32 wchar_t **argw = NULL; int i; -#endif +//#endif result = IFXSetDefaultLocale(); IFXTRACE_GENERIC(L"[Converter] IFXSetDefaultLocale %i\n", result); if( IFXSUCCESS(result) ) { -#ifdef __MINGW32__ - argw = CommandLineToArgvW(GetCommandLineW(), &argc); -#endif #ifndef WIN32 argw = (wchar_t**)malloc(argc*sizeof(wchar_t*)); if (argw == NULL)