projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resurrecting the gnu c++ build on windows
[feisty_meow.git]
/
scripts
/
clam
/
cpp
/
variables.def
diff --git
a/scripts/clam/cpp/variables.def
b/scripts/clam/cpp/variables.def
index 9ab02a8702ce9832d4e8f45504a12ef22bacc647..62c097f691bbc29c53ba57ad6908d4baa6b88c92 100644
(file)
--- 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
# 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)" ""
# choose a default compiler if none was specified.
ifeq "$(COMPILER)" ""
@@
-72,8
+73,8
@@
ifeq "$(COMPILER)" ""
endif
endif
ifeq "$(OP_SYSTEM)" "WIN32"
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
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.
############################################################################
# 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 = /
# 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.
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 =
PLATFORM_ADD_IN = w32_
TRIPART_VERSION =