mirror of
https://github.com/lucaspalomodevelop/meshlab.git
synced 2026-03-20 03:16:10 +00:00
fix win build
This commit is contained in:
parent
02205f1356
commit
4b33f8037d
@ -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)
|
||||
|
||||
15
src/external/u3d/IDTF/Converter.cpp
vendored
15
src/external/u3d/IDTF/Converter.cpp
vendored
@ -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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user