X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Fvariables.def;h=72a16136c76f87842e40b041f6a4819763bdc10d;hb=fc8ec007bcbe990fc374f1a3019547e13554c496;hp=4a36911b338c49260a8cf8fa757de522c4ea4595;hpb=26cc4f3ade8271bd0941c587d4ac21219bac2542;p=feisty_meow.git diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def index 4a36911b..72a16136 100644 --- a/scripts/clam/cpp/variables.def +++ b/scripts/clam/cpp/variables.def @@ -226,7 +226,6 @@ export OBJECT_DIR = $(OUTPUT_PATH) export EXECUTABLE_DIR = $(TARGETS_DIR) export DYNAMIC_LIBRARY_DIR = $(TARGETS_DIR) export STATIC_LIBRARY_DIR = $(TARGETS_DIR) -#export TESTS_DIR = $(TARGETS_DIR)/tests # "HEADER_SEARCH_PATH" is where the class interface files are to be found. #HEADER_SEARCH_PATH = @@ -672,8 +671,8 @@ ifeq "$(COMPILER)" "VISUAL_CPP" export PDB_DIR = $(TARGETS_DIR) # set these way up here so we can override them later. - CC = $(COMPILER_ROOT_DIR)/bin/cl - LINK_TOOL = $(COMPILER_ROOT_DIR)/bin/link + CC = bash $(BUILD_SCRIPTS_DIR)/wrapdoze.sh $(COMPILER_ROOT_DIR)/bin/cl + LINK_TOOL = bash $(BUILD_SCRIPTS_DIR)/wrapdoze.sh $(COMPILER_ROOT_DIR)/bin/link # This is needed to protect against the use of 64-bit time_t structure # on windows. We are casting to time_t from a 32-bit structure.