fix import search path resolution; fix windows default system paths

ccrma · Nov 8, 2024 · 6d85bc3 · 6d85bc3
1 parent 02f5d1d
commit 6d85bc3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/core/chuck_compile.cpp b/src/core/chuck_compile.cpp
@@ -1850,7 +1850,7 @@ t_CKBOOL Chuck_Compiler::load_external_modules( const string & extension,
         // expand the filepath (e.g., ~) | 1.5.2.6 (ge) added
         string dl_path = expand_filepath( *i_sp );
         // get full path | 1.5.4.2 (ge) added
-        dl_path = get_full_path( dl_path );
+        dl_path = get_full_path( dl_path, TRUE );
         // search directory and load contents
         load_external_modules_in_directory( dl_path, extension, recursiveSearch );
     }
@@ -2083,7 +2083,7 @@ t_CKBOOL Chuck_Compiler::probe_external_modules( const string & extension,
         // expand the filepath (e.g., ~) | 1.5.2.6 (ge) added
         string dl_path = expand_filepath( *i_sp );
         // get full path | 1.5.4.2 (ge) added
-        dl_path = get_full_path( dl_path );
+        dl_path = get_full_path( dl_path, TRUE );
         // search directory and load contents
         probe_external_modules_in_directory( dl_path, extension, recursiveSearch, ck_libs );
     }

diff --git a/src/core/chuck_dl.cpp b/src/core/chuck_dl.cpp
@@ -64,7 +64,7 @@ char g_default_path_system[] = "/usr/local/lib/chuck:/Library/Application Suppor
 char g_default_path_packages[] = "~/.chuck/packages";
 char g_default_path_user[] = "~/Library/Application Support/ChucK/chugins:~/.chuck/lib";
 #elif defined(__PLATFORM_WINDOWS__)
-char g_default_path_system[] = "C:\\Windows\\system32\\ChucK;C:\\Program Files\\ChucK\\chugins;C:\\Program Files (x86)\\ChucK\\chugins;";
+char g_default_path_system[] = "C:\\Windows\\system32\\ChucK;C:\\Program Files\\ChucK\\chugins;C:\\Program Files (x86)\\ChucK\\chugins";
 char g_default_path_packages[] = "C:\\Users\\%USERNAME%\\Documents\\ChucK\\packages";
 char g_default_path_user[] = "C:\\Users\\%USERNAME%\\Documents\\ChucK\\chugins";
 #else // Linux / Cygwin

diff --git a/src/core/util_string.cpp b/src/core/util_string.cpp
@@ -761,9 +761,9 @@ std::string expandFilePathWindows( const string & path )
 
 //-----------------------------------------------------------------------------
 // name: get_full_path()
-// desc: get full path to file
+// desc: get full path to file; if treatAsDir is TRUE, then don't auto-match .ck
 //-----------------------------------------------------------------------------
-std::string get_full_path( const std::string & fp )
+std::string get_full_path( const std::string & fp, t_CKBOOL treatAsDir )
 {
 #ifndef __PLATFORM_WINDOWS__
 
@@ -797,7 +797,7 @@ std::string get_full_path( const std::string & fp )
     }
 
     // try with .ck extension
-    if( result == 0 && !extension_matches(fp, ".ck") )
+    if( result == 0 && !treatAsDir && !extension_matches(fp, ".ck") )
     {
 #ifndef __CHUNREAL_ENGINE__
         result = GetFullPathName((fp + ".ck").c_str(), MAX_PATH, buf, NULL);

diff --git a/src/core/util_string.h b/src/core/util_string.h
@@ -100,7 +100,7 @@ t_CKBOOL extract_args( const std::string & token,
 std::string dir_go_up( const std::string & dir, t_CKINT numUp );
 
 // get full path to file
-std::string get_full_path( const std::string & fp );
+std::string get_full_path( const std::string & fp, t_CKBOOL treatAsDirector = FALSE );
 
 // perform filepath expansion (e.g., with ~ on unix systems and some windows)
 std::string expand_filepath( const std::string & fp, t_CKBOOL ensurePathExists = FALSE );