updates from orpheus for windoze build

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

diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def
index 4668e33cc11dce717e0686668491528a4849ab3b..cf14aa5ac00f3aef00e67006289ad4473387a2b8 100644 (file)
--- a/scripts/clam/cpp/variables.def
+++ b/scripts/clam/cpp/variables.def
@@ -206,8 +206,9 @@ export DYNAMIC_LIBRARY_DIR = $(TARGETS_STORE)
 export STATIC_LIBRARY_DIR = $(TARGETS_STORE)
 
 # "HEADER_SEARCH_PATH" is where the class interface files are to be found.
-# we add the generated store folder for the build version file.
-HEADER_SEARCH_PATH = $(FEISTY_MEOW_GENERATED_STORE)/versions
+# the generated store folder is added to access the build version file.
+# the binaries are added to access the system_helper.h file.
+HEADER_SEARCH_PATH = $(FEISTY_MEOW_GENERATED_STORE)/versions $(FEISTY_MEOW_BINARIES)
 
 # "HOOPLE_HEADERS" are locations where the HOOPLE headers can be found.
 ifeq "$(HOOPLE_HEADERS)" ""
@@ -382,7 +383,7 @@ LIBRARY_PATH_FLAG = -L
 #LIBRARY_TOOL =
 
 # the root name of the version file.  This is currently irrelevant on
-# non-win32 platforms.
+# non-windoze platforms.
 VERSION_RC_ROOT = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/rc_name.sh)
 
 ifneq "$(CONSOLE_MODE)" ""
@@ -395,20 +396,10 @@ endif
 ###############################################################################
 
 # Operating system dependent flags.
+# (not so OS dependent with move to only gnu compilation...)
 
-ifeq "$(OP_SYSTEM)" "UNIX"
-  LIB_ENDING = .a
-  DYNLIB_ENDING = .so
-endif
-ifeq "$(OP_SYSTEM)" "WIN32"
-#hmmm: question here about what we build for dynamic, which is currently broken.
-#    LIB_ENDING = .lib
-#    DYNLIB_ENDING = .dll
-#  else
-    LIB_ENDING = .a
-    DYNLIB_ENDING = .so
-#  endif
-endif
+LIB_ENDING = .a
+DYNLIB_ENDING = .so
 
 ###############################################################################
 
@@ -573,13 +564,14 @@ endif
 ifeq "$(COMPILER)" "GNU_WINDOWS"
   # GNU compiler for MS Windoze...
   CC = g++
-  ifeq "$(COMPILER_ROOT_DIR)" ""
-    COMPILER_ROOT_DIR = $(CYGROOT)
-  endif
+  COMPILER_ROOT_DIR = /
+  ARCHITECTURE = $(shell machine 2>/dev/null || arch 2>/dev/null || echo i686)
+#hmmm: below fixes nothing!  argh!
+#  ARCHITECTURE = i386
 
   export COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(COMPILER) $(COMPILER_ROOT_DIR) )
 
-  RC := $(COMPILER_ROOT_DIR)/bin/windres
+#  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 
@@ -587,7 +579,8 @@ ifeq "$(COMPILER)" "GNU_WINDOWS"
 ###$(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 += __GNU_WINDOWS__ _Windows _WINDOWS WIN32 __WIN32__ __FLAT__ VC_EXTRALEAN WIN32_LEAN_AND_MEAN ATL_NO_LEAN_AND_MEAN _WIN32 __USE_W32_SOCKETS
+  DEFINITIONS += __GNU_WINDOWS__ _Windows _WINDOWS WIN32 __WIN32__ __FLAT__ VC_EXTRALEAN WIN32_LEAN_AND_MEAN ATL_NO_LEAN_AND_MEAN _WIN32 
+###NOOOOOO   __USE_W32_SOCKETS
 #__cplusplus 
 #__USE_GNU