diff --git a/CMakeLists.txt b/CMakeLists.txt index acf1bb4b754..b9e38c36d39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2049,7 +2049,7 @@ elseif(APPLE) link_directories(${LIBDIR}/openmp/lib) # This is a workaround for our helperbinaries ( datatoc, masgfmt, ... ), # They are linked also to omp lib, so we need it in builddir for runtime exexcution, TODO: remove all unneeded dependencies from these - execute_process(COMMAND ditto -arch ${CMAKE_OSX_ARCHITECTURES} ${LIBDIR}/openmp/lib/libiomp5.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libiomp5.dylib) # for intermediate binaries, lib id @loader_path + execute_process(COMMAND ditto -arch ${CMAKE_OSX_ARCHITECTURES} ${LIBDIR}/openmp/lib/libiomp5.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libiomp5.dylib) # for intermediate binaries, in respect to lib ID endif() endif() endif() diff --git a/source/blender/editors/space_file/fsmenu.h b/source/blender/editors/space_file/fsmenu.h index 8c4dd31e953..831ec138474 100644 --- a/source/blender/editors/space_file/fsmenu.h +++ b/source/blender/editors/space_file/fsmenu.h @@ -48,7 +48,7 @@ typedef enum FSMenuInsert { FS_INSERT_SORTED = (1 << 0), FS_INSERT_SAVE = (1 << 1), FS_INSERT_FIRST = (1 << 2), /* moves the item to the front of the list when its not already there */ - FS_APPEND_LAST = (1 << 3) /*just append to preseve delivered order */ + FS_APPEND_LAST = (1 << 3) /* just append to preseve delivered order */ } FSMenuInsert; struct FSMenu;