a bunch of cleaning to get wayward unit tests passing on windows. not there yet.

[feisty_meow.git] / scripts / clam / cpp / variables.def

diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def
index 03f2ab65b9d541d36a1743141096759574ea3308..cf57dcfa2be4b9d9f0519692cc34c36ab44cf998 100644 (file)
--- a/scripts/clam/cpp/variables.def
+++ b/scripts/clam/cpp/variables.def
@@ -60,7 +60,7 @@ 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_WIN32 | 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,7 +72,7 @@ ifeq "$(COMPILER)" ""
     endif
   endif
   ifeq "$(OP_SYSTEM)" "WIN32"
-#    COMPILER := GNU_WIN32
+#    COMPILER := GNU_WINDOWS
     COMPILER := VISUAL_CPP
   endif
   ifeq "$(COMPILER)" ""
@@ -421,8 +421,13 @@ ifeq "$(OP_SYSTEM)" "UNIX"
   DYNLIB_ENDING = .so
 endif
 ifeq "$(OP_SYSTEM)" "WIN32"
-  LIB_ENDING = .lib
-  DYNLIB_ENDING = .dll
+  ifeq "$(COMPILER)" "VISUAL_CPP"
+    LIB_ENDING = .lib
+    DYNLIB_ENDING = .dll
+  else
+    LIB_ENDING = .a
+    DYNLIB_ENDING = .so
+  endif
 endif
 
 ###############################################################################
@@ -577,11 +582,11 @@ ifeq "$(COMPILER)" "GNU_ARM_LINUX"
 
 endif
 
-ifeq "$(COMPILER)" "GNU_WIN32"
+ifeq "$(COMPILER)" "GNU_WINDOWS"
   # GNU compiler for MS Windoze...
   CC = g++
   ifeq "$(COMPILER_ROOT_DIR)" ""
-    COMPILER_ROOT_DIR = c:/system/mingw
+    COMPILER_ROOT_DIR = $(CYGROOT)
   endif
 
   export COMPILER_VERSION = $(shell $(SHELL) $(CLAM_DIR)/cpp/get_version.sh $(COMPILER) $(COMPILER_ROOT_DIR) )
@@ -589,14 +594,18 @@ ifeq "$(COMPILER)" "GNU_WIN32"
   RC := $(COMPILER_ROOT_DIR)/bin/windres
   PLATFORM_ADD_IN = w32_
 
-  COMPILER_HEADER_DIR = $(COMPILER_ROOT_DIR)/include $(COMPILER_ROOT_DIR)/include/c++/3.4.2 $(COMPILER_ROOT_DIR)/lib/gcc/mingw32/3.4.2/include 
+  COMPILER_HEADER_DIR = $(COMPILER_ROOT_DIR)/include $(COMPILER_ROOT_DIR)/include/c++/3.4.2 
+#$(COMPILER_ROOT_DIR)/lib/gcc/mingw32/3.4.2/include 
 ###$(COMPILER_ROOT_DIR)/usr/include/mingw $(COMPILER_ROOT_DIR)/usr/include $(COMPILER_ROOT_DIR)/usr/include/w32api $(COMPILER_ROOT_DIR)/usr/include/extras
 
   COMPILER_LIBRARY_DIR = $(COMPILER_ROOT_DIR)/lib
-  DEFINITIONS += _Windows _WINDOWS WIN32 __WIN32__ __FLAT__ VC_EXTRALEAN WIN32_LEAN_AND_MEAN ATL_NO_LEAN_AND_MEAN _WIN32 __cplusplus 
+  DEFINITIONS += __GNU_WINDOWS__ _Windows _WINDOWS WIN32 __WIN32__ __FLAT__ VC_EXTRALEAN WIN32_LEAN_AND_MEAN ATL_NO_LEAN_AND_MEAN _WIN32 __USE_W32_SOCKETS
+#__cplusplus 
 #__USE_GNU 
 
   LIBRARY_TOOL = ar
+  LIBRARY_PATH_FLAG = -L 
+  LIB_PREFIX = lib
 #  LOAD_FLAG_PREFIX += -lpthread
   LOAD_FLAG_PREFIX += -mwindows
   CREATE_LIBRARY_FLAG += -r 
@@ -607,6 +616,7 @@ ifeq "$(COMPILER)" "GNU_WIN32"
   MIDL_DEFS = -no_robust
   # some lovely definitions used by some of the mfc and other ms code.
   DEPENDENCY_DEFINITIONS += __cplusplus __MINGW32__ _WIN32 _CHAR_UNSIGNED M_I86 _M_I86 _M_IX86=500 _WIN32_WINNT=0x501 __RPC_WIN32__ __RPCNDR_H_VERSION__ __RPCPROXY_H_VERSION__ TARGET_IS_NT40_OR_LATER PGM_SETCHILD _MFC_VER=0x0600
+
 endif
 
 ifeq "$(COMPILER)" "VISUAL_CPP"