Merge branch 'dev' into metadata-exiv2

This commit is contained in:
Lawrence Lee
2023-02-05 12:29:58 -08:00
278 changed files with 74278 additions and 13534 deletions

View File

@@ -406,12 +406,14 @@ int main (int argc, char **argv)
}
options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
options.rtSettings.lensfunDbBundleDirectory = LENSFUN_DB_PATH;
#else
argv0 = DATA_SEARCH_PATH;
creditsPath = CREDITS_SEARCH_PATH;
licensePath = LICENCE_SEARCH_PATH;
options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
options.rtSettings.lensfunDbBundleDirectory = LENSFUN_DB_PATH;
#endif
#ifdef WIN32