X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Fvariables.def;h=62c097f691bbc29c53ba57ad6908d4baa6b88c92;hb=239fe2ca67e905f1c752394857038330fddd6ff4;hp=9ab02a8702ce9832d4e8f45504a12ef22bacc647;hpb=421efb66ead03244830a9b4c0ff5cbd8f787dcfc;p=feisty_meow.git diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def index 9ab02a87..62c097f6 100644 --- a/scripts/clam/cpp/variables.def +++ b/scripts/clam/cpp/variables.def @@ -60,7 +60,8 @@ endif # code. It is mainly used within CLAM itself for determining the proper # compiler flags. export COMPILER -#COMPILER := GNU_LINUX | GNU_ARM_LINUX | GNU_DARWIN | GNU_WINDOWS | VISUAL_CPP +#COMPILER := GNU_LINUX | GNU_ARM_LINUX | GNU_DARWIN | GNU_WINDOWS +##| VISUAL_CPP # choose a default compiler if none was specified. ifeq "$(COMPILER)" "" @@ -72,8 +73,8 @@ ifeq "$(COMPILER)" "" endif endif ifeq "$(OP_SYSTEM)" "WIN32" -# COMPILER := GNU_WINDOWS - COMPILER := VISUAL_CPP + COMPILER := GNU_WINDOWS +# COMPILER := VISUAL_CPP endif ifeq "$(COMPILER)" "" # if we get into this case, we have no idea how to set the default @@ -462,7 +463,9 @@ endif # compiler specific section below. ############################################################################ -ifeq "$(COMPILER)" "GNU_LINUX" +# wide open match of any compiler besides gnu darwin. +#hmmm: this will erroneously match the arm one. but have we used that in a while? +ifneq "$(COMPILER)" "GNU_DARWIN" # Unix GNU compiler... CC = g++ COMPILER_ROOT_DIR = / @@ -635,6 +638,8 @@ endif ifeq "$(COMPILER)" "VISUAL_CPP" # microsoft visual c++ 4.x, 5.x or 6.x. +bork bork should not be here. + PLATFORM_ADD_IN = w32_ TRIPART_VERSION =