more fixes from windows.

diff --git a/nucleus/tools/clam_tools/cygwin_fixer.cpp b/nucleus/tools/clam_tools/cygwin_fixer.cpp
index 1295d917880de7187627b0a82357432a014b5784..48eba3fe96298932aff84834ab6cc669f00d31ef 100644 (file)
--- a/nucleus/tools/clam_tools/cygwin_fixer.cpp
+++ b/nucleus/tools/clam_tools/cygwin_fixer.cpp
@@ -44,13 +44,13 @@ char *translate_cygwin(char *fname)
   }
 }
 
-
+ 
 /*
 
 function dossify_and_run_commands()
 {
 
-
+ 
   declare -a darc_commands=()
   for i in "$@"; do
     // we only mess with the command line on windows.
@@ -86,3 +86,7 @@ int main(int argc, char *argv[])
   return 0;
 }
 
+#ifdef __BUILD_STATIC_APPLICATION__
+  // static dependencies found by buildor_gen_deps.sh:
+#endif // __BUILD_STATIC_APPLICATION__
+

diff --git a/scripts/clam/cpp/rebuild_oldies.sh b/scripts/clam/cpp/rebuild_oldies.sh
index b502a38dac35cdda0f1ad99bed96fbb5c2a0e4e3..21a49c29e2b491237f6f91f0528dad899e34703e 100755 (executable)
--- a/scripts/clam/cpp/rebuild_oldies.sh
+++ b/scripts/clam/cpp/rebuild_oldies.sh
@@ -3,7 +3,7 @@ if [ -f "$BUILD_LIST_FILE" ]; then
        echo Compiling [$(cat $BUILD_LIST_FILE | while read line; do echo $(basename $line); done )]
   rm -f $(cat $BUILD_WHACK_FILE)
 #echo got line to run: $*
-  eval $*
+  eval "${@}"
   rm -f $BUILD_LIST_FILE $BUILD_WHACK_FILE
   if [ $? -ne 0 ]; then
     . "$CLAM_DIR/exit_make.sh"

diff --git a/scripts/core/bootstrap_shells.sh b/scripts/core/bootstrap_shells.sh
index cc13d4ff70157987f433072149fcbf736f7ddc03..227aeb067d01965dc1929a02cf4ccb16f399ebca 100644 (file)
--- a/scripts/core/bootstrap_shells.sh
+++ b/scripts/core/bootstrap_shells.sh
@@ -17,7 +17,7 @@ THIS_TOOL_NAME="$(basename "$0")"
 pushd "$CORE_SCRIPTS_DIR/../.." &>/dev/null
 source "$CORE_SCRIPTS_DIR/functions.sh"
 
-export FEISTY_MEOW_DIR="$(unix_to_dos_path $(\pwd) )"
+export FEISTY_MEOW_DIR="$(\pwd)"
 popd &>/dev/null
 
 export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_DIR/scripts"