TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 09:04:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert nativeFile

Browse source 
-NativeFileDialog m file was not being set to obj-c, now we force it withe set_source_files_properties.
This commit is contained in:
marauder2k7 2023-10-19 16:29:04 +01:00
parent 8c4650d5dc
commit b6c9bef48f
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/lib/nativeFileDialogs/CMakeLists.txt
View file

@ -5,7 +5,9 @@ set(TORQUE_NFD_COMMON_SOURCES "${TORQUE_NFD_ROOT}/nfd_common.c")
set(TORQUE_NFD_INCLUDE_DIRECTORIES "${TORQUE_NFD_ROOT}" "${TORQUE_NFD_ROOT}/include") set(TORQUE_NFD_INCLUDE_DIRECTORIES "${TORQUE_NFD_ROOT}" "${TORQUE_NFD_ROOT}/include")
if (APPLE) if (APPLE)
set(TORQUE_NFD_SOURCES ${TORQUE_NFD_COMMON_SOURCES} "${TORQUE_NFD_ROOT}/nfd_cocoa.mm") enable_language(OBJC)
set(TORQUE_NFD_SOURCES ${TORQUE_NFD_COMMON_SOURCES} "${TORQUE_NFD_ROOT}/nfd_cocoa.m")
set_source_files_properties(${TORQUE_NFD_SOURCES} PROPERTIES LANGUAGE OBJC)
elseif (UNIX) elseif (UNIX)
if (TORQUE_USE_ZENITY) if (TORQUE_USE_ZENITY)
set(TORQUE_NFD_SOURCES ${TORQUE_NFD_COMMON_SOURCES} "${TORQUE_NFD_ROOT}/nfd_zenity.c") set(TORQUE_NFD_SOURCES ${TORQUE_NFD_COMMON_SOURCES} "${TORQUE_NFD_ROOT}/nfd_zenity.c")

28
Engine/lib/nativeFileDialogs/nfd_cocoa.mm → Engine/lib/nativeFileDialogs/nfd_cocoa.m
View file

@ -64,7 +64,7 @@ static void SetDefaultPath( NSSavePanel *dialog, const nfdchar_t *defaultPath )
NSString *defaultPathString = [NSString stringWithUTF8String: defaultPath]; NSString *defaultPathString = [NSString stringWithUTF8String: defaultPath];
NSURL *url = [NSURL fileURLWithPath:defaultPathString isDirectory:YES]; NSURL *url = [NSURL fileURLWithPath:defaultPathString isDirectory:YES];
[dialog setDirectoryURL:url]; [dialog setDirectoryURL:url];
} }
@ -75,8 +75,8 @@ static nfdresult_t AllocPathSet( NSArray *urls, nfdpathset_t *pathset )
assert([urls count]); assert([urls count]);
pathset->count = (size_t)[urls count]; pathset->count = (size_t)[urls count];
pathset->indices = (unsigned long*)NFDi_Malloc( sizeof(size_t)*pathset->count ); pathset->indices = NFDi_Malloc( sizeof(size_t)*pathset->count );
if ( !pathset->indices ) if ( !pathset->indices )
{ {
return NFD_ERROR; return NFD_ERROR;
} }
@ -89,7 +89,7 @@ static nfdresult_t AllocPathSet( NSArray *urls, nfdpathset_t *pathset )
bufsize += [path lengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1; bufsize += [path lengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1;
} }
pathset->buf = (char *)NFDi_Malloc( sizeof(nfdchar_t) * bufsize ); pathset->buf = NFDi_Malloc( sizeof(nfdchar_t) * bufsize );
if ( !pathset->buf ) if ( !pathset->buf )
{ {
return NFD_ERROR; return NFD_ERROR;
@ -125,7 +125,7 @@ nfdresult_t NFD_OpenDialog( const nfdchar_t *filterList,
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSWindow *keyWindow = [[NSApplication sharedApplication] keyWindow]; NSWindow *keyWindow = [[NSApplication sharedApplication] keyWindow];
NSOpenPanel *dialog = [NSOpenPanel openPanel]; NSOpenPanel *dialog = [NSOpenPanel openPanel];
[dialog setAllowsMultipleSelection:NO]; [dialog setAllowsMultipleSelection:NO];
@ -144,11 +144,11 @@ nfdresult_t NFD_OpenDialog( const nfdchar_t *filterList,
// byte count, not char count // byte count, not char count
size_t len = strlen(utf8Path);//NFDi_UTF8_Strlen(utf8Path); size_t len = strlen(utf8Path);//NFDi_UTF8_Strlen(utf8Path);
*outPath = (nfdchar_t*)NFDi_Malloc(len+1); *outPath = NFDi_Malloc( len+1 );
if ( !*outPath ) if ( !*outPath )
{ {
[pool release]; [pool release];
[keyWindow makeKeyAndOrderFront:nil]; [keyWindow makeKeyAndOrderFront:nil];
return NFD_ERROR; return NFD_ERROR;
} }
memcpy( *outPath, utf8Path, len+1 ); /* copy null term */ memcpy( *outPath, utf8Path, len+1 ); /* copy null term */
@ -185,14 +185,14 @@ nfdresult_t NFD_OpenDialogMultiple( const nfdchar_t *filterList,
if ( [urls count] == 0 ) if ( [urls count] == 0 )
{ {
[pool release]; [pool release];
[keyWindow makeKeyAndOrderFront:nil]; [keyWindow makeKeyAndOrderFront:nil];
return NFD_CANCEL; return NFD_CANCEL;
} }
if ( AllocPathSet( urls, outPaths ) == NFD_ERROR ) if ( AllocPathSet( urls, outPaths ) == NFD_ERROR )
{ {
[pool release]; [pool release];
[keyWindow makeKeyAndOrderFront:nil]; [keyWindow makeKeyAndOrderFront:nil];
return NFD_ERROR; return NFD_ERROR;
} }
@ -200,7 +200,7 @@ nfdresult_t NFD_OpenDialogMultiple( const nfdchar_t *filterList,
} }
[pool release]; [pool release];
[keyWindow makeKeyAndOrderFront:nil]; [keyWindow makeKeyAndOrderFront:nil];
return nfdResult; return nfdResult;
} }
@ -229,11 +229,11 @@ nfdresult_t NFD_SaveDialog( const nfdchar_t *filterList,
size_t byteLen = [url.path lengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1; size_t byteLen = [url.path lengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1;
*outPath = (char *)NFDi_Malloc( byteLen ); *outPath = NFDi_Malloc( byteLen );
if ( !*outPath ) if ( !*outPath )
{ {
[pool release]; [pool release];
[keyWindow makeKeyAndOrderFront:nil]; [keyWindow makeKeyAndOrderFront:nil];
return NFD_ERROR; return NFD_ERROR;
} }
memcpy( *outPath, utf8Path, byteLen ); memcpy( *outPath, utf8Path, byteLen );
@ -269,11 +269,11 @@ nfdresult_t NFD_PickFolder(const nfdchar_t *defaultPath,
// byte count, not char count // byte count, not char count
size_t len = strlen(utf8Path);//NFDi_UTF8_Strlen(utf8Path); size_t len = strlen(utf8Path);//NFDi_UTF8_Strlen(utf8Path);
*outPath = (char *)NFDi_Malloc( len+1 ); *outPath = NFDi_Malloc( len+1 );
if ( !*outPath ) if ( !*outPath )
{ {
[pool release]; [pool release];
[keyWindow makeKeyAndOrderFront:nil]; [keyWindow makeKeyAndOrderFront:nil];
return NFD_ERROR; return NFD_ERROR;
} }
memcpy( *outPath, utf8Path, len+1 ); /* copy null term */ memcpy( *outPath, utf8Path, len+1 ); /* copy null term */