X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Fvariables.def;h=222a9d6d225d8c2d4c32bc54ba724217c09396bf;hb=d84cca001d859500e4273888332fea8ed9943f51;hp=cf57dcfa2be4b9d9f0519692cc34c36ab44cf998;hpb=5a8e13e7a44ed98d9683bc6cd3bb374e9d3b0756;p=feisty_meow.git

diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def
index cf57dcfa..222a9d6d 100644
--- a/scripts/clam/cpp/variables.def
+++ b/scripts/clam/cpp/variables.def
@@ -287,7 +287,7 @@ export DEPS_FILE = $(OUTPUT_PATH)/$(PROJECT).deps
 
 # Add the obligatory junk to be cleaned up.  Individual compiler sections
 # should customize this by adding their object output directories.
-CLEANUPS += $(ACTUAL_TARGETS) $(OUTPUT_PATH)
+CLEANUPS += $(ACTUAL_TARGETS) $(OUTPUT_PATH) $(DEPS_FILE)
 
 # "GENDEPS" is a flag that causes dependencies to be generated into
 # statically built applications.
@@ -456,6 +456,10 @@ ifneq "$(OMIT_VERSIONS)" ""
   DEFINITIONS += NO_VERSION
 endif
 
+############################################################################
+# compiler specific section below.
+############################################################################
+
 ifeq "$(COMPILER)" "GNU_LINUX"
   # Unix GNU compiler...
   CC = g++
@@ -538,6 +542,8 @@ ifeq "$(COMPILER)" "GNU_LINUX"
 
 endif
 
+############################################################################
+
 ifeq "$(COMPILER)" "GNU_ARM_LINUX"
   # ARM-linux GNU compiler...
   COMPILER_ROOT_DIR = /usr/local/arm-linux
@@ -582,6 +588,8 @@ ifeq "$(COMPILER)" "GNU_ARM_LINUX"
 
 endif
 
+############################################################################
+
 ifeq "$(COMPILER)" "GNU_WINDOWS"
   # GNU compiler for MS Windoze...
   CC = g++
@@ -606,6 +614,7 @@ ifeq "$(COMPILER)" "GNU_WINDOWS"
   LIBRARY_TOOL = ar
   LIBRARY_PATH_FLAG = -L 
   LIB_PREFIX = lib
+  LIB_ENDING = .a
 #  LOAD_FLAG_PREFIX += -lpthread
   LOAD_FLAG_PREFIX += -mwindows
   CREATE_LIBRARY_FLAG += -r 
@@ -619,6 +628,8 @@ ifeq "$(COMPILER)" "GNU_WINDOWS"
 
 endif
 
+############################################################################
+
 ifeq "$(COMPILER)" "VISUAL_CPP"
   # microsoft visual c++ 4.x, 5.x or 6.x.
 
@@ -868,6 +879,9 @@ ifeq "$(COMPILER)" "VISUAL_CPP"
 
   # now, vary the flag configuration based on the flags that have been set.
 
+####override for windows since things are broken with WinMain
+###export CONSOLE_MODE = true
+
   ifneq "$(CONSOLE_MODE)" ""
     # console type of applications are built using the static flag so that
     # they are more redistributable.
@@ -895,6 +909,8 @@ ifeq "$(COMPILER)" "VISUAL_CPP"
 
 endif
 
+############################################################################
+
 ifeq "$(COMPILER)" "GNU_DARWIN"
   # Darwin kernel GNU compiler...
   CC = g++