diff --git a/.gitignore b/.gitignore
index 53cfb10fc1..f3e66d015d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,7 @@ Release
 /*.m4
 /*.ac
 /*.sh
+/codeblocks.bat
 /custom.bat
 /autom4te.cache
 /build_configure
diff --git a/adm/genproj.tcl b/adm/genproj.tcl
index af1fde8b6d..b2f977336d 100644
--- a/adm/genproj.tcl
+++ b/adm/genproj.tcl
@@ -2154,6 +2154,9 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
     }
   }
   puts $aFile "\t\t\t\t\t<Add option=\"\$(CSF_OPT_LNK${aWokArch})\" />"
+  if { "$aWokStation" == "lin" } {
+    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${aWokStation}/cbp/lib\" />"
+  }
   puts $aFile "\t\t\t\t</Linker>"
 
   puts $aFile "\t\t\t</Target>"
@@ -2201,6 +2204,9 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
     }
   }
   puts $aFile "\t\t\t\t\t<Add option=\"\$(CSF_OPT_LNK${aWokArch}D)\" />"
+  if { "$aWokStation" == "lin" } {
+    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${aWokStation}/cbp/libd\" />"
+  }
   puts $aFile "\t\t\t\t</Linker>"
 
   puts $aFile "\t\t\t</Target>"